diff --git a/.travis.yml b/.travis.yml
index da5bf96b4..f51d80cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,8 @@ install:
   - sudo make install-libs
 before_script:
   - cd $TRAVIS_BUILD_DIR
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize --force; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize -v --force; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal -I m4; 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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 787d2052c..d7d6a457c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,28 @@
 # Main CMake file for the ZoneMinder project.
 # Created by mastertheknife (Kfir Itzhak)
-# The goal is to ease up the installation of zoneminder.
-# Our current installation method (using autotools) is outdated, slow and breaks now and then.
-# The CMake installation method will require no parameters at all, default should sufficient and reliable.
-# It will be still possible to install ZoneMinder using autotools, they don't conflict with each other. The cmake way is a complete re-write (different syntax) and aims to be identical to the autotools way,
-# by having options using the same name and leaving ZM totally unmodified, while providing exactly the same things that ZM expects (config.h, configuration in *.in files, etc).
-#
 # For more information and installation, see the INSTALL file
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
 set(zoneminder_VERSION "1.28.1")
 
-# CMake does not allow out-of-source build if CMakeCache.exists in the source folder. Abort and notify the user to save him from headache why it doesn't work.
-if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
-	message(FATAL_ERROR " You are attempting to do an out-of-source build, but a cmake cache file for an in-source build exists. Please delete the file CMakeCache.txt from the source folder to proceed.")
-endif((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+# CMake does not allow out-of-source build if CMakeCache.exists 
+# in the source folder. Abort and notify the user
+if(
+    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
+    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+        message(FATAL_ERROR " You are attempting to do an out-of-source build, 
+            but a cmake cache file for an in-source build exists. Please delete 
+            the file CMakeCache.txt from the source folder to proceed.")
+endif(
+    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
+    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
 
-# Default build type. To change the build type, use the CMAKE_BUILD_TYPE configuration option.
+# Default build type. To change the build type, 
+# use the CMAKE_BUILD_TYPE configuration option.
 if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
+	set(CMAKE_BUILD_TYPE 
+            Release CACHE STRING "Build type: Release or Debug" FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 # Can assist in troubleshooting
@@ -42,35 +45,80 @@ include (CheckFunctionExists)
 include (CheckPrototypeDefinition_fixed)
 include (CheckTypeSize)
 include (CheckStructHasMember)
+include (CheckSendfile)
 
 # Configuration options
-mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR ZM_PERL_SUBPREFIX ZM_PERL_USE_PATH ZM_TARGET_DISTRO ZM_CONFIG_DIR)
-set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm")
-set(ZM_SOCKDIR "/var/run/zm" CACHE PATH "Location of Unix domain socket files, default /var/run/zm")
-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 "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 "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
-set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH "Location of dynamic content (events and images), default: /var/lib/zoneminder")
-set(ZM_DB_HOST "localhost" CACHE STRING "Hostname where ZoneMinder database located, default: localhost")
-set(ZM_DB_NAME "zm" CACHE STRING "Name of ZoneMinder database, default: zm")
-set(ZM_DB_USER "zmuser" CACHE STRING "Name of ZoneMinder database user, default: zmuser")
-set(ZM_DB_PASS "zmpass" CACHE STRING "Password of ZoneMinder database user, default: zmpass")
-set(ZM_WEB_USER "" CACHE STRING "The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force")
-set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs on, Leave empty to be the same as the web user")
+mark_as_advanced( 
+    FORCE ZM_EXTRA_LIBS 
+    ZM_MYSQL_ENGINE 
+    ZM_NO_MMAP 
+    CMAKE_INSTALL_FULL_BINDIR 
+    ZM_PERL_MM_PARMS 
+    ZM_PERL_SEARCH_PATH 
+    ZM_TARGET_DISTRO 
+    ZM_CONFIG_DIR)
+
+set(ZM_RUNDIR "/var/run/zm" CACHE PATH 
+    "Location of transient process files, default: /var/run/zm")
+set(ZM_SOCKDIR "/var/run/zm" CACHE PATH 
+    "Location of Unix domain socket files, default /var/run/zm")
+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 
+    "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 
+    "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH 
+    "Location of dynamic content (events and images), default: /var/lib/zoneminder")
+set(ZM_DB_HOST "localhost" CACHE STRING 
+    "Hostname where ZoneMinder database located, default: localhost")
+set(ZM_DB_NAME "zm" CACHE STRING 
+    "Name of ZoneMinder database, default: zm")
+set(ZM_DB_USER "zmuser" CACHE STRING 
+    "Name of ZoneMinder database user, default: zmuser")
+set(ZM_DB_PASS "zmpass" CACHE STRING 
+    "Password of ZoneMinder database user, default: zmpass")
+set(ZM_WEB_USER "" CACHE STRING 
+    "The user apache or the local web server runs on. Leave empty for automatic detection. 
+     If that fails, you can use this variable to force")
+set(ZM_WEB_GROUP "" CACHE STRING 
+    "The group apache or the local web server runs on, 
+    Leave empty to be the same as the web user")
 # Advanced
-set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH "Location of ZoneMinder configuration, default system config directory")
-set(ZM_EXTRA_LIBS "" CACHE STRING "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
-set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING "MySQL engine to use with database, default: InnoDB")
-set(ZM_NO_MMAP "OFF" CACHE BOOL "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF")
-set(ZM_NO_FFMPEG "OFF" CACHE BOOL "Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. 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_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 "Set to ON to build ZoneMinder without X10 support. default: OFF")
-set(ZM_ONVIF "OFF" CACHE BOOL "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not work with all cameras claiming to be ONVIF compliant. default: OFF")
-set(ZM_PERL_SUBPREFIX "${CMAKE_INSTALL_LIBDIR}/perl5" CACHE PATH "Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: <libdir>/perl5")
-set(ZM_PERL_USE_PATH "${CMAKE_INSTALL_PREFIX}/${ZM_PERL_SUBPREFIX}" CACHE PATH "Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix>")
-set(ZM_TARGET_DISTRO "" CACHE STRING "Build ZoneMinder for a specific distribution.  Currently, valid names are: f21, f20, el6, OS13")
+set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH 
+    "Location of ZoneMinder configuration, default system config directory")
+set(ZM_EXTRA_LIBS "" CACHE STRING 
+    "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
+set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING 
+    "MySQL engine to use with database, default: InnoDB")
+set(ZM_NO_MMAP "OFF" CACHE BOOL 
+    "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you 
+    experience problems with the shared memory. default: OFF")
+set(ZM_NO_FFMPEG "OFF" CACHE BOOL 
+    "Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. 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_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 
+    "Set to ON to build ZoneMinder without X10 support. default: OFF")
+set(ZM_ONVIF "OFF" CACHE BOOL 
+    "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not 
+    work with all cameras claiming to be ONVIF compliant. default: OFF")
+set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING 
+	"By default, ZoneMinder's Perl modules are installed into the Vendor folders, 
+	as defined by your installation of Perl. You can change that here. Consult Perl's 
+	MakeMaker documentation for a definition of acceptable parameters. If you set this 
+	to something that causes the modules to be installed outside Perl's normal search 
+	path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly.")
+set(ZM_PERL_SEARCH_PATH "" CACHE PATH 
+	"Use to add a folder to your Perl's search path. This will need to be set in cases 
+	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
+	installed outside Perl's default search path.")
+set(ZM_TARGET_DISTRO "" CACHE STRING 
+    "Build ZoneMinder for a specific distribution.  Currently, valid names are: f21, f20, el6, OS13")
 
 # Reassign some variables if a target distro has been specified
 if((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
@@ -105,14 +153,40 @@ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 endif((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
 
 # Required for certain checks to work
-set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
+set(CMAKE_EXTRA_INCLUDE_FILES 
+    ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h
+    )
 # Required for including headers from the this folder
 include_directories("${CMAKE_BINARY_DIR}")
 # This is required to enable searching in lib64 (if exists), do not change
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
+# Host OS Check
+set(HOST_OS "")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(HOST_OS "linux")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+	set(HOST_OS "solaris")
+	set(SOLARIS 1)
+endif(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+	set(HOST_OS "BSD")
+	set(BSD 1)
+endif(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+	set(HOST_OS "darwin")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+if(NOT HOST_OS)
+	message(FATAL_ERROR 
+            "ZoneMinder was unable to deterimine the host OS. Please report this. Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+endif(NOT HOST_OS)
+
 # System checks
-check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
+if(NOT HAVE_LIBV4L1_VIDEODEV_H)
+	check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+endif(NOT HAVE_LIBV4L1_VIDEODEV_H)
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
 check_include_file("ucontext.h" HAVE_UCONTEXT_H)
@@ -167,10 +241,12 @@ if(JPEG_FOUND)
 	set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
 	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
 	if(NOT HAVE_JPEGLIB_H)
-		message(FATAL_ERROR " zm requires libjpeg headers - check that libjpeg development packages are installed")
+		message(FATAL_ERROR 
+                    "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
 	endif(NOT HAVE_JPEGLIB_H)
 else(JPEG_FOUND)
-	message(FATAL_ERROR "zm requires jpeg but it was not found on your system")
+	message(FATAL_ERROR 
+            "ZoneMinder requires jpeg but it was not found on your system")
 endif(JPEG_FOUND)
 
 # OpenSSL
@@ -200,10 +276,12 @@ if(PTHREAD_LIBRARIES)
 	mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
 	check_include_file("pthread.h" HAVE_PTHREAD_H)
 	if(NOT HAVE_PTHREAD_H)
-		message(FATAL_ERROR " zm requires pthread headers - check that pthread development packages are installed")
+		message(FATAL_ERROR 
+                    "ZoneMinder requires pthread headers - check that pthread development packages are installed")
 	endif(NOT HAVE_PTHREAD_H)
 else(PTHREAD_LIBRARIES)
-	message(FATAL_ERROR "zm requires pthread but it was not found on your system")
+	message(FATAL_ERROR 
+            "ZoneMinder requires pthread but it was not found on your system")
 endif(PTHREAD_LIBRARIES)
 
 # pcre (using find_library and find_path)
@@ -275,10 +353,12 @@ if(MYSQLCLIENT_LIBRARIES)
 	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
 	check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
 	if(NOT HAVE_MYSQL_H)
-		message(FATAL_ERROR "zm requires MySQL headers - check that MySQL development packages are installed")
+		message(FATAL_ERROR 
+                    "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
 	endif(NOT HAVE_MYSQL_H)
 else(MYSQLCLIENT_LIBRARIES)
-	message(FATAL_ERROR "zm requires mysqlclient but it was not found on your system")
+	message(FATAL_ERROR 
+            "ZoneMinder requires mysqlclient but it was not found on your system")
 endif(MYSQLCLIENT_LIBRARIES)
 
 # x264 (using find_library and find_path)
@@ -458,7 +538,8 @@ endif(NOT ZM_NO_LIBVLC)
 
 # Check for gnutls or crypto
 if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
-	message(FATAL_ERROR " zm requires crypto or gnutls but none were found on your system")
+	message(FATAL_ERROR 
+            "ZoneMinder requires crypto or gnutls but none were found on your system")
 endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
 
 # Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
@@ -466,17 +547,22 @@ endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
 set(ZM_HAS_V4L 0)
 set(ZM_HAS_V4L1 0)
 set(ZM_HAS_V4L2 0)
-if(HAVE_LINUX_VIDEODEV_H)
+if(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
 	set(ZM_HAS_V4L 1)
 	set(ZM_HAS_V4L1 1)
-endif(HAVE_LINUX_VIDEODEV_H)
+endif(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
 if(HAVE_LINUX_VIDEODEV2_H)
 	set(ZM_HAS_V4L 1)
 	set(ZM_HAS_V4L2 1)
 endif(HAVE_LINUX_VIDEODEV2_H)
-if((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
-	message(AUTHOR_WARNING " Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
-endif((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
+if((NOT HAVE_LINUX_VIDEODEV_H) 
+    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
+    AND (NOT HAVE_LINUX_VIDEODEV2_H))
+	message(AUTHOR_WARNING 
+            "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif((NOT HAVE_LINUX_VIDEODEV_H) 
+    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
+    AND (NOT HAVE_LINUX_VIDEODEV2_H))
 # Check for PCRE and enable ZM_PCRE accordingly
 set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
@@ -497,26 +583,37 @@ if(ZM_ONVIF)
 	set(ZM_HAS_ONVIF 1)
 endif(ZM_ONVIF)
 
-# Check for authenication functions
+# Check for authentication functions
 if(HAVE_OPENSSL_MD5_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_prototype_definition(MD5 "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" HAVE_MD5_OPENSSL)
+	check_prototype_definition(
+            MD5 
+            "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)
+	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}")
-	check_prototype_definition(gnutls_fingerprint "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)
+	check_prototype_definition(
+            gnutls_fingerprint 
+            "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)
 	set(HAVE_DECL_MD5 1)
 else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
-	message(AUTHOR_WARNING " ZM requires a working MD5 function for hashed authenication but none were found - hashed authenication will not be available")
+	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)
 # 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
@@ -528,26 +625,40 @@ endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
 # Check for Perl
 find_package(Perl)
 if(NOT PERL_FOUND)
-	message(FATAL_ERROR "zm requires Perl 5.6.0 or newer but it was not found on your system")
+	message(FATAL_ERROR 
+            "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
 endif(NOT PERL_FOUND)
 
 # Checking for perl modules requires FindPerlModules.cmake
 # Check all required modules at once
 # TODO: Add checking for the optional modules
-find_package(PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql Getopt::Long Time::HiRes Date::Manip LWP::UserAgent ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
+find_package(
+    PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql 
+    Getopt::Long Time::HiRes Date::Manip LWP::UserAgent 
+    ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
 if(NOT PERLMODULES_FOUND)
-	message(FATAL_ERROR "Not all required perl modules were found on your system")
+	message(FATAL_ERROR 
+            "Not all required perl modules were found on your system")
 endif(NOT PERLMODULES_FOUND)
 
-# Attempt to check which user apache (or other web server) runs on by searching for a user beginning with apache or www and then cutting the user from the first matching user line
+# Attempt to check which user apache (or other web server) runs on by 
+# searching for a user beginning with apache or www and then cutting the user 
+# from the first matching user line
 if(ZM_WEB_USER STREQUAL "")
-	# Check for a user matching ^apache and cut the username from the userline in the first match
+	# Check for a user matching ^apache and cut the username from the 
+        # userline in the first match
 	file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
 	file(STRINGS "/etc/passwd" userline_www REGEX "^www")
 	if(NOT (userline_apache STREQUAL ""))
-		execute_process(COMMAND echo ${userline_apache} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(
+                    COMMAND echo ${userline_apache} 
+                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
 	elseif(NOT (userline_www STREQUAL ""))
-		execute_process(COMMAND echo ${userline_www} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(
+                    COMMAND echo ${userline_www} 
+                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
 	endif(NOT (userline_apache STREQUAL ""))
 	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
 endif(ZM_WEB_USER STREQUAL "")
@@ -561,7 +672,8 @@ message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 # Check for polkit
 find_package(Polkit)
 if(NOT POLKIT_FOUND)
-	message(FATAL_ERROR "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+	message(FATAL_ERROR 
+            "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
 endif(NOT POLKIT_FOUND)
 
 # Some variables that zm expects
@@ -577,7 +689,11 @@ set(CGI_PREFIX "${ZM_CGIDIR}")
 set(WEB_USER "${ZM_WEB_USER}")
 set(WEB_GROUP "${ZM_WEB_GROUP}")
 set(ZM_DB_TYPE "mysql")
-set(EXTRA_PERL_LIB "use lib '${ZM_PERL_USE_PATH}';")
+if(ZM_PERL_SEARCH_PATH)
+	set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
+else(ZM_PERL_SEARCH_PATH)
+	set(EXTRA_PERL_LIB "# Include from system perl paths only")
+endif(ZM_PERL_SEARCH_PATH)
 
 # Generate files from the .in files
 configure_file(zm.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" @ONLY)
@@ -593,9 +709,9 @@ add_subdirectory(web)
 add_subdirectory(misc)
 
 # Enable ONVIF support
-if (ZM_ONVIF)
+if(ZM_ONVIF)
 	add_subdirectory(onvif)
-endif (ZM_ONVIF)
+endif(ZM_ONVIF)
 
 # Process distro subdirectories
 if((ZM_TARGET_DISTRO STREQUAL "f21") OR (ZM_TARGET_DISTRO STREQUAL "f20"))
@@ -614,9 +730,11 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")
 message(STATUS "Running ZoneMinder configuration generator")
 execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
 if(zmconfgen_result EQUAL 0)
-	message(STATUS "ZoneMinder configuration generator completed successfully")
+	message(STATUS 
+            "ZoneMinder configuration generator completed successfully")
 else(zmconfgen_result EQUAL 0)
-	message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+	message(FATAL_ERROR 
+            "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
 endif(zmconfgen_result EQUAL 0)
 
 # Install zm.conf
diff --git a/INSTALL b/INSTALL
index 6d329bcd4..8f892e840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -53,8 +53,8 @@ Advanced:
 	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
 	ZM_NO_FFMPEG		Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF
 	ZM_NO_X10		Set to ON to build ZoneMinder without X10 support. default: OFF
-	ZM_PERL_SUBPREFIX	Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. /lib will be turned into <prefix>/lib, default: <libarch>/perl5
-	ZM_PERL_USE_PATH	Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix>
+	ZM_PERL_MM_PARMS	By default, ZoneMinder's Perl modules are installed into the Vendor folders, as defined by your installation of Perl. You can change that here. Consult Perl's MakeMaker documentation for a definition of acceptable parameters. If you set this to something that causes the modules to be installed outside Perl's normal serach path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly. default: "INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1"
+	ZM_PERL_SEARCH_PATH	Use to add a folder to your Perl's search path. This will need to be set in cases where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are installed outside Perl's default search path. default: ""
 
 Useful configuration options provided by cmake:
 CMAKE_VERBOSE_MAKEFILE - Set this to ON (default OFF) to see what cmake is doing. Very useful for troubleshooting.
@@ -93,9 +93,19 @@ NOTE: The database server, database name, user and password can be different and
 
 8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
 9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
-10) Setup an appropriate startup script for your system. A generic sys v init script is here: /scripts/zm while a generic systemd service file is here: /misc/zoneminder.service
-You must determine which file to use, verify it is correct, and then copy it to the correct location. Consult your distro's documentation.  Note that distros using systemd also
-require /misc/zoneminder-tmpfiles.conf to be copied into the system's tmpfiles.d folder.
+10) Setup an appropriate startup script for your system. Two generic startup scripts have been provided, a legacy Sys V Init script and a Systemd service file.
+
+*Sys V Init Setup*
+- Copy the sys v init script /scripts/zm from the build folder to /etc/init. 
+- Inspect the contents to make sure they apply to your distro.
+
+*SystemD Setup*
+- Copy the zoneminder systemd service file /misc/zoneminder.service from the build folder to the systemd service file location. 
+  For Redhat based distros, that folder is /usr/lib/systemd/system.
+- Inspect the contents to make sure they apply to your distro.
+- Tell systemd to load the new service file: "sudo systemctl daemon-reload".
+- Copy /misc/zoneminder-tmpfiles.conf to /etc/tmpfiles.d
+- Tell systemd to process this file: "sudo /usr/bin/systemd-tmpfiles --create /etc/tmpfiles.d/zoneminder.conf".
 
 Basic steps for upgrading ZoneMinder
 ------------------------------------
diff --git a/Makefile.am b/Makefile.am
index f6d46bc3d..62f767e75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
 # And these to the user and group of your webserver
 webuser = @WEB_USER@
diff --git a/README.md b/README.md
index 1008c8560..fa3265d82 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,46 @@ All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki
 
 ZoneMinder is an integrated set of applications which provide a complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras attached to a Linux based machine. It is designed to run on distributions which support the Video For Linux (V4L) interface and has been tested with video cameras attached to BTTV cards, various USB cameras and also supports most IP network cameras. 
 
-## Requirements
+## Installation Methods
 
-If you are installing ZoneMinder from a package, that package should provide all of the needed core components.
+### Building from Source is Discouraged
 
-### Packages
+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.
 
-If you are compiling ZoneMinder from source, the below list contains the packages needed to get ZoneMinder built:
+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)
+- Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
+- RHEL/CentOS and clones via [zmrepo](http://zmrepo.zoneminder.com/)
+- Fedora via [zmrepo](http://zmrepo.zoneminder.com/)
+- OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
+- Maegia from their default repository
+
+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 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. 
+
+When building a package, it is best to do this work in a separate environment, dedicated to development purposes. This could be as simple as creating a virtual machine, using Docker, or using mock.  All it takes is one “Oops” to regret doing this work on your production server.
+
+Lastly, if you desire to build a development snapshot from the master branch, it is recommended you first build your package using an official release of ZoneMinder. This will help identify whether any problems you may encounter are caused by the build process or is a new issue in the master branch.
+
+What follows are instructions for various distros to build ZoneMinder into a package.
+
+### Package Maintainters
+Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
+
+For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
+```bash
+./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+```
+
+Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
 
 #### Ubuntu
 
@@ -104,42 +137,118 @@ root@host:~# aptitude install -y gdebi;
 root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
 ```
 
-#### CentOS / RHEL
+#### Fedora / CentOS / RHEL
 
-Additional repositories must be added before one can build zoneminder on CentOS or RHEL:
+***DRAFT* ** Needs Testing
 
-1. Zmrepo [ZoneMinder WiKi](http://www.zoneminder.com/wiki/index.php/CentOS#Zmrepo_-_A_ZoneMinder_repository_for_RPM_based_distros)
-2. EPEL https://fedoraproject.org/wiki/EPEL
-3. RPMFusion: http://rpmfusion.org/
+##### Background
+The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
 
-When adding third party repositories, it is highly recommended that the user also install and configure yum priorities as documented in the [CentOS WiKi](http://wiki.centos.org/PackageManagement/Yum/Priorities)
+The method documented below was chosen because:
+- All of ZoneMinder's dependencies are downloaded and installed automatically
+- Cross platform capable. The build host does not have to be the same distro or release version as the target.
+- Once your build environment is set up, few steps are required to run the build again in the future.
+- Troubleshooting becomes easier if we are all building ZoneMinder the same way.
 
-Prioritize the repositories:
+The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
 
-1. Base
-2. EPEL
-3. RPMFusion
-4. Zmrepo
+***IMPORTANT***
+Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
 
-Once your repos are in order, install the following:
-```bash
-sudo yum install cmake bzip2-devel ffmpeg ffmpeg-devel gnutls-devel httpd libjpeg-turbo libjpeg-turbo-devel mysql-devel mysql-server pcre-devel \
-perl-Archive-Tar perl-Archive-Zip perl-Convert-BinHex perl-Date-Manip perl-DBD-MySQL perl-DBI perl-Device-SerialPort perl-Email-Date-Format perl-IO-stringy \
-perl-IO-Zlib perl-MailTools perl-MIME-Lite perl-MIME-tools perl-MIME-Types perl-Module-Load perl-Package-Constants perl-Sys-Mmap perl-Time-HiRes \
-perl-TimeDate perl-YAML-Syck perl-X10 perl-URI-Encode php php-cli php-mysql x264 vlc-devel vlc-core \
-libcurl libcurl-devel polkit-devel git
+##### 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.
+
+Next, navigate to [Zmrepo](http://zmrepo.zoneminder.com/), and follow the instructions to enable zmrepo on your system.  
+
+With zmrepo enabled, issue the following command:
+````bash
+sudo yum install zmrepo-mock-configs mock
 ```
 
-To build from the master branch:
+Add your user account to the group mock:
 ```bash
-git clone https://github.com/ZoneMinder/ZoneMinder.git
-cd ZoneMinder
-cmake .
-make
-sudo make install
+sudo gpasswd -a {your account name} mock
 ```
 
-IMPORTANT: Don't forget the trailing "." when calling cmake
+Your build environment is now set up.  
+
+##### Build from SRPM
+To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the [Zmrepo](http://zmrepo.zoneminder.com/) site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
+
+For CentOS 7, I have chosen the following SRPM:
+```bash
+wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+Now comes the fun part. To build ZoneMinder, issue the following command:
+```bash
+buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
+```bash
+buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
+```
+Notice that the buildzm.sh tool requires the following parameters:
+```bash
+buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
+```
+The list of available Mock config files are available here:
+```bash
+ls /etc/mock/zmrepo*.cfg
+```
+
+You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
+
+##### Installation
+Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the [Zmrepo](http://zmrepo.zoneminder.com/) website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
+
+Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
+
+##### How to Modify the Source Prior to Build
+** UNFINISHED **
+
+Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
+
+These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
+
+From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
+```bash
+rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+```
+
+IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
+
+Make sure you have git installed:
+```bash
+sudo yum install git
+```
+
+Now clone the ZoneMinder git repository:
+```bash
+git clone https://github.com/ZoneMinder/ZoneMinder
+```
+This will create a sub-folder called ZoneMinder, which will contain the latest developement.
+
+We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
+```bash
+ls ~/rpmbuild/SOURCES
+```
+The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
+```bash
+mv ZoneMinder ZoneMinder-1.28.1
+tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
+```
+The trailing "/*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
+Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
+
+Now build a new src.rpm:
+```bash
+rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
+```
+This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
+
+You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
 
 #### Docker
 
@@ -147,11 +256,6 @@ 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. 
 
-### ffmpeg
-
-This release of ZoneMinder has been tested on and works with ffmpeg version N-55540-g93f4277.
-
-
 ## Contribution Model and  Development
 
 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
@@ -172,14 +276,4 @@ the following steps.
 6. Create new Pull Request
 7. The team will then review, discuss and hopefully merge your changes.
 
-### Package Maintainters
-Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
-
-For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
-```bash
-./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
-```
-
-Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
-
 [![Analytics](https://ga-beacon.appspot.com/UA-15147273-6/ZoneMinder/README.md)](https://github.com/igrigorik/ga-beacon)
diff --git a/bootstrap.sh b/bootstrap.sh
index 681d5b319..0bc041f18 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-aclocal
+aclocal -I m4
 autoheader
 automake --add-missing
 autoconf
diff --git a/cmake/Modules/CheckSendfile.cmake b/cmake/Modules/CheckSendfile.cmake
new file mode 100644
index 000000000..1796b92e3
--- /dev/null
+++ b/cmake/Modules/CheckSendfile.cmake
@@ -0,0 +1,58 @@
+# Check whether sendfile() is supported and what prototype it has
+include(CheckCSourceCompiles)
+if (UNIX OR MINGW)
+SET(CMAKE_REQUIRED_DEFINITIONS -Werror-implicit-function-declaration)
+endif()
+check_c_source_compiles("#include <sys/sendfile.h>
+#include <stdio.h>
+int main()
+{
+sendfile(1, 1, NULL, 0);
+return 0;
+}" HAVE_SENDFILE4_SUPPORT)
+if(HAVE_SENDFILE4_SUPPORT)
+add_definitions(-DHAVE_SENDFILE4_SUPPORT=1)
+unset(CMAKE_REQUIRED_DEFINITIONS)
+message(STATUS "Sendfile support: Linux/Solaris sendfile()")
+return()
+endif()
+find_library(SENDFILE_LIBRARIES NAMES sendfile)
+if(SENDFILE_LIBRARIES)
+include(CheckLibraryExists)
+check_library_exists(sendfile sendfile ${SENDFILE_LIBRARIES} HAVE_SENDFILE4_SUPPORT)
+if(HAVE_SENDFILE4_SUPPORT)
+add_definitions(-DHAVE_SENDFILE4_SUPPORT=1)
+unset(CMAKE_REQUIRED_DEFINITIONS)
+message(STATUS "Sendfile support: Solaris sendfile()")
+return()
+endif()
+endif()
+set(SENDFILE_LIBRARIES "")
+check_c_source_compiles("#include <sys/socket.h>
+#include <stdio.h>
+int main()
+{
+sendfile(1, 1, 0, 0, NULL, NULL, 0);
+return 0;
+}" HAVE_SENDFILE7_SUPPORT)
+if(HAVE_SENDFILE7_SUPPORT)
+add_definitions(-DHAVE_SENDFILE7_SUPPORT=1)
+unset(CMAKE_REQUIRED_DEFINITIONS)
+message(STATUS "Sendfile support: FreeBSD sendfile()")
+return()
+endif()
+check_c_source_compiles("#include <sys/socket.h>
+#include <stdio.h>
+#include <sys/uio.h>
+int main()
+{
+sendfile(1, 1, 0, NULL, NULL, 0);
+return 0;
+}" HAVE_SENDFILE6_SUPPORT)
+if(HAVE_SENDFILE6_SUPPORT)
+add_definitions(-DHAVE_SENDFILE6_SUPPORT=1)
+unset(CMAKE_REQUIRED_DEFINITIONS)
+message(STATUS "Sendfile support: MacOS sendfile()")
+return()
+endif()
+
diff --git a/configure.ac b/configure.ac
index f6cb789a3..7060bd38b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,7 @@ AC_INIT(zm,1.28.1,[http://www.zoneminder.com/forums/ - Please check FAQ first],z
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
 
@@ -26,6 +27,17 @@ case $host_os in
    *BSD*)
         # Do something specific for BSD
 		HOST_OS='BSD'
+		AC_DEFINE(BSD,1,"This is a BSD system")
+        ;;
+   *bsd*)
+        # Do something specific for BSD
+		HOST_OS='BSD'
+		AC_DEFINE(BSD,1,"This is a BSD system")
+        ;;
+    *solaris*)
+        # Do something specific for Solaris
+		HOST_OS='solaris'
+		AC_DEFINE(SOLARIS,1,"We are running a Solaroid OS [tested on OmniOS]")
         ;;
     *)
         #Default Case
@@ -315,22 +327,20 @@ AC_FUNC_STRTOD
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap posix_memalign putenv select sendfile socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strspn strstr strtol strtoull])
 AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
-
+# this is required for freebsd to compile. Look for it in m4/ac_check_sendfile.m4
+AC_CHECK_SENDFILE
 # Other programs
 AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
 AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
-AC_CHECK_PROG(OPT_NETPBM,pnmscale,yes,no)
-AC_PATH_PROG(PATH_NETPBM,pnmscale)
-if test "$OPT_NETPBM" == "yes"; then
-PATH_NETPBM=`dirname $PATH_NETPBM`
-fi
 
 # Checks for libraries.
 AC_CHECK_LIB(rt,clock_gettime,,AC_MSG_ERROR(zm requires librt))
 AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
 AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
 AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+if test "$BSD" == "0"; then
 AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+fi
 if test "$ZM_SSL_LIB" == "openssl"; then
 AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
 AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
@@ -374,14 +384,26 @@ AC_CHECK_HEADERS(execinfo.h,,,)
 AC_CHECK_HEADERS(ucontext.h,,,)
 AC_CHECK_HEADERS(sys/syscall.h,,,)
 AC_CHECK_HEADERS(pthread.h,,,)
-AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
-AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
+
+# Check for Video for Linux 1 Header Files
+ZM_HAS_V4L1=0
+AC_CHECK_HEADERS([libv4l1-videodev.h linux/videodev.h],[ZM_HAS_V4L1=1; break;],,)
+AC_SUBST(ZM_HAS_V4L1)
+
+# Check for Video for Linux 2 Header Files
+ZM_HAS_V4L2=0
+AC_CHECK_HEADERS(linux/videodev2.h,ZM_HAS_V4L2=1,,)
+AC_SUBST(ZM_HAS_V4L2)
+
+# Set global Video for Linux flag
+ZM_HAS_V4L=0
 if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then
-AC_SUBST(ZM_HAS_V4L,1)
+ZM_HAS_V4L=1
 else
-AC_SUBST(ZM_HAS_V4L,0)
 AC_MSG_WARN(zm requires Video4Linux or Video4Linux2 to be installed for analog or USB camera support)
 fi
+AC_SUBST(ZM_HAS_V4L)
+
 AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
 AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
 AC_LANG_PUSH([C])
diff --git a/db/zm_update-1.28.99.sql b/db/zm_update-1.28.99.sql
index 5c2c9aeff..660b19db4 100644
--- a/db/zm_update-1.28.99.sql
+++ b/db/zm_update-1.28.99.sql
@@ -108,4 +108,9 @@ SELECT * FROM (SELECT NULL as Id,
 WHERE NOT EXISTS (
     SELECT Name FROM Controls WHERE name = 'ONVIF Camera'
 ) LIMIT 1;
+--
+-- Hide USE_DEEP_STORAGE from user to prevent accidental event loss
+--
+UPDATE `zm`.`Config` SET `Category`='hidden' WHERE `Name`='ZM_USE_DEEP_STORAGE';
+
 
diff --git a/distros/debian_cmake/rules b/distros/debian_cmake/rules
index 0bf0f3362..aa0501ab1 100755
--- a/distros/debian_cmake/rules
+++ b/distros/debian_cmake/rules
@@ -22,7 +22,6 @@ override_dh_auto_configure:
 		-DZM_CGIDIR=/usr/lib/cgi-bin \
 		-DZM_WEB_USER=www-data \
 		-DZM_WEB_GROUP=www-data \
-		-DZM_PERL_SUBPREFIX=/share/perl5 \
 		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm
 
 override_dh_auto_install:
diff --git a/distros/fedora/CMakeLists.txt b/distros/fedora/CMakeLists.txt
index 7409a2e39..deec840f7 100644
--- a/distros/fedora/CMakeLists.txt
+++ b/distros/fedora/CMakeLists.txt
@@ -32,7 +32,7 @@ install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DE
 # Install auxillary files required to run zoneminder on Fedora
 install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-install(FILES zoneminder.tmpfiles DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
diff --git a/distros/fedora/archive/zoneminder.cmake.f19.spec b/distros/fedora/archive/zoneminder.cmake.f19.spec
index a7aee3265..771209247 100644
--- a/distros/fedora/archive/zoneminder.cmake.f19.spec
+++ b/distros/fedora/archive/zoneminder.cmake.f19.spec
@@ -72,7 +72,6 @@ too much degradation of performance.
 %build
 %cmake \
 	-DZM_TARGET_DISTRO="f19" \
-	-DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` \
 %{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
 %{?_without_x10:-DZM_NO_X10=ON} \
 	.
diff --git a/distros/fedora/zoneminder.f20.spec b/distros/fedora/zoneminder.f20.spec
index a49361ef3..59dfa6c1e 100644
--- a/distros/fedora/zoneminder.f20.spec
+++ b/distros/fedora/zoneminder.f20.spec
@@ -31,7 +31,7 @@ BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires: perl(Expect) perl(Sys::Syslog)
-BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
+BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
 %{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
@@ -76,7 +76,6 @@ too much degradation of performance.
 %build
 %cmake \
 	-DZM_TARGET_DISTRO="f20" \
-	-DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` \
 %{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
 %{?_without_x10:-DZM_NO_X10=ON} \
 	.
diff --git a/distros/fedora/zoneminder.f21.spec b/distros/fedora/zoneminder.f21.spec
index 31afc0417..94986336e 100644
--- a/distros/fedora/zoneminder.f21.spec
+++ b/distros/fedora/zoneminder.f21.spec
@@ -31,7 +31,7 @@ BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires: perl(Expect) perl(Sys::Syslog)
-BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
+BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
 %{!?_without_ffmpeg:BuildRequires: ffmpeg-devel}
 %{!?_without_x10:BuildRequires: perl(X10::ActiveHome) perl(Astro::SunTime)}
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
@@ -76,7 +76,6 @@ too much degradation of performance.
 %build
 %cmake \
 	-DZM_TARGET_DISTRO="f21" \
-	-DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` \
 %{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
 %{?_without_x10:-DZM_NO_X10=ON} \
 	.
@@ -155,8 +154,6 @@ fi
 %{!?_without_x10:%{_bindir}/zmx10.pl}
 
 %{perl_vendorlib}/ZoneMinder*
-%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
-#%{perl_archlib}/ZoneMinder*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
 %{_libexecdir}/zoneminder/cgi-bin
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 7422be107..129d666d4 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -58,7 +58,7 @@ if(ZM_TARGET_DISTRO STREQUAL "el7")
 	install(FILES zoneminder.el7.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 	install(FILES zoneminder.el7.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 	install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-	install(FILES zoneminder.tmpfiles DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+	install(FILES ../../misc/zoneminder-tmpfiles.conf DESTINATION /etc/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 else(ZM_TARGET_DISTRO STREQUAL "el7")
 	install(FILES zoneminder.el6.conf DESTINATION /etc/httpd/conf.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 	install(FILES zoneminder.el6.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 8ca8415dd..e50db96e7 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -73,7 +73,7 @@ too much degradation of performance.
 %build
 # Have to override CMAKE_INSTALL_LIBDIR for cmake < 2.8.7 due to this bug:
 # https://bugzilla.redhat.com/show_bug.cgi?id=795542
-%cmake -DZM_TARGET_DISTRO="el6" -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} -DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` .
+%cmake -DZM_TARGET_DISTRO="el6" -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} .
 
 make %{?_smp_mflags}
 
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index b21a3901d..63d7fe920 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -27,7 +27,7 @@ BuildRequires: perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires: perl(PHP::Serialization) perl(Sys::Mmap)
 BuildRequires: perl(Time::HiRes) perl(Net::SFTP::Foreign)
 BuildRequires: perl(Expect) perl(Sys::Syslog)
-BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
+BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel
 BuildRequires: ffmpeg ffmpeg-devel perl(X10::ActiveHome) perl(Astro::SunTime)
 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
 BuildRequires:  httpd polkit-devel
@@ -69,7 +69,6 @@ too much degradation of performance.
 %build
 %cmake \
 	-DZM_TARGET_DISTRO="el7" \
-	-DZM_PERL_SUBPREFIX=`x="%{perl_vendorlib}" ; echo ${x#"%{_prefix}"}` \
 	.
 
 make %{?_smp_mflags}
@@ -108,6 +107,8 @@ if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
     /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
+    echo -e "\nRemoving ZoneMinder SELinux policy module. Please wait.\n"
+    /usr/sbin/semodule -r local_zoneminder.pp
 fi
 
 %postun
@@ -129,7 +130,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README.md distros/redhat/README.Centos7 distros/redhat/jscalendar-doc
+%doc AUTHORS BUGS ChangeLog COPYING LICENSE NEWS README.md distros/redhat/README.Centos7 distros/redhat/jscalendar-doc
+%doc distros/redhat/cambozola-doc distros/redhat/local_zoneminder.te
 %config %attr(640,root,%{zmgid_final}) /etc/zm/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
@@ -157,7 +159,8 @@ fi
 %{_bindir}/zmx10.pl
 
 %{perl_vendorlib}/ZoneMinder*
-%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
+%{perl_vendorarch}/auto/ZoneMinder/.packlist
+#%{perl_vendorlib}/%{_arch}-linux-thread-multi/auto/ZoneMinder*
 #%{perl_archlib}/ZoneMinder*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
diff --git a/distros/ubuntu1504/README.Debian b/distros/ubuntu1504/README.Debian
new file mode 100644
index 000000000..b8ea413e3
--- /dev/null
+++ b/distros/ubuntu1504/README.Debian
@@ -0,0 +1,51 @@
+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.
+(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
+
+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/ubuntu1504/apache.conf b/distros/ubuntu1504/apache.conf
new file mode 100644
index 000000000..92a2b6414
--- /dev/null
+++ b/distros/ubuntu1504/apache.conf
@@ -0,0 +1,9 @@
+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/ubuntu1504/changelog b/distros/ubuntu1504/changelog
new file mode 100644
index 000000000..2dfc8b63c
--- /dev/null
+++ b/distros/ubuntu1504/changelog
@@ -0,0 +1,86 @@
+zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium
+
+  * maybe fix for RTSP Basic Auth
+  * Also remove dependency on netpbm
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 02 Mar 2015 11:25:59 -0500
+
+zoneminder (1.28.1+1-utopic-SNAPSHOT2015022301) utopic; urgency=medium
+
+  * Big merge of onvif support and some fixes.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 23 Feb 2015 19:45:45 -0500
+
+zoneminder (1.28.0+1-trusty-SNAPSHOT2015021201) trusty; urgency=medium
+
+  * add mysql-client-5.6 as a dependency instaed of mysql-client.  
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 Feb 2015 09:35:13 -0500
+
+zoneminder (1.28.0+1-trusty-SNAPSHOT2015011101) trusty; urgency=medium
+
+  * small changes
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 12 Dec 2014 16:38:36 -0500
+
+zoneminder (1.28.0+1-utopic-SNAPSHOT2014112001) utopic; urgency=medium
+
+  * Various fixes and developments since 1.28.0.  Includes Digest-Auth for HTTP and better for RTSP
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 20 Nov 2014 10:57:57 -0500
+
+zoneminder (1.28.0-trusty) trusty; urgency=medium
+
+  * Release
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:25:55 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014101401) trusty; urgency=medium
+
+  * Several PR merges in big push for 1.28.0
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Tue, 14 Oct 2014 09:28:29 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014092601) trusty; urgency=medium
+
+  * style updates and db fixes for database logging filters
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 26 Sep 2014 14:44:45 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014090801) trusty; urgency=medium
+
+  * several segfault fixes for local cameras
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 08 Sep 2014 16:56:57 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014090701) trusty; urgency=medium
+
+  * Fix segfaults for local cameras, also now includes the systemd support patch
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 07 Sep 2014 17:19:01 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014082102) trusty; urgency=medium
+
+  * Fix UI inputs for v4l multibuffer and captures per frame
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 12:03:31 -0400
+
+zoneminder (1.27.99+1-trusty-SNAPSHOT2014082101) trusty; urgency=medium
+
+  * fall back to Config table values for V4l MultiBUffer and Captures Per Frame
+  * add mention of monitor page settings for thse in the config table
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 10:04:46 -0400
+
+zoneminder (1.27.99+1-precise-SNAPSHOT2014080601) precise; 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>  Wed, 06 Aug 2014 20:20:20 -0400
+
+zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high
+
+  * Snapshot release - 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
diff --git a/distros/ubuntu1504/compat b/distros/ubuntu1504/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/distros/ubuntu1504/compat
@@ -0,0 +1 @@
+9
diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control
new file mode 100644
index 000000000..5b63046c3
--- /dev/null
+++ b/distros/ubuntu1504/control
@@ -0,0 +1,40 @@
+Source: zoneminder
+Section: net
+Priority: optional
+Maintainer: Isaac Connor <iconnor@connortechnology.com>
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), autoconf, automake, quilt, 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-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libavdevice-ffmpeg-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
+Standards-Version: 3.9.4
+
+Package: zoneminder
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl
+Recommends: mysql-server|mariadb-server
+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: zoneminder-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for zoneminder.
+ ZoneMinder is a 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.
diff --git a/distros/ubuntu1504/copyright b/distros/ubuntu1504/copyright
new file mode 100644
index 000000000..a177502a0
--- /dev/null
+++ b/distros/ubuntu1504/copyright
@@ -0,0 +1,22 @@
+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/ubuntu1504/dirs b/distros/ubuntu1504/dirs
new file mode 100644
index 000000000..4178482c1
--- /dev/null
+++ b/distros/ubuntu1504/dirs
@@ -0,0 +1,6 @@
+var/log/zm
+var/lib/zm
+var/cache/zoneminder/events
+var/cache/zoneminder/images
+var/cache/zoneminder/temp
+usr/share/zoneminder/db
diff --git a/distros/ubuntu1504/docs b/distros/ubuntu1504/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/distros/ubuntu1504/docs
@@ -0,0 +1 @@
+README.md
diff --git a/distros/ubuntu1504/install b/distros/ubuntu1504/install
new file mode 100644
index 000000000..4b0009cea
--- /dev/null
+++ b/distros/ubuntu1504/install
@@ -0,0 +1,12 @@
+usr/bin
+usr/lib/cgi-bin
+usr/share/man
+usr/share/perl5/ZoneMinder
+usr/share/perl5/ZoneMinder.pm
+usr/share/polkit-1/actions
+usr/share/polkit-1/rules.d
+usr/share/zoneminder
+etc/zm
+db/zm_create.sql usr/share/zoneminder/db
+db/zm_update-*.sql usr/share/zoneminder/db
+debian/apache.conf etc/zm
diff --git a/distros/ubuntu1504/links b/distros/ubuntu1504/links
new file mode 100644
index 000000000..9715ee428
--- /dev/null
+++ b/distros/ubuntu1504/links
@@ -0,0 +1,4 @@
+var/cache/zoneminder/events usr/share/zoneminder/events
+var/cache/zoneminder/images usr/share/zoneminder/images
+var/cache/zoneminder/temp   usr/share/zoneminder/temp
+usr/lib/cgi-bin             usr/share/zoneminder/cgi-bin
diff --git a/distros/ubuntu1504/patches/series b/distros/ubuntu1504/patches/series
new file mode 100644
index 000000000..e69de29bb
diff --git a/distros/ubuntu1504/postinst b/distros/ubuntu1504/postinst
new file mode 100644
index 000000000..e009a9799
--- /dev/null
+++ b/distros/ubuntu1504/postinst
@@ -0,0 +1,53 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	if [ -e "/lib/systemd/system/mysql.service" ]; then 
+		#
+		# Get mysql started if it isn't
+		#
+		if ! $(systemctl is-active mysql >/dev/null 2>&1); then
+				systemctl start mysql
+		fi
+		if $(systemctl is-active mysql >/dev/null 2>&1); then
+			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
+				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+			fi
+
+			systemctl stop zoneminder || true  #not sure about "|| true"
+			zmupdate.pl --nointeractive
+
+		else
+			echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+		fi
+	else 
+		echo 'mysql not found, assuming remote server.'
+	fi
+	chown www-data:www-data /var/log/zm
+	chown www-data:www-data /var/lib/zm/
+	if [ -z "$2" ]; then
+			chown www-data:www-data -R /var/cache/zoneminder
+	fi
+fi
+# Ensure zoneminder is stopped...
+if [ -e "/lib/systemd/system/zoneminder.service" ]; then  #changed from -x to -e, could be wrong
+        if systemctl is-active zoneminder >/dev/null 2>&1 ; then
+                systemctl stop zoneminder || exit $?
+        fi
+fi
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		chown www-data:www-data /var/log/zm
+		chown www-data:www-data /var/lib/zm/
+		chown www-data:www-data -R /var/cache/zoneminder
+    else
+		chown www-data:www-data /var/log/zm
+		zmupdate.pl
+	fi
+fi
+#DEBHELPER#
diff --git a/distros/ubuntu1504/postrm b/distros/ubuntu1504/postrm
new file mode 100644
index 000000000..28a00a7a0
--- /dev/null
+++ b/distros/ubuntu1504/postrm
@@ -0,0 +1,9 @@
+#! /bin/sh
+# set -e # to be reinstated later
+
+if [ "$1" = "purge" ]; then
+    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+fi
+#DEBHELPER#
diff --git a/distros/ubuntu1504/preinst b/distros/ubuntu1504/preinst
new file mode 100755
index 000000000..6cd01ba55
--- /dev/null
+++ b/distros/ubuntu1504/preinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+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/ubuntu1504/rules b/distros/ubuntu1504/rules
new file mode 100755
index 000000000..280d5faef
--- /dev/null
+++ b/distros/ubuntu1504/rules
@@ -0,0 +1,67 @@
+#!/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 -g
+CPPFLAGS = -D__STDC_CONSTANT_MACROS
+CXXFLAGS = -DHAVE_LIBCRYPTO
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+%:
+	dh $@ --with quilt,autoreconf,systemd
+
+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-crashtrace=no --enable-mmap=yes
+
+override_dh_clean:
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+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
+	dh_link var/cache/zoneminder/events usr/share/zoneminder/events
+	dh_link var/cache/zoneminder/images usr/share/zoneminder/images
+	dh_link var/cache/zoneminder/temp usr/share/zoneminder/temp
+
+	#
+	# 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.
+	#
+	dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
+
+override_dh_fixperms:
+	dh_fixperms
+	chown root:root debian/zoneminder/etc/zm/zm.conf
+
+override_dh_auto_test:
+	# do not run tests...
+
+.PHONY: override_dh_strip
+override_dh_strip:
+		dh_strip --dbg-package=zoneminder-dbg
diff --git a/distros/ubuntu1504/watch b/distros/ubuntu1504/watch
new file mode 100644
index 000000000..5a8a9c4d7
--- /dev/null
+++ b/distros/ubuntu1504/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.zoneminder.com/downloads.html \
+  .*/ZoneMinder-(.*).tar.gz
diff --git a/distros/ubuntu1504/zoneminder.service b/distros/ubuntu1504/zoneminder.service
new file mode 100644
index 000000000..3ce608a49
--- /dev/null
+++ b/distros/ubuntu1504/zoneminder.service
@@ -0,0 +1,16 @@
+# ZoneMinder systemd unit file
+ # This file is intended to work with all Linux distributions
+ [Unit]
+ Description=ZoneMinder CCTV recording and security system
+ After=network.target mysql.service apache2.service
+ Requires=mysql.service apache2.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="/run/zm/zm.pid"
+ [Install]
+ WantedBy=multi-user.target
+
diff --git a/distros/ubuntu1504/zoneminder.tmpfile b/distros/ubuntu1504/zoneminder.tmpfile
new file mode 100644
index 000000000..036883750
--- /dev/null
+++ b/distros/ubuntu1504/zoneminder.tmpfile
@@ -0,0 +1,2 @@
+d /var/run/zm 0755 www-data www-data
+
diff --git a/m4/ac_check_sendfile.m4 b/m4/ac_check_sendfile.m4
new file mode 100644
index 000000000..12605d588
--- /dev/null
+++ b/m4/ac_check_sendfile.m4
@@ -0,0 +1,63 @@
+AC_DEFUN([AC_CHECK_SENDFILE],[
+AC_MSG_CHECKING([whether sendfile() is supported and what prototype it has])
+
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+ac_sendfile_supported=no
+AC_TRY_LINK([#include <sys/sendfile.h>
+               #include <stdio.h>],
+       [sendfile(1, 1, NULL, 0);],
+       [
+               AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
+                       [Define this if Linux/Solaris sendfile() is supported])
+               AC_MSG_RESULT([Linux sendfile()])
+               ac_sendfile_supported=yes
+       ], [])
+
+if test x$ac_sendfile_supported = xno; then
+       dnl Checking wether we need libsendfile
+       dnl Presumably on Solaris
+       AC_CHECK_LIB(sendfile, sendfile,
+               [
+                       AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
+                               [Define this if Linux/Solaris sendfile() is supported])
+                       SENDFILE_LIBS="-lsendfile"
+                       AC_SUBST(SENDFILE_LIBS)
+                       AC_MSG_RESULT([Solaris sendfile()])
+                       ac_sendfile_supported=yes
+               ], [])
+fi
+
+if test x$ac_sendfile_supported = xno; then
+       dnl Checking wether we have FreeBSD-like sendfile() support.
+       AC_TRY_LINK([#include <sys/socket.h>
+                       #include <stdio.h>],
+               [sendfile(1, 1, 0, 0, NULL, NULL, 0);],
+               [
+                       AC_DEFINE(HAVE_SENDFILE7_SUPPORT, 1,
+                               [Define this if FreeBSD sendfile() is supported])
+                       AC_MSG_RESULT([FreeBSD sendfile()])
+                       ac_sendfile_supported=yes
+               ], [])
+fi
+
+if test x$ac_sendfile_supported = xno; then
+       dnl Checking wether we have MacOS-like sendfile() support.
+       AC_TRY_LINK([#include <sys/socket.h>
+                       #include <stdio.h>
+                       #include <sys/uio.h>],
+               [sendfile(1, 1, 0, NULL, NULL, 0);],
+               [
+                       AC_DEFINE(HAVE_SENDFILE6_SUPPORT, 1,
+                               [Define this if MacOS sendfile() is supported])
+                       AC_MSG_RESULT([MacOS sendfile()])
+                       ac_sendfile_supported=yes
+               ], [])
+fi
+
+CFLAGS="$saved_CFLAGS"
+
+if test x$ac_sendfile_supported = xno; then
+       AC_MSG_RESULT([no sendfile() support, using read/send])
+fi
+])
diff --git a/misc/zoneminder-tmpfiles.conf.in b/misc/zoneminder-tmpfiles.conf.in
index 8f55ce295..79b27f909 100644
--- a/misc/zoneminder-tmpfiles.conf.in
+++ b/misc/zoneminder-tmpfiles.conf.in
@@ -1 +1,4 @@
-d @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_RUNDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+
diff --git a/onvif/modules/CMakeLists.txt b/onvif/modules/CMakeLists.txt
index 5e3a878bb..9e46ef9f7 100644
--- a/onvif/modules/CMakeLists.txt
+++ b/onvif/modules/CMakeLists.txt
@@ -1,10 +1,18 @@
+# CMakeLists.txt for the ZoneMinder ONVIF modules.
 
+# If this is an out-of-source build, copy the files we need to the binary directory
+if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+
+# MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifmodules ALL perl Makefile.PL FIRST_MAKEFILE=MakefilePerl PREFIX="${CMAKE_CURRENT_BINARY_DIR}/output" LIB="${CMAKE_CURRENT_BINARY_DIR}/output/${ZM_PERL_SUBPREFIX}" INSTALLSITEMAN3DIR="${CMAKE_CURRENT_BINARY_DIR}/output/${CMAKE_INSTALL_MANDIR}/man3" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "${CMAKE_INSTALL_PREFIX}")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
 
 # Add additional files and directories to make clean
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "output;blib;pm_to_blib;MakefilePerl")
diff --git a/onvif/proxy/CMakeLists.txt b/onvif/proxy/CMakeLists.txt
index fece81d11..0051bf2b1 100644
--- a/onvif/proxy/CMakeLists.txt
+++ b/onvif/proxy/CMakeLists.txt
@@ -1,10 +1,18 @@
+# CMakeLists.txt for the ZoneMinder ONVIF proxy module.
 
+# If this is an out-of-source build, copy the files we need to the binary directory
+if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+
+# MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifproxy ALL perl Makefile.PL FIRST_MAKEFILE=MakefilePerl PREFIX="${CMAKE_CURRENT_BINARY_DIR}/output" LIB="${CMAKE_CURRENT_BINARY_DIR}/output/${ZM_PERL_SUBPREFIX}" INSTALLSITEMAN3DIR="${CMAKE_CURRENT_BINARY_DIR}/output/${CMAKE_INSTALL_MANDIR}/man3" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "${CMAKE_INSTALL_PREFIX}")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
 
 # Add additional files and directories to make clean
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "output;blib;pm_to_blib;MakefilePerl")
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
index 61bee83af..09c02b816 100644
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -2,13 +2,13 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Changes" "${CMAKE_CURRENT_BINARY_DIR}/Changes")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" "${CMAKE_CURRENT_BINARY_DIR}/MANIFEST")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" "${CMAKE_CURRENT_BINARY_DIR}/META.yml")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/README" "${CMAKE_CURRENT_BINARY_DIR}/README")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/t" "${CMAKE_CURRENT_BINARY_DIR}/t")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/lib" "${CMAKE_CURRENT_BINARY_DIR}/lib")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Changes" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/t" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
 endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 
 # Create files from the .in files
@@ -24,10 +24,10 @@ else(CMAKE_VERBOSE_MAKEFILE)
 endif(CMAKE_VERBOSE_MAKEFILE)
 
 # Add build target for the perl modules
-add_custom_target(zmperlmodules ALL perl Makefile.PL FIRST_MAKEFILE=MakefilePerl PREFIX="${CMAKE_CURRENT_BINARY_DIR}/output" LIB="${CMAKE_CURRENT_BINARY_DIR}/output/${ZM_PERL_SUBPREFIX}" INSTALLSITEMAN3DIR="${CMAKE_CURRENT_BINARY_DIR}/output/${CMAKE_INSTALL_MANDIR}/man3" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
 
 # Add install target for the perl modules
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "${CMAKE_INSTALL_PREFIX}")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
 
 # Add additional files and directories to make clean
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "output;blib;pm_to_blib;MakefilePerl")
diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm
index 41c972650..87a6b14b7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder.pm
@@ -36,34 +36,42 @@ use ZoneMinder::General qw(:all);
 use ZoneMinder::Database qw(:all);
 use ZoneMinder::Memory qw(:all);
 
-our @ISA = qw(Exporter ZoneMinder::Base ZoneMinder::Config ZoneMinder::Logger ZoneMinder::General ZoneMinder::Database ZoneMinder::Memory);
+our @ISA = qw(
+    Exporter
+    ZoneMinder::Base
+    ZoneMinder::Config
+    ZoneMinder::Logger
+    ZoneMinder::General
+    ZoneMinder::Database
+    ZoneMinder::Memory
+);
 
 # Items to export into callers namespace by default. Note: do not export
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'base' => [ 
-		@ZoneMinder::Base::EXPORT_OK
-	],
-	'config' => [ 
-		@ZoneMinder::Config::EXPORT_OK
-	],
-	'debug' => [ 
-		@ZoneMinder::Logger::EXPORT_OK
-	],
-	'general' => [ 
-		@ZoneMinder::General::EXPORT_OK
-	],
-	'database' => [ 
-		@ZoneMinder::Database::EXPORT_OK
-	],
-	'memory' => [ 
-		@ZoneMinder::Memory::EXPORT_OK
-	],
+    'base' => [ 
+        @ZoneMinder::Base::EXPORT_OK
+    ],
+    'config' => [ 
+        @ZoneMinder::Config::EXPORT_OK
+    ],
+    'debug' => [ 
+        @ZoneMinder::Logger::EXPORT_OK
+    ],
+    'general' => [ 
+        @ZoneMinder::General::EXPORT_OK
+    ],
+    'database' => [ 
+        @ZoneMinder::Database::EXPORT_OK
+    ],
+    'memory' => [ 
+        @ZoneMinder::Memory::EXPORT_OK
+    ],
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in
index 3f10e9137..70140ea66 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Base.pm.in
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Base;
@@ -38,7 +38,7 @@ use constant ZM_VERSION => "@VERSION@";
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration  use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = ( 'all' => [ qw(ZM_VERSION) ] );
@@ -62,7 +62,11 @@ ZoneMinder::Base - Base perl module for ZoneMinder
 
 =head1 DESCRIPTION
 
-This module is the base module for the rest of the ZoneMinder modules. It is included by each of the other modules but serves no purpose other than to propagate the perl module version amongst the other modules. You will never need to use this module directly but if you write new ZoneMinder modules they should include it.
+This module is the base module for the rest of the ZoneMinder modules. It
+is included by each of the other modules but serves no purpose other than
+to propagate the perl module version amongst the other modules. You will
+never need to use this module directly but if you write new ZoneMinder
+modules they should include it.
 
 =head2 EXPORT
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 21f7a2d50..e38d151c0 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Config;
@@ -38,15 +38,15 @@ use vars qw( %Config );
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our @EXPORT_CONFIG = qw( %Config ); # Get populated by BEGIN
 
 our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		ZM_PID
-	) ]
+    'constants' => [ qw(
+        ZM_PID
+    ) ]
 );
 push( @{$EXPORT_TAGS{config}}, @EXPORT_CONFIG );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
@@ -65,38 +65,43 @@ use Carp;
 # Load the config from the database into the symbol table
 BEGIN
 {
-	my $config_file = ZM_CONFIG;
-	( my $local_config_file = $config_file ) =~ s|^.*/|./|;
-	if ( -s $local_config_file and -r $local_config_file )
-	{
-		print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
-		$config_file = $local_config_file;
-	}
-	open( CONFIG, "<".$config_file ) or croak( "Can't open config file '$config_file': $!" );
-	foreach my $str ( <CONFIG> )
-	{
-		next if ( $str =~ /^\s*$/ );
-		next if ( $str =~ /^\s*#/ );
+    my $config_file = ZM_CONFIG;
+    ( my $local_config_file = $config_file ) =~ s|^.*/|./|;
+    if ( -s $local_config_file and -r $local_config_file )
+    {
+        print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
+        $config_file = $local_config_file;
+    }
+    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*#/ );
         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/;
-		$Config{$name} = $value;
-	}
-	close( CONFIG );
+        if ( ! $name ) {
+            print( STDERR "Warning, bad line in $config_file: $str\n" );
+            next;
+        } # end if
+        $name =~ tr/a-z/A-Z/;
+        $Config{$name} = $value;
+    }
+    close( $CONFIG );
 
-	use DBI;
-	my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$Config{ZM_DB_HOST}, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} ) or croak( "Can't connect to db" );
-	my $sql = 'select * 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() ) {
-		$Config{$config->{Name}} = $config->{Value};
-	}
-	$sth->finish();
-	#$dbh->disconnect();
+    use DBI;
+    my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                           .";host=".$Config{ZM_DB_HOST}
+                           , $Config{ZM_DB_USER}
+                           , $Config{ZM_DB_PASS}
+    ) or croak( "Can't connect to db" );
+    my $sql = 'select * 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() ) {
+        $Config{$config->{Name}} = $config->{Value};
+    }
+    $sth->finish();
+    #$dbh->disconnect();
 }
 
 1;
@@ -112,9 +117,16 @@ ZoneMinder::Config - ZoneMinder configuration module.
 
 =head1 DESCRIPTION
 
-The ZoneMinder::Config module is used to import the ZoneMinder configuration from the database. It will do this at compile time in a BEGIN block and require access to the zm.conf file either in the current directory or in its defined location in order to determine database access details, configuration from this file will also be included. If the :all or :config tags are used then this configuration is exported into the namespace of the calling program or module.
+The ZoneMinder::Config module is used to import the ZoneMinder
+configuration from the database. It will do this at compile time in a BEGIN
+block and require access to the zm.conf file either in the current
+directory or in its defined location in order to determine database access
+details, configuration from this file will also be included. If the :all or
+:config tags are used then this configuration is exported into the
+namespace of the calling program or module.
 
-Once the configuration has been imported then configuration variables are defined as constants and can be accessed directory by name, e.g.
+Once the configuration has been imported then configuration variables are
+defined as constants and can be accessed directory by name, e.g.
 
  $lang = $Config{ZM_LANG_DEFAULT};
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm b/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
index 673e13c98..f586448fb 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the debug definitions and functions used by the rest 
+# This module contains the debug definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::ConfigAdmin;
@@ -37,14 +37,14 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		loadConfigFromDB
-		saveConfigToDB
-	) ]
+    'functions' => [ qw(
+        loadConfigFromDB
+        saveConfigToDB
+    ) ]
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -67,99 +67,138 @@ use Carp;
 
 sub loadConfigFromDB
 {
-	print( "Loading config from DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$Config{ZM_DB_HOST}, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
-	
-	if ( !$dbh )
-	{
-		print( "Error: unable to load options from database: $DBI::errstr\n" );
-		return( 0 );
-	}
-	my $sql = "select * 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() );
-	my $option_count = 0;
-	while( my $config = $sth->fetchrow_hashref() )
-	{
-		my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
-		#print( "Name = '$name'\n" );
-		my $option = $options_hash{$name};
-		if ( !$option )
-		{
-			warn( "No option '$name' found, removing" );
-			next;
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		if ( defined($value) )
-		{
-			if ( $option->{type} == $types{boolean} )
-			{
-				$option->{value} = $value?"yes":"no";
-			}
-			else
-			{
-				$option->{value} = $value;
-			}
-		}
-		$option_count++;;
-	}
-	$sth->finish();
-	$dbh->disconnect();
-	return( $option_count );
+    print( "Loading config from DB\n" );
+    my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                           .";host=".$Config{ZM_DB_HOST}
+                           ,$Config{ZM_DB_USER}
+                           ,$Config{ZM_DB_PASS}
+    );
+
+    if ( !$dbh )
+    {
+        print( "Error: unable to load options from database: $DBI::errstr\n" );
+        return( 0 );
+    }
+    my $sql = "select * 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() );
+    my $option_count = 0;
+    while( my $config = $sth->fetchrow_hashref() )
+    {
+        my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
+        #print( "Name = '$name'\n" );
+        my $option = $options_hash{$name};
+        if ( !$option )
+        {
+            warn( "No option '$name' found, removing" );
+            next;
+        }
+        #next if ( $option->{category} eq 'hidden' );
+        if ( defined($value) )
+        {
+            if ( $option->{type} == $types{boolean} )
+            {
+                $option->{value} = $value?"yes":"no";
+            }
+            else
+            {
+                $option->{value} = $value;
+            }
+        }
+        $option_count++;;
+    }
+    $sth->finish();
+    $dbh->disconnect();
+    return( $option_count );
 }
 
 sub saveConfigToDB
 {
-	print( "Saving config to DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$Config{ZM_DB_HOST}, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
+    print( "Saving config to DB\n" );
+    my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                           .";host=".$Config{ZM_DB_HOST}
+                           ,$Config{ZM_DB_USER}
+                           ,$Config{ZM_DB_PASS}
+    );
 
-	if ( !$dbh )
-	{
-		print( "Error: unable to save options to database: $DBI::errstr\n" );
-		return( 0 );
-	}
+    if ( !$dbh )
+    {
+        print( "Error: unable to save options to database: $DBI::errstr\n" );
+        return( 0 );
+    }
 
     my $ac = $dbh->{AutoCommit};
     $dbh->{AutoCommit} = 0;
 
-    $dbh->do('LOCK TABLE Config WRITE') or croak( "Can't lock Config table: " . $dbh->errstr() );
+    $dbh->do('LOCK TABLE Config WRITE')
+        or croak( "Can't lock Config table: " . $dbh->errstr() );
 
-	my $sql = "delete from Config";
-	my $res = $dbh->do( $sql ) or croak( "Can't do '$sql': ".$dbh->errstr() );
+    my $sql = "delete from Config";
+    my $res = $dbh->do( $sql )
+        or croak( "Can't do '$sql': ".$dbh->errstr() );
 
-	$sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
-	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} );
-		$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 ( 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
-		{
-		}
-		my $res = $sth->execute( $option->{id}, $option->{name}, $option->{db_value}, $option->{db_type}, $option->{default}, $option->{db_hint}, $option->{db_pattern}, $option->{db_format}, $option->{description}, $option->{help}, $option->{category}, $option->{readonly}?1:0, $option->{db_requires} ) or croak( "Can't execute: ".$sth->errstr() );
-	}
-	$sth->finish();
+    $sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
+    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} );
+        $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 ( 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
+        {
+        }
+        my $res = $sth->execute(
+            $option->{id},
+            $option->{name},
+            $option->{db_value},
+            $option->{db_type},
+            $option->{default},
+            $option->{db_hint},
+            $option->{db_pattern},
+            $option->{db_format},
+            $option->{description},
+            $option->{help},
+            $option->{category},
+            $option->{readonly} ? 1 : 0,
+            $option->{db_requires}
+        ) or croak( "Can't execute: ".$sth->errstr() );
+    }
+    $sth->finish();
 
     $dbh->do('UNLOCK TABLES');
     $dbh->{AutoCommit} = $ac;
 
-	$dbh->disconnect();
+    $dbh->disconnect();
 }
 
 1;
@@ -179,9 +218,15 @@ ZoneMinder::ConfigAdmin - ZoneMinder Configuration Administration module
 
 =head1 DESCRIPTION
 
-The ZoneMinder:ConfigAdmin module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
+The ZoneMinder:ConfigAdmin module contains the master definition of the
+ZoneMinder configuration options as well as helper methods. This module is
+intended for specialist confguration management and would not normally be
+used by end users.
 
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
+The configuration held in this module, which was previously in zmconfig.pl,
+includes the name, default value, description, help text, type and category
+for each option, as well as a number of additional fields in a small number
+of cases.
 
 =head1 METHODS
 
@@ -189,11 +234,19 @@ The configuration held in this module, which was previously in zmconfig.pl, incl
 
 =item loadConfigFromDB ();
 
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
+Loads existing configuration from the database (if any) and merges it with
+the definitions held in this module. This results in the merging of any new
+configuration and the removal of any deprecated configuration while
+preserving the existing values of every else.
 
 =item saveConfigToDB ();
 
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
+Saves configuration held in memory to the database. The act of loading and
+saving configuration is a convenient way to ensure that the configuration
+held in the database corresponds with the most recent definitions and that
+all components are using the same set of configuration.
+
+=back
 
 =head2 EXPORT
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index b5eec34a4..e55e856e4 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the debug definitions and functions used by the rest 
+# This module contains the debug definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::ConfigData;
@@ -37,15 +37,15 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'data' => [ qw(
-		%types
-		@options
-		%options_hash
-	) ]
+    'data' => [ qw(
+        %types
+        @options
+        %options_hash
+    ) ]
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -73,952 +73,2022 @@ sub INIT
 # Types
 our %types =
 (
-	string => { db_type=>"string", hint=>"string", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	alphanum => { db_type=>"string", hint=>"alphanumeric", pattern=>qr|^([a-zA-Z0-9-_]+)$|, format=>q( $1 ) },
-	text => { db_type=>"text", hint=>"free text", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	boolean => { db_type=>"boolean", hint=>"yes|no", pattern=>qr|^([yn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : "no" ) },
-	integer => { db_type=>"integer", hint=>"integer", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-	decimal => { db_type=>"decimal", hint=>"decimal", pattern=>qr|^(\d+(?:\.\d+)?)$|, format=>q( $1 ) },
-	hexadecimal => { db_type=>"hexadecimal", hint=>"hexadecimal", pattern=>qr|^(?:0x)?([0-9a-f]{1,8})$|, format=>q( "0x".$1 ) },
-	tristate => { db_type=>"string", hint=>"auto|yes|no", pattern=>qr|^([ayn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : ($1 =~ /^n/ ? "no" : "auto" ) ) },
-	abs_path => { db_type=>"string", hint=>"/absolute/path/to/somewhere", pattern=>qr|^((?:/[^/]*)+?)/?$|, format=>q( $1 ) },
-	rel_path => { db_type=>"string", hint=>"relative/path/to/somewhere", pattern=>qr|^((?:[^/].*)?)/?$|, format=>q( $1 ) },
-	directory => { db_type=>"string", hint=>"directory", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	file => { db_type=>"string", hint=>"filename", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	hostname => { db_type=>"string", hint=>"host.your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)$|, format=>q( $1 ) },
-	url => { db_type=>"string", hint=>"http://host.your.domain/", pattern=>qr|^(?:http://)?(.+)$|, format=>q( "http://".$1 ) },
-	email => { db_type=>"string", hint=>"your.name\@your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|, format=>q( $1\@$2 ) },
+    string => {
+        db_type     =>"string",
+        hint        =>"string",
+        pattern     =>qr|^(.+)$|,
+        format      =>q( $1 )
+    },
+    alphanum => {
+        db_type     =>"string",
+        hint        =>"alphanumeric",
+        pattern     =>qr|^([a-zA-Z0-9-_]+)$|,
+        format      =>q( $1 )
+    },
+    text => {
+        db_type     =>"text",
+        hint        =>"free text",
+        pattern     =>qr|^(.+)$|,
+        format      =>q( $1 )
+    },
+    boolean => {
+        db_type     =>"boolean",
+        hint        =>"yes|no",
+        pattern     =>qr|^([yn])|i,
+        check       =>q( $1 ),
+        format      =>q( ($1 =~ /^y/)
+                          ? "yes"
+                          : "no"
+                       )
+    },
+    integer => {
+        db_type     =>"integer",
+        hint        =>"integer",
+        pattern     =>qr|^(\d+)$|,
+        format      =>q( $1 )
+    },
+    decimal => {
+        db_type     =>"decimal",
+        hint        =>"decimal",
+        pattern     =>qr|^(\d+(?:\.\d+)?)$|,
+        format      =>q( $1 )
+    },
+    hexadecimal => {
+        db_type     =>"hexadecimal",
+        hint        =>"hexadecimal",
+        pattern     =>qr|^(?:0x)?([0-9a-f]{1,8})$|,
+        format      =>q( "0x".$1 )
+    },
+    tristate => {
+        db_type     =>"string",
+        hint        =>"auto|yes|no",
+        pattern     =>qr|^([ayn])|i, check=>q( $1 ),
+        format      =>q( ($1 =~ /^y/)
+                         ? "yes"
+                         : ($1 =~ /^n/ ? "no" : "auto" )
+                       )
+    },
+    abs_path => {
+        db_type     =>"string",
+        hint        =>"/absolute/path/to/somewhere",
+        pattern     =>qr|^((?:/[^/]*)+?)/?$|,
+        format      =>q( $1 )
+    },
+    rel_path => {
+        db_type     =>"string",
+        hint        =>"relative/path/to/somewhere",
+        pattern     =>qr|^((?:[^/].*)?)/?$|,
+        format      =>q( $1 )
+    },
+    directory => {
+        db_type     =>"string",
+        hint        =>"directory",
+        pattern     =>qr|^([a-zA-Z0-9-_.]+)$|,
+        format      =>q( $1 )
+    },
+    file => {
+        db_type     =>"string",
+        hint        =>"filename",
+        pattern     =>qr|^([a-zA-Z0-9-_.]+)$|,
+        format      =>q( $1 )
+    },
+    hostname => {
+        db_type     =>"string",
+        hint        =>"host.your.domain",
+        pattern     =>qr|^([a-zA-Z0-9_.-]+)$|,
+        format      =>q( $1 )
+    },
+    url => {
+        db_type     =>"string",
+        hint        =>"http://host.your.domain/",
+        pattern     =>qr|^(?:http://)?(.+)$|,
+        format      =>q( "http://".$1 )
+    },
+    email => {
+        db_type     =>"string",
+        hint        =>"your.name\@your.domain",
+        pattern     =>qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|,
+        format      =>q( $1\@$2 )
+    },
 );
 
+sub qqq {    ## Un-pad paragraph of text.
+    local $_ = shift;
+    s{\n?^\s*}{ }mg;
+    return $_;
+}
+
 our @options =
 (
     {
-        name => "ZM_SKIN_DEFAULT",
-        default => "classic",
+        name        => "ZM_SKIN_DEFAULT",
+        default     => "classic",
         description => "Default skin used by web interface",
-        help => "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.",
-        type => $types{string},
-        category => "system",
+
+        help        => qqq("
+            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.
+        "),
+        type        => $types{string},
+        category    => "system",
     },
     {
-        name => "ZM_CSS_DEFAULT",
-        default => "classic",
+        name        => "ZM_CSS_DEFAULT",
+        default     => "classic",
         description => "Default set of css files used by web interface",
-        help => "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.",
-        type => $types{string},
-        category => "system",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{string},
+        category    => "system",
     },
-	{
-		name => "ZM_LANG_DEFAULT",
-		default => "en_gb",
-		description => "Default language used by web interface",
-		help => "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",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_USE_AUTH",
-		default => "no",
-		description => "Authenticate user logins to ZoneMinder",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_TYPE",
-		default => "builtin",
-		description => "What is used to authenticate ZoneMinder users",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"builtin|remote", pattern=>qr|^([br])|i, format=>q( $1 =~ /^b/ ? "builtin" : "remote" ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_RELAY",
-		default => "hashed",
-		description => "Method used to relay authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"hashed|plain|none", pattern=>qr|^([hpn])|i, format=>q( ($1 =~ /^h/) ? "hashed" : ($1 =~ /^p/ ? "plain" : "none" ) ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_SECRET",
-		default => "...Change me to something unique...",
-		description => "Secret for encoding hashed authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_IPS",
-		default => "yes",
-		description => "Include IP addresses in the authentication hash",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_LOGINS",
-		default => "no",
-		description => "Allow login by authentication hash",
-		help => "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 hae 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 somethign unique to your system.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_DIR_EVENTS",
-		default => "events",
-		description => "Directory where events are stored",
-		help => "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.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_USE_DEEP_STORAGE",
-		default => "yes",
-		description => "Use a deep filesystem hierarchy for events",
-		help => "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.",
-		type => $types{boolean},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_IMAGES",
-		default => "images",
-		description => "Directory where the images that the ZoneMinder client generates are stored",
-		help => "ZoneMinder generates a myriad of images, mostly of which are associated with events. For those that aren't this is where they go. 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 save images to a second disk or network share, then you should mount the drive or share directly to the ZoneMinder images folder or follow the instructions in the ZoneMinder Wiki titled Using a dedicated Hard Drive.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_SOUNDS",
-		default => "sounds",
-		description => "Directory to the sounds that the ZoneMinder client can use",
-		help => "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.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_ZMS",
-		default => "/cgi-bin/nph-zms",
-		description => "Web path to zms streaming server",
-		help => "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'.",
-		type => $types{rel_path},
-		category => "paths",
-	},
-    	{
-        	name => "ZM_USE_MKV_STORAGE",
-		default => "no",
-		description => "UNDER DEVELOPMENT: Use a .mkv storage for events vs. JPEG",
-		help => "This is currently under active development and not working correctly. For now, ensure /var/www/zm/eventtemp is present and able to be written to (otherwise change the source). Please only use this option if you know what you're doing!",
-		type => $types{boolean},
-		category => "paths",
-	},
-	{
-		name => "ZM_COLOUR_JPEG_FILES",
-		default => "no",
-		description => "Colourise greyscale JPEG files",
-		help => "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.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_ADD_JPEG_COMMENTS",
-		default => "no",
-		description => "Add jpeg timestamp annotations as file header comments",
-		help => "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.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_FILE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the saved event files (1-100)",
-		help => "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.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_ALARM_FILE_QUALITY",
-		default => "0",
-		description => "Set the JPEG quality setting for the saved event files during an alarm (1-100)",
-		help => "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 acccidentally saving important images at a worse quality setting.",
-		type => $types{integer},
-		category => "images",
-	},
-    # Deprecated, now stream quality
-	{
-		name => "ZM_JPEG_IMAGE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "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",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "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 => "images",
-	},
-	{
-		name => "ZM_MPEG_TIMED_FRAMES",
-		default => "yes",
-		description => "Tag video frames with a timestamp for more realistic streaming",
-		help => "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.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_LIVE_FORMAT",
-		default => "swf",
-		description => "What format 'live' video streams are played in",
-		help => "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",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_REPLAY_FORMAT",
-		default => "swf",
-		description => "What format 'replay' video streams are played in",
-		help => "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",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_RAND_STREAM",
-		default => "yes",
-		description => "Add a random string to prevent caching of streams",
-		help => "Some browsers can cache the streams used by ZoneMinder. In order to prevent his a harmless random string can be appended to the url to make each invocation of the stream appear unique.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_OPT_CAMBOZOLA",
-		default => "no",
-		description => "Is the (optional) cambozola java streaming client installed",
-		help => "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.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_CAMBOZOLA",
-		default => "cambozola.jar",
-		description => "Web path to (optional) cambozola java streaming client",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_CAMBOZOLA", value=>"yes" } ],
-		type => $types{rel_path},
-		category => "images",
-	},
-	{
-		name => "ZM_RELOAD_CAMBOZOLA",
-		default => "0",
-		description => "After how many seconds should Cambozola be reloaded in live view",
-		help => "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.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_TIMESTAMP_ON_CAPTURE",
-		default => "yes",
-		description => "Timestamp images as soon as they are captured",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CPU_EXTENSIONS",
-		default => "yes",
-		description => "Use advanced CPU extensions to increase performance",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_FAST_IMAGE_BLENDS",
-		default => "yes",
-		description => "Use a fast algorithm to blend the reference image",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_ADAPTIVE_SKIP",
-		default => "yes",
-		description => "Should frame analysis try and be efficient in skipping frames",
-		help => "In previous versions of ZoneMinder the analysis daemon would attempt to keep up with the capture daemon by processing the last captured frame on each pass. This would sometimes have the undesirable side-effect of missing a chunk of the initial activity that caused the alarm because the pre-alarm frames would all have to be written to disk and the database before processing the next frame, leading to some delay between the first and second event frames. Setting this option enables a newer adaptive algorithm where the analysis daemon attempts to process as many captured frames as possible, only skipping frames when in danger of the capture daemon overwriting yet to be processed frames. This skip is variable depending on the size of the ring buffer and the amount of space left in it. Enabling this option will give you much better coverage of the beginning of alarms whilst biasing out any skipped frames towards the middle or end of the event. However you should be aware that this will have the effect of making the analysis daemon run somewhat behind the capture daemon during events and for particularly fast rates of capture it is possible for the adaptive algorithm to be overwhelmed and not have time to react to a rapid build up of pending frames and thus for a buffer overrun condition to occur.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_MAX_SUSPEND_TIME",
-		default => "30",
-		description => "Maximum time that a monitor may have motion detection suspended",
-		help => "ZoneMinder allows monitors to have motion detection to be suspended, for instance while panning a camera. Ordinarily this relies on the operator resuming motion detection afterwards as failure to do so can leave a monitor in a permanently suspended state. This setting allows you to set a maximum time which a camera may be suspended for before it automatically resumes motion detection. This time can be extended by subsequent suspend indications after the first so continuous camera movement will also occur while the monitor is suspended.",
-		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 => "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 => "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",
-		description => "The version of HTTP that ZoneMinder will use to connect",
-		help => "ZoneMinder can communicate with network cameras using either of the HTTP/1.1 or HTTP/1.0 standard. A server will normally fall back to the version it supports with no problem so this should usually by left at the default. However it can be changed to HTTP/1.0 if necessary to resolve particular issues.",
-		type => { db_type=>"string", hint=>"1.1|1.0", pattern=>qr|^(1\.[01])$|, format=>q( $1?$1:"" ) },
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_UA",
-		default => "ZoneMinder",
-		description => "The user agent that ZoneMinder uses to identify itself",
-		help => "When ZoneMinder communicates with remote cameras it will identify itself using this string and it's version number. This is normally sufficient, however if a particular cameras expects only to communicate with certain browsers then this can be changed to a different string identifying ZoneMinder as Internet Explorer or Netscape etc.",
-		type => $types{string},
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_TIMEOUT",
-		default => "2500",
-		description => "How long ZoneMinder waits before giving up on images (milliseconds)",
-		help => "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.",
-		type => $types{integer},
-		category => "network",
-	},
     {
-		name => "ZM_MIN_RTP_PORT",
-		default => "40200",
-		description => "Minimum port that ZoneMinder will listen for RTP traffic on",
-		help => "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.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_MAX_RTP_PORT",
-		default => "40499",
-		description => "Maximum port that ZoneMinder will listen for RTP traffic on",
-		help => "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.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_OPT_FFMPEG",
-		default => "@OPT_FFMPEG@",
-		description => "Is the ffmpeg video encoder/decoder installed",
-		help => "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.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_FFMPEG",
-		default => "@PATH_FFMPEG@",
-		description => "Path to (optional) ffmpeg mpeg encoder",
-		help => "This path should point to where ffmpeg has been installed.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{abs_path},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_INPUT_OPTIONS",
-		default => "",
-		description => "Additional input options to ffmpeg",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_OUTPUT_OPTIONS",
-		default => "-r 25",
-		description => "Additional output options to ffmpeg",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_FORMATS",
-		default => "mpg mpeg wmv asf avi* mov swf 3gp**",
-		description => "Formats to allow for ffmpeg video generation",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_OPEN_TIMEOUT",
-		default => "10",
-		description => "Timeout in seconds when opening a stream.",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_LOG_LEVEL_SYSLOG",
-		default => "0",
-		description => "Save logging output to the system log",
-		help => "ZoneMinder logging is now more 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 affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_FILE",
-		default => "-5",
-		description => "Save logging output to component files",
-		help => "ZoneMinder logging is now more 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 affect 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",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_WEBLOG",
-		default => "-5",
-		description => "Save logging output to the weblog",
-		help => "ZoneMinder logging is now more 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 from the web interface that goes to the httpd error log. Note that only web logging from PHP and JavaScript files is included and so this option is really only useful for investigating specific issues with those components. 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 affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_DATABASE",
-		default => "0",
-		description => "Save logging output to the database",
-		help => "ZoneMinder logging is now more 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 is written to the database. This is a new option which can make viewing logging output easier and more intuitive and also makes it easier to get an overall impression of how the system is performing. If you have a large or very busy system then it is possible that use of this option may slow your system down if the table becomes very large. Ensure you use the LOG_DATABASE_LIMIT option to keep the table to a manageable size. 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 affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DATABASE_LIMIT",
-		default => "7 day",
-		description => "Maximum number of log entries to retain",
-		help => "If you are using database logging then it is possible to quickly build up a large number of entries in the Logs table. This option allows you to specify how many of these entries are kept. If you set this option to a number greater than zero then that number is used to determine the maximum number of rows, less than or equal to zero indicates no limit and is not recommended. You can also set this value to time values such as '<n> day' which will limit the log entries to those newer than that time. You can specify 'hour', 'day', 'week', 'month' and 'year', note that the values should be singular (no 's' at the end). The Logs table is pruned periodically so it is possible for more than the expected number of rows to be present briefly in the meantime.",
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG",
-		default => "no",
-		description => "Switch debugging on",
-		help => "ZoneMinder components usually support debug logging available to help with diagnosing problems. Binary components have several levels of debug whereas more other components have only one. Normally this is disabled to minimise performance penalties and avoid filling logs too quickly. This option lets you switch on other options that allow you to configure additional debug information to be output. Components will pick up this instruction when they are restarted.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_TARGET",
-		default => "",
-		description => "What components should have extra debug enabled",
-		help => "There are three scopes of debug available. Leaving this option blank means that all components will use extra debug (not recommended). Setting this option to '_<component>', e.g. _zmc, will limit extra debug to that component only. Setting this option to '_<component>_<identity>', e.g. '_zmc_m1' will limit extra debug to that instance of the component only. This is ordinarily what you probably want to do. To debug scripts use their names without the .pl extension, e.g. '_zmvideo' and to debug issues with the web interface use '_web'. You can specify multiple targets by separating them with '|' characters.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_LEVEL",
-		default => 1,
-		description => "What level of extra debug should be enabled",
-		help => "There are 9 levels of debug available, with higher numbers being more debug and level 0 being no debug. However not all levels are used by all components. Also if there is debug at a high level it is usually likely to be output at such a volume that it may obstruct normal operation. For this reason you should set the level carefully and cautiously until the degree of debug you wish to see is present. Scripts and the web interface only have one level so this is an on/off type option for them.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => { db_type=>"integer", hint=>"1|2|3|4|5|6|7|8|9", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_FILE",
-		default => "@ZM_LOGDIR@/zm_debug.log+",
-		description => "Where extra debug is output to",
-		help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.<pid>' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_CHECK_PERIOD",
-		default => "900",
-		description => "Time period used when calculating overall system health",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to indicate what period of historical events are used in this calculation. This value is expressed in seconds and is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_WAR_COUNT",
-		default => "1",
-		description => "Number of warnings indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alert state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_ERR_COUNT",
-		default => "1",
-		description => "Number of errors indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alert state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_FAT_COUNT",
-		default => "0",
-		description => "Number of fatal error indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alert state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_WAR_COUNT",
-		default => "100",
-		description => "Number of warnings indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alarm state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_ERR_COUNT",
-		default => "10",
-		description => "Number of errors indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alarm state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_FAT_COUNT",
-		default => "1",
-		description => "Number of fatal error indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alarm state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_EVENT_STATS",
-		default => "yes",
-		description => "Record event statistical information, switch off if too slow",
-		help => "This version of ZoneMinder records detailed information about events in the Stats table. This can help in profiling what the optimum settings are for Zones though this is tricky at present. However in future releases this will be done more easily and intuitively, especially with a large sample of events. The default option of 'yes' allows this information to be collected now in readiness for this but if you are concerned about performance you can switch this off in which case no Stats information will be saved.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_DIAG_IMAGES",
-		default => "no",
-		description => "Record intermediate alarm diagnostic images, can be very slow",
-		help => "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.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_DUMP_CORES",
-		default => "no",
-		description => "Create core files on unexpected process failure.",
-		help => "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.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_PATH_MAP",
-		default => "/dev/shm",
-		description => "Path to the mapped memory files that that ZoneMinder can use",
-		help => "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.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SOCKS",
-		default => "@ZM_SOCKDIR@",
-		description => "Path to the various Unix domain socket files that ZoneMinder uses",
-		help => "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.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_LOGS",
-		default => "@ZM_LOGDIR@",
-		description => "Path to the various logs that the ZoneMinder daemons generate",
-		help => "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.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SWAP",
-		default => "@ZM_TMPDIR@",
-		description => "Path to location for temporary swap images used in streaming",
-		help => "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.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_ARP",
-		default => "",
-		description => "Path to a supported ARP tool",
-		help => "The camera probe function uses Address Resolution Protocol in order to find known devices on the network. Optionally supply the full path to \"ip neigh\", \"arp -a\", or any other tool on your system that returns ip/mac address pairs. If this field is left empty, ZoneMinder will search for the command \"arp\" and attempt to use that.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_WEB_TITLE_PREFIX",
-		default => "ZM",
-		description => "The title prefix displayed on each window",
-		help => "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.",
-		type => $types{string},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_RESIZE_CONSOLE",
-		default => "yes",
-		description => "Should the console window resize itself to fit",
-		help => "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",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_POPUP_ON_ALARM",
-		default => "yes",
-		description => "Should the monitor window jump to the top if an alarm occurs",
-		help => "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.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_X10",
-		default => "no",
-		description => "Support interfacing with X10 devices",
-		help => "If you have an X10 Home Automation setup in your home you can use ZoneMinder to initiate or react to X10 signals if your computer has the appropriate interface controller. This option indicates whether X10 options will be available in the browser client.",
-		type => $types{boolean},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DEVICE",
-		default => "/dev/ttyS0",
-		description => "What device is your X10 controller connected on",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "If you have an X10 controller device (e.g. XM10U) connected to your computer this option details which port it is conected on, the default of /dev/ttyS0 maps to serial or com port 1.",
-		type => $types{abs_path},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_HOUSE_CODE",
-		default => "A",
-		description => "What X10 house code should be used",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "X10 devices are grouped together by identifying them as all belonging to one House Code. This option details what that is. It should be a single letter between A and P.",
-		type => { db_type=>"string", hint=>"A-P", pattern=>qr|^([A-P])|i, format=>q( uc($1) ) },
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DB_RELOAD_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) the X10 daemon reloads the monitors from the database",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "The zmx10 daemon periodically checks the database to find out what X10 events trigger, or result from, alarms. This option determines how frequently this check occurs, unless you change this area frequently this can be a fairly large value.",
-		type => $types{integer},
-		category => "x10",
-	},
-	{
-		name => "ZM_WEB_SOUND_ON_ALARM",
-		default => "no",
-		description => "Should the monitor window play a sound if an alarm occurs",
-		help => "When viewing a live monitor stream you can specify whether you want the window to play a sound to alert you if an alarm occurs.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_ALARM_SOUND",
-		default => "",
-		description => "The sound to play on alarm, put this in the sounds directory",
-		help => "You can specify a sound file to play if an alarm occurs whilst you are watching a live monitor stream. So long as your browser understands the format it does not need to be any particular type. This file should be placed in the sounds directory defined earlier.",
-		type => $types{file},
-		requires => [ { name => "ZM_WEB_SOUND_ON_ALARM", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_COMPACT_MONTAGE",
-		default => "no",
-		description => "Compact the montage view by removing extra detail",
-		help => "The montage view shows the output of all of your active monitors in one window. This include a small menu and status information for each one. This can increase the web traffic and make the window larger than may be desired. Setting this option on removes all this extraneous information and just displays the images.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_FAST_DELETE",
-		default => "yes",
-		description => "Delete only event database records for speed",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_STRICT_VIDEO_CONFIG",
-		default => "yes",
-		description => "Allow errors in setting video config to be fatal",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_SIGNAL_CHECK_POINTS",
-		default => "10",
-		description => "How many points in a captured image to check for signal loss",
-		help => "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.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_V4L_MULTI_BUFFER",
-		default => "yes",
-		description => "Use more than one buffer for Video 4 Linux devices",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CAPTURES_PER_FRAME",
-		default => "1",
-		description => "How many images are captured per returned frame, for shared local cameras",
-		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip. This option addresses a similar problem to the ZM_V4L_MULTI_BUFFER 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.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_FILTER_RELOAD_DELAY",
-		default => "300",
-		description => "How often (in seconds) filters are reloaded in zmfilter",
-		help => "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 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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FILTER_EXECUTE_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) to run automatic saved filters",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_UPLOAD",
-		default => "no",
-		description => "Should ZoneMinder support uploading events from filters",
-		help => "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",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_FORMAT",
-		default => "tar",
-		description => "What format the uploaded events should be created in.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "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.",
-		type => { db_type=>"string", hint=>"tar|zip", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^t/ ? "tar" : "zip" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_COMPRESS",
-		default => "no",
-		description => "Should archive files be compressed",
-		help => "When the archive files are created they can be compressed. However in general since the images are compressed already this saves only a minimal amount of space versus utilising more CPU in their creation. Only enable if you have CPU to waste and are limited in disk space on your remote server or bandwidth.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_ANALYSE",
-		default => "no",
-		description => "Include the analysis files in the archive",
-		help => "When the archive files are created they can contain either just the captured frames or both the captured frames and, for frames that caused an alarm, the analysed image with the changed area highlighted. This option controls files are included. Only include analysed frames if you have a high bandwidth connection to the remote server or if you need help in figuring out what caused an alarm in the first place as archives with these files in can be considerably larger.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PROTOCOL",
-		default => "ftp",
-		description => "What protocol to use to upload events",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "ZoneMinder can upload events to a remote server using either FTP or SFTP. Regular FTP is widely supported but not necessarily very secure whereas SFTP (Secure FTP) runs over an ssh connection and so is encrypted and uses regular ssh ports. Note that to use this you will need to have the appropriate perl module, either Net::FTP or Net::SFTP installed depending on your choice.",
-		type => { db_type=>"string", hint=>"ftp|sftp", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^f/ ? "ftp" : "sftp" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_HOST",
-		default => "",
-		description => "The remote server to upload to",
-		help => "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 => "",
-		description => "The remote server to upload events to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote 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 => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PORT",
-		default => "",
-		description => "The port on the remote upload server, if not the default (SFTP only)",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. If you are using the SFTP protocol then this option allows you to specify a particular port to use for connection. If this option is left blank then the default, port 22, is used. This option is ignored for FTP uploads.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_USER",
-		default => "",
-		description => "Your ftp username",
-		help => "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 => "",
-		description => "Remote server username",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the username that ZoneMinder should use to log in for transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{alphanum},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASS",
-		default => "",
-		description => "Your ftp password",
-		help => "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 => "",
-		description => "Remote server password",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the password that ZoneMinder should use to log in for transfer. If you are using certicate based logins for SFTP servers you can leave this option blank.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		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 => "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@",
-		description => "The local directory in which to create upload files",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote 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 => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_REM_DIR",
-		default => "",
-		description => "The remote directory to upload to",
-		help => "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 => "",
-		description => "The remote directory to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote 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 => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_TIMEOUT",
-		default => "120",
-		description => "How long to allow the transfer to take for each file",
-		help => "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",
-		description => "How long to allow the transfer to take for each file",
-		help => "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.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASSIVE",
-		default => "yes",
-		description => "Use passive ftp when uploading",
-		help => "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.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "If your computer is behind a firewall or proxy you may need to set FTP to passive mode. In fact for simple transfers it makes little sense to do otherwise anyway but you can set this to 'No' if you wish.",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_DEBUG",
-		default => "no",
-		description => "Switch ftp debugging on",
-		help => "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",
-		description => "Switch upload debugging on",
-		help => "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.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_OPT_EMAIL",
-		default => "no",
-		description => "Should ZoneMinder email you details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details emailed to you at a designated email address. This will allow you to be notified of events as soon as they occur and also to quickly view the events directly. This option specifies whether this functionality should be available. The email created with this option can be any size and is intended to be sent to a regular email reader rather than a mobile device.",
-		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 => "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%)"
+        name        => "ZM_LANG_DEFAULT",
+        default     => "en_gb",
+        description => "Default language used by web interface",
+        help        => qqq("
+            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
+        "),
+        type        => $types{string},
+        category    => "system",
+    },
+    {
+        name        => "ZM_OPT_USE_AUTH",
+        default     => "no",
+        description => "Authenticate user logins to ZoneMinder",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUTH_TYPE",
+        default     => "builtin",
+        description => "What is used to authenticate ZoneMinder users",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
+        type        => {
+            db_type     =>"string",
+            hint        =>"builtin|remote",
+            pattern     =>qr|^([br])|i,
+            format      =>q( $1 =~ /^b/ ? "builtin" : "remote" )
+        },
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUTH_RELAY",
+        default     => "hashed",
+        description => "Method used to relay authentication information",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
+        type        => {
+            db_type     =>"string",
+            hint        =>"hashed|plain|none",
+            pattern     =>qr|^([hpn])|i,
+            format      =>q( ($1 =~ /^h/)
+                             ? "hashed"
+                             : ($1 =~ /^p/ ? "plain" : "none" )
+                           )
+        },
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUTH_HASH_SECRET",
+        default     => "...Change me to something unique...",
+        description => "Secret for encoding hashed authentication information",
+        help        => qqq("
+            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.
+        "),
+        requires    => [
+                        { name=>"ZM_OPT_USE_AUTH", value=>"yes" },
+                        { name=>"ZM_AUTH_RELAY", value=>"hashed" }
+                       ],
+        type        => $types{string},
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUTH_HASH_IPS",
+        default     => "yes",
+        description => "Include IP addresses in the authentication hash",
+        help        => qqq("
+            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.
+        "),
+        requires    => [
+                            { name=>"ZM_OPT_USE_AUTH", value=>"yes" },
+                            { name=>"ZM_AUTH_RELAY", value=>"hashed" }
+                       ],
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUTH_HASH_LOGINS",
+        default     => "no",
+        description => "Allow login by authentication hash",
+        help        => qqq("
+            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 hae 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 somethign unique to your system.
+        "),
+        requires    => [
+                            { name=>"ZM_OPT_USE_AUTH", value=>"yes" },
+                            { name=>"ZM_AUTH_RELAY", value=>"hashed" }
+                       ],
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_DIR_EVENTS",
+        default     => "events",
+        description => "Directory where events are stored",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{directory},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_USE_DEEP_STORAGE",
+        default     => "yes",
+        description => "Use a deep filesystem hierarchy for events",
+        help        => qqq("
+            This option is now the default for new ZoneMinder systems and
+            should not be changed. Previous versions of ZoneMinder stored
+            all events for a monitor under one folder. Enabling
+            USE_DEEP_STORAGE causes ZoneMinder to store events under a
+            folder structure that follows year/month/day/hour/min/second.
+            Storing events this way avoids the limitation of storing more
+            than 32k files in a single folder inherent in some filesystems.
+            It is important to note that you cannot simply change this
+            option. You must stop zoneminder, enable USE_DEEP_STORAGE, and
+            then run \"sudo zmupdate.pl --migrate-events\". FAILURE TO DO
+            SO WILL RESULT IN LOSS OF YOUR DATA! Consult the ZoneMinder
+            WiKi for further details.
+        "),
+        type        => $types{boolean},
+        category    => "hidden",
+    },
+    {
+        name        => "ZM_DIR_IMAGES",
+        default     => "images",
+        description => "Directory where the images that the ZoneMinder client generates are stored",
+        help        => qqq("
+            ZoneMinder generates a myriad of images, mostly of which are
+            associated with events. For those that aren't this is where
+            they go. 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 save images to
+            a second disk or network share, then you should mount the drive
+            or share directly to the ZoneMinder images folder or follow the
+            instructions in the ZoneMinder Wiki titled Using a dedicated
+            Hard Drive.
+        "),
+        type        => $types{directory},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_DIR_SOUNDS",
+        default     => "sounds",
+        description => "Directory to the sounds that the ZoneMinder client can use",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{directory},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_PATH_ZMS",
+        default     => "/cgi-bin/nph-zms",
+        description => "Web path to zms streaming server",
+        help        => qqq("
+            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'.
+        "),
+        type        => $types{rel_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_COLOUR_JPEG_FILES",
+        default     => "no",
+        description => "Colourise greyscale JPEG files",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_ADD_JPEG_COMMENTS",
+        default     => "no",
+        description => "Add jpeg timestamp annotations as file header comments",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_JPEG_FILE_QUALITY",
+        default     => "70",
+        description => "Set the JPEG quality setting for the saved event files (1-100)",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "images",
+    },
+    {
+        name        => "ZM_JPEG_ALARM_FILE_QUALITY",
+        default     => "0",
+        description => "Set the JPEG quality setting for the saved event files during an alarm (1-100)",
+        help        => qqq("
+            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 acccidentally
+            saving important images at a worse quality setting.
+        "),
+        type        => $types{integer},
+        category    => "images",
+    },
+    # Deprecated, now stream quality
+    {
+        name        => "ZM_JPEG_IMAGE_QUALITY",
+        default     => "70",
+        description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
+        help        => qqq("
+            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",
+        description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
+        help        => qqq("
+            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    => "images",
+    },
+    {
+        name        => "ZM_MPEG_TIMED_FRAMES",
+        default     => "yes",
+        description => "Tag video frames with a timestamp for more realistic streaming",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_MPEG_LIVE_FORMAT",
+        default     => "swf",
+        description => "What format 'live' video streams are played in",
+        help        => qqq("
+            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
+        "),
+        type        => $types{string},
+        category    => "images",
+    },
+    {
+        name        => "ZM_MPEG_REPLAY_FORMAT",
+        default     => "swf",
+        description => "What format 'replay' video streams are played in",
+        help        => qqq("
+            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
+        "),
+        type        => $types{string},
+        category    => "images",
+    },
+    {
+        name        => "ZM_RAND_STREAM",
+        default     => "yes",
+        description => "Add a random string to prevent caching of streams",
+        help        => qqq("
+            Some browsers can cache the streams used by ZoneMinder. In
+            order to prevent his a harmless random string can be appended
+            to the url to make each invocation of the stream appear unique.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_OPT_CAMBOZOLA",
+        default     => "no",
+        description => "Is the (optional) cambozola java streaming client installed",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_PATH_CAMBOZOLA",
+        default     => "cambozola.jar",
+        description => "Web path to (optional) cambozola java streaming client",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_CAMBOZOLA", value=>"yes" } ],
+        type        => $types{rel_path},
+        category    => "images",
+    },
+    {
+        name        => "ZM_RELOAD_CAMBOZOLA",
+        default     => "0",
+        description => "After how many seconds should Cambozola be reloaded in live view",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "images",
+    },
+    {
+        name        => "ZM_TIMESTAMP_ON_CAPTURE",
+        default     => "yes",
+        description => "Timestamp images as soon as they are captured",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_CPU_EXTENSIONS",
+        default     => "yes",
+        description => "Use advanced CPU extensions to increase performance",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_FAST_IMAGE_BLENDS",
+        default     => "yes",
+        description => "Use a fast algorithm to blend the reference image",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_OPT_ADAPTIVE_SKIP",
+        default     => "yes",
+        description => "Should frame analysis try and be efficient in skipping frames",
+        help        => qqq("
+            In previous versions of ZoneMinder the analysis daemon would
+            attempt to keep up with the capture daemon by processing the
+            last captured frame on each pass. This would sometimes have the
+            undesirable side-effect of missing a chunk of the initial
+            activity that caused the alarm because the pre-alarm frames
+            would all have to be written to disk and the database before
+            processing the next frame, leading to some delay between the
+            first and second event frames. Setting this option enables a
+            newer adaptive algorithm where the analysis daemon attempts to
+            process as many captured frames as possible, only skipping
+            frames when in danger of the capture daemon overwriting yet to
+            be processed frames. This skip is variable depending on the
+            size of the ring buffer and the amount of space left in it.
+            Enabling this option will give you much better coverage of the
+            beginning of alarms whilst biasing out any skipped frames
+            towards the middle or end of the event. However you should be
+            aware that this will have the effect of making the analysis
+            daemon run somewhat behind the capture daemon during events and
+            for particularly fast rates of capture it is possible for the
+            adaptive algorithm to be overwhelmed and not have time to react
+            to a rapid build up of pending frames and thus for a buffer
+            overrun condition to occur.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_MAX_SUSPEND_TIME",
+        default     => "30",
+        description => "Maximum time that a monitor may have motion detection suspended",
+        help        => qqq("
+            ZoneMinder allows monitors to have motion detection to be
+            suspended, for instance while panning a camera. Ordinarily this
+            relies on the operator resuming motion detection afterwards as
+            failure to do so can leave a monitor in a permanently suspended
+            state. This setting allows you to set a maximum time which a
+            camera may be suspended for before it automatically resumes
+            motion detection. This time can be extended by subsequent
+            suspend indications after the first so continuous camera
+            movement will also occur while the monitor is suspended.
+        "),
+        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        => qqq("
+            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        => qqq("
+            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",
+        description => "The version of HTTP that ZoneMinder will use to connect",
+        help        => qqq("
+            ZoneMinder can communicate with network cameras using either of
+            the HTTP/1.1 or HTTP/1.0 standard. A server will normally fall
+            back to the version it supports with no problem so this should
+            usually by left at the default. However it can be changed to
+            HTTP/1.0 if necessary to resolve particular issues.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"1.1|1.0",
+            pattern     =>qr|^(1\.[01])$|,
+            format      =>q( $1?$1:"" )
+        },
+        category    => "network",
+    },
+    {
+        name        => "ZM_HTTP_UA",
+        default     => "ZoneMinder",
+        description => "The user agent that ZoneMinder uses to identify itself",
+        help        => qqq("
+            When ZoneMinder communicates with remote cameras it will
+            identify itself using this string and it's version number. This
+            is normally sufficient, however if a particular cameras expects
+            only to communicate with certain browsers then this can be
+            changed to a different string identifying ZoneMinder as
+            Internet Explorer or Netscape etc.
+        "),
+        type        => $types{string},
+        category    => "network",
+    },
+    {
+        name        => "ZM_HTTP_TIMEOUT",
+        default     => "2500",
+        description => "How long ZoneMinder waits before giving up on images (milliseconds)",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "network",
+    },
+    {
+        name        => "ZM_MIN_RTP_PORT",
+        default     => "40200",
+        description => "Minimum port that ZoneMinder will listen for RTP traffic on",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "network",
+    },
+    {
+        name        => "ZM_MAX_RTP_PORT",
+        default     => "40499",
+        description => "Maximum port that ZoneMinder will listen for RTP traffic on",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "network",
+    },
+    {
+        name        => "ZM_OPT_FFMPEG",
+        default     => "@OPT_FFMPEG@",
+        description => "Is the ffmpeg video encoder/decoder installed",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "images",
+    },
+    {
+        name        => "ZM_PATH_FFMPEG",
+        default     => "@PATH_FFMPEG@",
+        description => "Path to (optional) ffmpeg mpeg encoder",
+        help        => "This path should point to where ffmpeg has been installed.",
+        requires    => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+        type        => $types{abs_path},
+        category    => "images",
+    },
+    {
+        name        => "ZM_FFMPEG_INPUT_OPTIONS",
+        default     => "",
+        description => "Additional input options to ffmpeg",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+        type        => $types{string},
+        category    => "images",
+    },
+    {
+        name        => "ZM_FFMPEG_OUTPUT_OPTIONS",
+        default     => "-r 25",
+        description => "Additional output options to ffmpeg",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+        type        => $types{string},
+        category    => "images",
+    },
+    {
+        name        => "ZM_FFMPEG_FORMATS",
+        default     => "mpg mpeg wmv asf avi* mov swf 3gp**",
+        description => "Formats to allow for ffmpeg video generation",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+        type        => $types{string},
+        category    => "images",
+    },
+    {
+        name        => "ZM_FFMPEG_OPEN_TIMEOUT",
+        default     => "10",
+        description => "Timeout in seconds when opening a stream.",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
+        type        => $types{integer},
+        category    => "images",
+    },
+    {
+        name        => "ZM_LOG_LEVEL_SYSLOG",
+        default     => "0",
+        description => "Save logging output to the system log",
+        help        => qqq("
+            ZoneMinder logging is now more 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
+            affect severely affect system performance. If you want debug
+            you will also need to set a level and component below
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_LEVEL_FILE",
+        default     => "-5",
+        description => "Save logging output to component files",
+        help        => qqq("
+            ZoneMinder logging is now more 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 affect 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
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_LEVEL_WEBLOG",
+        default     => "-5",
+        description => "Save logging output to the weblog",
+        help        => qqq("
+            ZoneMinder logging is now more 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 from the web
+            interface that goes to the httpd error log. Note that only web
+            logging from PHP and JavaScript files is included and so this
+            option is really only useful for investigating specific issues
+            with those components. 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
+            affect severely affect system performance. If you want debug
+            you will also need to set a level and component below
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_LEVEL_DATABASE",
+        default     => "0",
+        description => "Save logging output to the database",
+        help        => qqq("
+            ZoneMinder logging is now more 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 is written to
+            the database. This is a new option which can make viewing
+            logging output easier and more intuitive and also makes it
+            easier to get an overall impression of how the system is
+            performing. If you have a large or very busy system then it is
+            possible that use of this option may slow your system down if
+            the table becomes very large. Ensure you use the
+            LOG_DATABASE_LIMIT option to keep the table to a manageable
+            size. 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 affect
+            severely affect system performance. If you want debug you will
+            also need to set a level and component below
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_DATABASE_LIMIT",
+        default     => "7 day",
+        description => "Maximum number of log entries to retain",
+        help        => qqq("
+            If you are using database logging then it is possible to
+            quickly build up a large number of entries in the Logs table.
+            This option allows you to specify how many of these entries are
+            kept. If you set this option to a number greater than zero then
+            that number is used to determine the maximum number of rows,
+            less than or equal to zero indicates no limit and is not
+            recommended. You can also set this value to time values such as
+            '<n> day' which will limit the log entries to those newer than
+            that time. You can specify 'hour', 'day', 'week', 'month' and
+            'year', note that the values should be singular (no 's' at the
+            end). The Logs table is pruned periodically so it is possible
+            for more than the expected number of rows to be present briefly
+            in the meantime.
+        "),
+        type        => $types{string},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_DEBUG",
+        default     => "no",
+        description => "Switch debugging on",
+        help        => qqq("
+            ZoneMinder components usually support debug logging available
+            to help with diagnosing problems. Binary components have
+            several levels of debug whereas more other components have only
+            one. Normally this is disabled to minimise performance
+            penalties and avoid filling logs too quickly. This option lets
+            you switch on other options that allow you to configure
+            additional debug information to be output. Components will pick
+            up this instruction when they are restarted.
+        "),
+        type        => $types{boolean},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_DEBUG_TARGET",
+        default     => "",
+        description => "What components should have extra debug enabled",
+        help        => qqq("
+            There are three scopes of debug available. Leaving this option
+            blank means that all components will use extra debug (not
+            recommended). Setting this option to '_<component>', e.g. _zmc,
+            will limit extra debug to that component only. Setting this
+            option to '_<component>_<identity>', e.g. '_zmc_m1' will limit
+            extra debug to that instance of the component only. This is
+            ordinarily what you probably want to do. To debug scripts use
+            their names without the .pl extension, e.g. '_zmvideo' and to
+            debug issues with the web interface use '_web'. You can specify
+            multiple targets by separating them with '|' characters.
+        "),
+        requires    => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
+        type        => $types{string},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_DEBUG_LEVEL",
+        default     => 1,
+        description => "What level of extra debug should be enabled",
+        help        => qqq("
+            There are 9 levels of debug available, with higher numbers
+            being more debug and level 0 being no debug. However not all
+            levels are used by all components. Also if there is debug at a
+            high level it is usually likely to be output at such a volume
+            that it may obstruct normal operation. For this reason you
+            should set the level carefully and cautiously until the degree
+            of debug you wish to see is present. Scripts and the web
+            interface only have one level so this is an on/off type option
+            for them.
+        "),
+        requires    => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
+        type        => {
+            db_type     =>"integer",
+            hint        =>"1|2|3|4|5|6|7|8|9",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_DEBUG_FILE",
+        default     => "@ZM_LOGDIR@/zm_debug.log+",
+        description => "Where extra debug is output to",
+        help        => qqq("
+            This option allows you to specify a different target for debug
+            output. All components have a default log file which will
+            norally be in /tmp or /var/log and this is where debug will be
+            written to if this value is empty. Adding a path here will
+            temporarily redirect debug, and other logging output, to this
+            file. This option is a simple filename and you are debugging
+            several components then they will all try and write to the same
+            file with undesirable consequences. Appending a '+' to the
+            filename will cause the file to be created with a '.<pid>'
+            suffix containing your process id. In this way debug from each
+            run of a component is kept separate. This is the recommended
+            setting as it will also prevent subsequent runs from
+            overwriting the same log. You should ensure that permissions
+            are set up to allow writing to the file and directory specified
+            here.
+        "),
+        requires    => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
+        type        => $types{string},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_CHECK_PERIOD",
+        default     => "900",
+        description => "Time period used when calculating overall system health",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to indicate what period of historical
+            events are used in this calculation. This value is expressed in
+            seconds and is ignored if LOG_LEVEL_DATABASE is set to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALERT_WAR_COUNT",
+        default     => "1",
+        description => "Number of warnings indicating system alert state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many warnings must have
+            occurred within the defined time period to generate an overall
+            system alert state. A value of zero means warnings are not
+            considered. This value is ignored if LOG_LEVEL_DATABASE is set
+            to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALERT_ERR_COUNT",
+        default     => "1",
+        description => "Number of errors indicating system alert state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many errors must have
+            occurred within the defined time period to generate an overall
+            system alert state. A value of zero means errors are not
+            considered. This value is ignored if LOG_LEVEL_DATABASE is set
+            to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALERT_FAT_COUNT",
+        default     => "0",
+        description => "Number of fatal error indicating system alert state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many fatal errors
+            (including panics) must have occurred within the defined time
+            period to generate an overall system alert state. A value of
+            zero means fatal errors are not considered. This value is
+            ignored if LOG_LEVEL_DATABASE is set to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALARM_WAR_COUNT",
+        default     => "100",
+        description => "Number of warnings indicating system alarm state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many warnings must have
+            occurred within the defined time period to generate an overall
+            system alarm state. A value of zero means warnings are not
+            considered. This value is ignored if LOG_LEVEL_DATABASE is set
+            to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALARM_ERR_COUNT",
+        default     => "10",
+        description => "Number of errors indicating system alarm state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many errors must have
+            occurred within the defined time period to generate an overall
+            system alarm state. A value of zero means errors are not
+            considered. This value is ignored if LOG_LEVEL_DATABASE is set
+            to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_LOG_ALARM_FAT_COUNT",
+        default     => "1",
+        description => "Number of fatal error indicating system alarm state",
+        help        => qqq("
+            When ZoneMinder is logging events to the database it can
+            retrospectively examine the number of warnings and errors that
+            have occurred to calculate an overall state of system health.
+            This option allows you to specify how many fatal errors
+            (including panics) must have occurred within the defined time
+            period to generate an overall system alarm state. A value of
+            zero means fatal errors are not considered. This value is
+            ignored if LOG_LEVEL_DATABASE is set to None.
+        "),
+        type        => $types{integer},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_RECORD_EVENT_STATS",
+        default     => "yes",
+        description => "Record event statistical information, switch off if too slow",
+        help        => qqq("
+            This version of ZoneMinder records detailed information about
+            events in the Stats table. This can help in profiling what the
+            optimum settings are for Zones though this is tricky at
+            present. However in future releases this will be done more
+            easily and intuitively, especially with a large sample of
+            events. The default option of 'yes' allows this information to
+            be collected now in readiness for this but if you are concerned
+            about performance you can switch this off in which case no
+            Stats information will be saved.
+        "),
+        type        => $types{boolean},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_RECORD_DIAG_IMAGES",
+        default     => "no",
+        description => "Record intermediate alarm diagnostic images, can be very slow",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_DUMP_CORES",
+        default     => "no",
+        description => "Create core files on unexpected process failure.",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "logging",
+    },
+    {
+        name        => "ZM_PATH_MAP",
+        default     => "/dev/shm",
+        description => "Path to the mapped memory files that that ZoneMinder can use",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{abs_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_PATH_SOCKS",
+        default     => "@ZM_SOCKDIR@",
+        description => "Path to the various Unix domain socket files that ZoneMinder uses",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{abs_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_PATH_LOGS",
+        default     => "@ZM_LOGDIR@",
+        description => "Path to the various logs that the ZoneMinder daemons generate",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{abs_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_PATH_SWAP",
+        default     => "@ZM_TMPDIR@",
+        description => "Path to location for temporary swap images used in streaming",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{abs_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_PATH_ARP",
+        default     => "",
+        description => "Path to a supported ARP tool",
+        help        => qqq("
+            The camera probe function uses Address Resolution Protocol in
+            order to find known devices on the network. Optionally supply
+            the full path to \"ip neigh\", \"arp -a\", or any other tool on
+            your system that returns ip/mac address pairs. If this field is
+            left empty, ZoneMinder will search for the command \"arp\" and
+            attempt to use that.
+        "),
+        type        => $types{abs_path},
+        category    => "paths",
+    },
+    {
+        name        => "ZM_WEB_TITLE_PREFIX",
+        default     => "ZM",
+        description => "The title prefix displayed on each window",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{string},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_RESIZE_CONSOLE",
+        default     => "yes",
+        description => "Should the console window resize itself to fit",
+        help        => qqq("
+            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
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_POPUP_ON_ALARM",
+        default     => "yes",
+        description => "Should the monitor window jump to the top if an alarm occurs",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_OPT_X10",
+        default     => "no",
+        description => "Support interfacing with X10 devices",
+        help        => qqq("
+            If you have an X10 Home Automation setup in your home you can
+            use ZoneMinder to initiate or react to X10 signals if your
+            computer has the appropriate interface controller. This option
+            indicates whether X10 options will be available in the browser
+            client.
+        "),
+        type        => $types{boolean},
+        category    => "x10",
+    },
+    {
+        name        => "ZM_X10_DEVICE",
+        default     => "/dev/ttyS0",
+        description => "What device is your X10 controller connected on",
+        requires    => [ { name => "ZM_OPT_X10", value => "yes" } ],
+        help        => qqq("
+            If you have an X10 controller device (e.g. XM10U) connected to
+            your computer this option details which port it is connected on,
+            the default of /dev/ttyS0 maps to serial or com port 1.
+        "),
+        type        => $types{abs_path},
+        category    => "x10",
+    },
+    {
+        name        => "ZM_X10_HOUSE_CODE",
+        default     => "A",
+        description => "What X10 house code should be used",
+        requires    => [ { name => "ZM_OPT_X10", value => "yes" } ],
+        help        => qqq("
+            X10 devices are grouped together by identifying them as all
+            belonging to one House Code. This option details what that is.
+            It should be a single letter between A and P.
+        "),
+        type        => { db_type=>"string", hint=>"A-P", pattern=>qr|^([A-P])|i, format=>q( uc($1) ) },
+        category    => "x10",
+    },
+    {
+        name        => "ZM_X10_DB_RELOAD_INTERVAL",
+        default     => "60",
+        description => "How often (in seconds) the X10 daemon reloads the monitors from the database",
+        requires    => [ { name => "ZM_OPT_X10", value => "yes" } ],
+        help        => qqq("
+            The zmx10 daemon periodically checks the database to find out
+            what X10 events trigger, or result from, alarms. This option
+            determines how frequently this check occurs, unless you change
+            this area frequently this can be a fairly large value.
+        "),
+        type        => $types{integer},
+        category    => "x10",
+    },
+    {
+        name        => "ZM_WEB_SOUND_ON_ALARM",
+        default     => "no",
+        description => "Should the monitor window play a sound if an alarm occurs",
+        help        => qqq("
+            When viewing a live monitor stream you can specify whether you
+            want the window to play a sound to alert you if an alarm
+            occurs.
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_ALARM_SOUND",
+        default     => "",
+        description => "The sound to play on alarm, put this in the sounds directory",
+        help        => qqq("
+            You can specify a sound file to play if an alarm occurs whilst
+            you are watching a live monitor stream. So long as your browser
+            understands the format it does not need to be any particular
+            type. This file should be placed in the sounds directory
+            defined earlier.
+        "),
+        type        => $types{file},
+        requires    => [ { name => "ZM_WEB_SOUND_ON_ALARM", value => "yes" } ],
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_COMPACT_MONTAGE",
+        default     => "no",
+        description => "Compact the montage view by removing extra detail",
+        help        => qqq("
+            The montage view shows the output of all of your active
+            monitors in one window. This include a small menu and status
+            information for each one. This can increase the web traffic and
+            make the window larger than may be desired. Setting this option
+            on removes all this extraneous information and just displays
+            the images.
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_OPT_FAST_DELETE",
+        default     => "yes",
+        description => "Delete only event database records for speed",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_STRICT_VIDEO_CONFIG",
+        default     => "yes",
+        description => "Allow errors in setting video config to be fatal",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_SIGNAL_CHECK_POINTS",
+        default     => "10",
+        description => "How many points in a captured image to check for signal loss",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "config",
+    },
+    {
+        name        => "ZM_V4L_MULTI_BUFFER",
+        default     => "yes",
+        description => "Use more than one buffer for Video 4 Linux devices",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_CAPTURES_PER_FRAME",
+        default     => "1",
+        description => "How many images are captured per returned frame, for shared local cameras",
+        help        => qqq("
+            If you are using cameras attached to a video capture card which
+            forces multiple inputs to share one capture chip, it can
+            sometimes produce images with interlaced frames reversed
+            resulting in poor image quality and a distinctive comb edge
+            appearance. Increasing this setting allows you to force
+            additional image captures before one is selected as the
+            captured frame. This allows the capture hardware to 'settle
+            down' and produce better quality images at the price of lesser
+            capture rates. This option has no effect on (a) network
+            cameras, or (b) where multiple inputs do not share a capture
+            chip. This option addresses a similar problem to the
+            ZM_V4L_MULTI_BUFFER 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.
+        "),
+        type        => $types{integer},
+        category    => "config",
+    },
+    {
+        name        => "ZM_FILTER_RELOAD_DELAY",
+        default     => "300",
+        description => "How often (in seconds) filters are reloaded in zmfilter",
+        help        => qqq("
+            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 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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_FILTER_EXECUTE_INTERVAL",
+        default     => "60",
+        description => "How often (in seconds) to run automatic saved filters",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_OPT_UPLOAD",
+        default     => "no",
+        description => "Should ZoneMinder support uploading events from filters",
+        help        => qqq("
+            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
+        "),
+        type        => $types{boolean},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_ARCH_FORMAT",
+        default     => "tar",
+        description => "What format the uploaded events should be created in.",
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        help        => qqq("
+            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.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"tar|zip",
+            pattern     =>qr|^([tz])|i,
+            format      =>q( $1 =~ /^t/ ? "tar" : "zip" )
+        },
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_ARCH_COMPRESS",
+        default     => "no",
+        description => "Should archive files be compressed",
+        help        => qqq("
+            When the archive files are created they can be compressed.
+            However in general since the images are compressed already this
+            saves only a minimal amount of space versus utilising more CPU
+            in their creation. Only enable if you have CPU to waste and are
+            limited in disk space on your remote server or bandwidth.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{boolean},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_ARCH_ANALYSE",
+        default     => "no",
+        description => "Include the analysis files in the archive",
+        help        => qqq("
+            When the archive files are created they can contain either just
+            the captured frames or both the captured frames and, for frames
+            that caused an alarm, the analysed image with the changed area
+            highlighted. This option controls files are included. Only
+            include analysed frames if you have a high bandwidth connection
+            to the remote server or if you need help in figuring out what
+            caused an alarm in the first place as archives with these files
+            in can be considerably larger.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{boolean},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_PROTOCOL",
+        default     => "ftp",
+        description => "What protocol to use to upload events",
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        help        => qqq("
+            ZoneMinder can upload events to a remote server using either
+            FTP or SFTP. Regular FTP is widely supported but not
+            necessarily very secure whereas SFTP (Secure FTP) runs over an
+            ssh connection and so is encrypted and uses regular ssh ports.
+            Note that to use this you will need to have the appropriate
+            perl module, either Net::FTP or Net::SFTP installed depending
+            on your choice.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"ftp|sftp",
+            pattern     =>qr|^([tz])|i,
+            format      =>q( $1 =~ /^f/ ? "ftp" : "sftp" )
+        },
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_HOST",
+        default     => "",
+        description => "The remote server to upload to",
+        help        => qqq("
+            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     => "",
+        description => "The remote server to upload events to",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote 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    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_PORT",
+        default     => "",
+        description => "The port on the remote upload server, if not the default (SFTP only)",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote server. If you are using the SFTP protocol then this
+            option allows you to specify a particular port to use for
+            connection. If this option is left blank then the default, port
+            22, is used. This option is ignored for FTP uploads.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{integer},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_USER",
+        default     => "",
+        description => "Your ftp username",
+        help        => qqq("
+            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     => "",
+        description => "Remote server username",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote server. This option indicates the username that
+            ZoneMinder should use to log in for transfer.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{alphanum},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_PASS",
+        default     => "",
+        description => "Your ftp password",
+        help        => qqq("
+            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     => "",
+        description => "Remote server password",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote server. This option indicates the password that
+            ZoneMinder should use to log in for transfer. If you are using
+            certicate based logins for SFTP servers you can leave this
+            option blank.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        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        => qqq("
+            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@",
+        description => "The local directory in which to create upload files",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote 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    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_REM_DIR",
+        default     => "",
+        description => "The remote directory to upload to",
+        help        => qqq("
+            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     => "",
+        description => "The remote directory to upload to",
+        help        => qqq("
+            You can use filters to instruct ZoneMinder to upload events to
+            a remote 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    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_TIMEOUT",
+        default     => "120",
+        description => "How long to allow the transfer to take for each file",
+        help        => qqq("
+            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",
+        description => "How long to allow the transfer to take for each file",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{integer},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_PASSIVE",
+        default     => "yes",
+        description => "Use passive ftp when uploading",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        help        => qqq("
+            If your computer is behind a firewall or proxy you may need to
+            set FTP to passive mode. In fact for simple transfers it makes
+            little sense to do otherwise anyway but you can set this to
+            'No' if you wish.
+        "),
+        type        => $types{boolean},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_UPLOAD_FTP_DEBUG",
+        default     => "no",
+        description => "Switch ftp debugging on",
+        help        => qqq("
+            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",
+        description => "Switch upload debugging on",
+        help        => qqq("
+            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.
+        "),
+        requires    => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
+        type        => $types{boolean},
+        category    => "upload",
+    },
+    {
+        name        => "ZM_OPT_EMAIL",
+        default     => "no",
+        description => "Should ZoneMinder email you details of events that match corresponding filters",
+        help        => qqq("
+            In ZoneMinder you can create event filters that specify whether
+            events that match certain criteria should have their details
+            emailed to you at a designated email address. This will allow
+            you to be notified of events as soon as they occur and also to
+            quickly view the events directly. This option specifies whether
+            this functionality should be available. The email created with
+            this option can be any size and is intended to be sent to a
+            regular email reader rather than a mobile device.
+        "),
+        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        => qqq("
+            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,
 
@@ -1035,24 +2105,30 @@ The details are as follows :-
 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 => "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 => "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 => "
+        description => "The text of the email used to send matching event details",
+        requires    => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
+        help        => qqq("
+            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        => qqq("
+            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.
@@ -1068,896 +2144,1853 @@ The details are as follows :-
 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 => "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",
-		description => "Should ZoneMinder message you with details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details sent to you at a designated short message email address. This will allow you to be notified of events as soon as they occur. This option specifies whether this functionality should be available. The email created by this option will be brief and is intended to be sent to an SMS gateway or a minimal mail reader such as a mobile device or phone rather than a regular email reader.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_ADDRESS",
-		default => "",
-		description => "The email address to send matching event details to",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the short message email address that any events that match the appropriate filters will be sent to.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_TEXT",
-		default => 'subject = "ZoneMinder: Alarm - %MN%-%EI%"
+        description => "The body of the email used to send matching event details",
+        requires    => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
+        help        => qqq("
+            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",
+        description => "Should ZoneMinder message you with details of events that match corresponding filters",
+        help        => qqq("
+            In ZoneMinder you can create event filters that specify whether
+            events that match certain criteria should have their details
+            sent to you at a designated short message email address. This
+            will allow you to be notified of events as soon as they occur.
+            This option specifies whether this functionality should be
+            available. The email created by this option will be brief and
+            is intended to be sent to an SMS gateway or a minimal mail
+            reader such as a mobile device or phone rather than a regular
+            email reader.
+        "),
+        type        => $types{boolean},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_MESSAGE_ADDRESS",
+        default     => "",
+        description => "The email address to send matching event details to",
+        requires    => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
+        help        => qqq("
+            This option is used to define the short message email address
+            that any events that match the appropriate filters will be sent
+            to.
+        "),
+        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 => "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%",
-		description => "The subject of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the subject of the message that is sent for any events that match the appropriate filters.",
-		type => $types{string},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_BODY",
-		default => "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score.",
-		description => "The body of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "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 => "mail",
-	},
-	{
-		name => "ZM_NEW_MAIL_MODULES",
-		default => "no",
-		description => "Use a newer perl method to send emails",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "Traditionally ZoneMinder has used the MIME::Entity perl module to construct and send notification emails and messages. Some people have reported problems with this module not being present at all or flexible enough for their needs. If you are one of those people this option allows you to select a new mailing method using MIME::Lite and Net::SMTP instead. This method was contributed by Ross Melin and should work for everyone but has not been extensively tested so currently is not selected by default.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_HOST",
-		default => "localhost",
-		description => "The host address of your SMTP mail server",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "If you have chosen SMTP as the method by which to send notification emails or messages then this option allows you to choose which SMTP server to use to send them. The default of localhost may work if you have the sendmail, exim or a similar daemon running however you may wish to enter your ISP's SMTP mail server here.",
-		type => $types{hostname},
-		category => "mail",
-	},
-	{
-		name => "ZM_FROM_EMAIL",
-		default => "",
-		description => "The email address you wish your event notifications to originate from",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "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.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_URL",
-		default => "",
-		description => "The URL of your ZoneMinder installation",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "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.",
-		type => $types{url},
-		category => "mail",
-	},
-	{
-		name => "ZM_MAX_RESTART_DELAY",
-		default => "600",
-		description => "Maximum delay (in seconds) for daemon restart attempts.",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_CHECK_INTERVAL",
-		default => "10",
-		description => "How often to check the capture daemons have not locked up",
-		help => "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 indefinately). This option determines how often the daemons are checked.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_MAX_DELAY",
-		default => "5",
-		description => "The maximum delay allowed since the last captured image",
-		help => "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 indefinately). 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.",
-		type => $types{decimal},
-		category => "system",
-	},
-	{
+        description => "The text of the message used to send matching event details",
+        requires    => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
+        help        => qqq("
+            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%",
+        description => "The subject of the message used to send matching event details",
+        requires    => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
+        help        => qqq("
+            This option is used to define the subject of the message that
+            is sent for any events that match the appropriate filters.
+        "),
+        type        => $types{string},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_MESSAGE_BODY",
+        default     => "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score.",
+        description => "The body of the message used to send matching event details",
+        requires    => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
+        help        => qqq("
+            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    => "mail",
+    },
+    {
+        name        => "ZM_NEW_MAIL_MODULES",
+        default     => "no",
+        description => "Use a newer perl method to send emails",
+        requires    => [
+                            { name => "ZM_OPT_EMAIL", value => "yes" },
+                            { name => "ZM_OPT_MESSAGE", value => "yes" }
+                       ],
+        help        => qqq("
+            Traditionally ZoneMinder has used the MIME::Entity perl module
+            to construct and send notification emails and messages. Some
+            people have reported problems with this module not being
+            present at all or flexible enough for their needs. If you are
+            one of those people this option allows you to select a new
+            mailing method using MIME::Lite and Net::SMTP instead. This
+            method was contributed by Ross Melin and should work for
+            everyone but has not been extensively tested so currently is
+            not selected by default.
+        "),
+        type        => $types{boolean},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_EMAIL_HOST",
+        default     => "localhost",
+        description => "The host address of your SMTP mail server",
+        requires    => [
+                            { name => "ZM_OPT_EMAIL", value => "yes" },
+                            { name => "ZM_OPT_MESSAGE", value => "yes" }
+                       ],
+        help        => qqq("
+            If you have chosen SMTP as the method by which to send
+            notification emails or messages then this option allows you to
+            choose which SMTP server to use to send them. The default of
+            localhost may work if you have the sendmail, exim or a similar
+            daemon running however you may wish to enter your ISP's SMTP
+            mail server here.
+        "),
+        type        => $types{hostname},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_FROM_EMAIL",
+        default     => "",
+        description => "The email address you wish your event notifications to originate from",
+        requires    => [
+                            { name => "ZM_OPT_EMAIL", value => "yes" },
+                            { name => "ZM_OPT_MESSAGE", value => "yes" }
+                       ],
+        help        => qqq("
+            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.
+        "),
+        type        => $types{email},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_URL",
+        default     => "",
+        description => "The URL of your ZoneMinder installation",
+        requires    => [
+                            { name => "ZM_OPT_EMAIL", value => "yes" },
+                            { name => "ZM_OPT_MESSAGE", value => "yes" }
+                       ],
+        help        => qqq("
+            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.
+        "),
+        type        => $types{url},
+        category    => "mail",
+    },
+    {
+        name        => "ZM_MAX_RESTART_DELAY",
+        default     => "600",
+        description => "Maximum delay (in seconds) for daemon restart attempts.",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_WATCH_CHECK_INTERVAL",
+        default     => "10",
+        description => "How often to check the capture daemons have not locked up",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_WATCH_MAX_DELAY",
+        default     => "5",
+        description => "The maximum delay allowed since the last captured image",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{decimal},
+        category    => "system",
+    },
+    {
 
-		name => "ZM_RUN_AUDIT",
-		default => "yes",
-		description => "Run zmaudit to check data consistency",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-
-		name => "ZM_AUDIT_CHECK_INTERVAL",
-		default => "900",
-		description => "How often to check database and filesystem consistency",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FORCED_ALARM_SCORE",
-		default => "255",
-		description => "Score to give forced alarms",
-		help => "The 'zmu' utility can be used to force an alarm on a monitor rather than rely on the motion detection algorithms. This option determines what score to give these alarms to distinguish them from regular ones. It must be 255 or less.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_BULK_FRAME_INTERVAL",
-		default => "100",
-		description => "How often a bulk frame should be written to the database",
-		help => "Traditionally ZoneMinder writes an entry into the Frames database table for each frame that is captured and saved. This works well in motion detection scenarios but when in a DVR situation ('Record' or 'Mocord' mode) this results in a huge number of frame writes and a lot of database and disk bandwidth for very little additional information. Setting this to a non-zero value will enabled ZoneMinder to group these non-alarm frames into one 'bulk' frame entry which saves a lot of bandwidth and space. The only disadvantage of this is that timing information for individual frames is lost but in constant frame rate situations this is usually not significant. This setting is ignored in Modect mode and individual frames are still written if an alarm occurs in Mocord mode also.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_CLOSE_MODE",
-		default => "idle",
-		description => "When continuous events are closed.",
-		help => "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 occuring 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.",
-		type => $types{boolean},
-		type => { db_type=>"string", hint=>"time|idle|alarm", pattern=>qr|^([tia])|i, format=>q( ($1 =~ /^t/) ? "time" : ($1 =~ /^i/ ? "idle" : "time" ) ) },
-		category => "config",
-	},
+        name        => "ZM_RUN_AUDIT",
+        default     => "yes",
+        description => "Run zmaudit to check data consistency",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUDIT_CHECK_INTERVAL",
+        default     => "900",
+        description => "How often to check database and filesystem consistency",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_AUDIT_MIN_AGE",
+        default     => "86400",
+        description => "The minimum age in seconds event data must be in order to be deleted.",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_FORCED_ALARM_SCORE",
+        default     => "255",
+        description => "Score to give forced alarms",
+        help        => qqq("
+            The 'zmu' utility can be used to force an alarm on a monitor
+            rather than rely on the motion detection algorithms. This
+            option determines what score to give these alarms to
+            distinguish them from regular ones. It must be 255 or less.
+        "),
+        type        => $types{integer},
+        category    => "config",
+    },
+    {
+        name        => "ZM_BULK_FRAME_INTERVAL",
+        default     => "100",
+        description => "How often a bulk frame should be written to the database",
+        help        => qqq("
+            Traditionally ZoneMinder writes an entry into the Frames
+            database table for each frame that is captured and saved. This
+            works well in motion detection scenarios but when in a DVR
+            situation ('Record' or 'Mocord' mode) this results in a huge
+            number of frame writes and a lot of database and disk bandwidth
+            for very little additional information. Setting this to a
+            non-zero value will enabled ZoneMinder to group these non-alarm
+            frames into one 'bulk' frame entry which saves a lot of
+            bandwidth and space. The only disadvantage of this is that
+            timing information for individual frames is lost but in
+            constant frame rate situations this is usually not significant.
+            This setting is ignored in Modect mode and individual frames
+            are still written if an alarm occurs in Mocord mode also.
+        "),
+        type        => $types{integer},
+        category    => "config",
+    },
+    {
+        name        => "ZM_EVENT_CLOSE_MODE",
+        default     => "idle",
+        description => "When continuous events are closed.",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        type        => {
+            db_type     =>"string",
+            hint        =>"time|idle|alarm",
+            pattern     =>qr|^([tia])|i,
+            format      =>q( ($1 =~ /^t/)
+                             ? "time"
+                             : ($1 =~ /^i/ ? "idle" : "time" )
+                           )
+        },
+        category    => "config",
+    },
     # Deprecated, superseded by event close mode
-	{
-		name => "ZM_FORCE_CLOSE_EVENTS",
-		default => "no",
-		description => "Close events at section ends.",
-		help => "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 => "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 occured. 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",
-		description => "Use a weighted algorithm to calculate the centre of an alarm",
-		help => "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.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_IMAGE_DIGITS",
-		default => "5",
-		description => "How many significant digits are used in event image numbering",
-		help => "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.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_DEFAULT_ASPECT_RATIO",
-		default => "4:3",
-		description => "The default width:height aspect ratio used in monitors",
-		help => "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.",
-		type => $types{string},
-		category => "config",
-	},
-	{
-		name => "ZM_USER_SELF_EDIT",
-		default => "no",
-		description => "Allow unprivileged users to change their details",
-		help => "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",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_FRAME_SERVER",
-		default => "no",
-		description => "Should analysis farm out the writing of images to disk",
-		#requires => [ { name => "ZM_OPT_ADAPTIVE_SKIP", value => "yes" } ],
-		help => "In some circumstances it is possible for a slow disk to take so long writing images to disk that it causes the analysis daemon to fall behind especially during high frame rate events. Setting this option to yes enables a frame server daemon (zmf) which will be sent the images from the analysis daemon and will do the actual writing of images itself freeing up the analysis daemon to get on with other things. Should this transmission fail or other permanent or transient error occur, this function will fall back to the analysis daemon.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_FRAME_SOCKET_SIZE",
-		default => "0",
-		description => "Specify the frame server socket buffer size if non-standard",
-		requires => [ { name => "ZM_OPT_FRAME_SERVER", value => "yes" } ],
-		help => "For large captured images it is possible for the writes from the analysis daemon to the frame server to fail as the amount to be written exceeds the default buffer size. While the images are then written by the analysis daemon so no data is lost, it defeats the object of the frame server daemon in the first place. You can use this option to indicate that a larger buffer size should be used. Note that you may have to change the existing maximum socket buffer size on your system via sysctl (or in /proc/sys/net/core/wmem_max) to allow this new size to be set. Alternatively you can change the default buffer size on your system in the same way in which case that will be used with no change necessary in this option",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_CONTROL",
-		default => "no",
-		description => "Support controllable (e.g. PTZ) cameras",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_TRIGGERS",
-		default => "no",
-		description => "Interface external event triggers via socket or device files",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_CHECK_FOR_UPDATES",
-		default => "yes",
-		description => "Check with zoneminder.com for updated versions",
-		help => "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",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_UPDATE_CHECK_PROXY",
-		default => "",
-		description => "Proxy url if required to access zoneminder.com",
-		help => "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>/",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_SHM_KEY",
-		default => "0x7a6d0000",
-		description => "Shared memory root key to use",
-		help => "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.",
-		type => $types{hexadecimal},
-		category => "system",
-	},
+    {
+        name        => "ZM_FORCE_CLOSE_EVENTS",
+        default     => "no",
+        description => "Close events at section ends.",
+        help        => qqq("
+            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        => qqq("
+            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",
+        description => "Use a weighted algorithm to calculate the centre of an alarm",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_EVENT_IMAGE_DIGITS",
+        default     => "5",
+        description => "How many significant digits are used in event image numbering",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        category    => "config",
+    },
+    {
+        name        => "ZM_DEFAULT_ASPECT_RATIO",
+        default     => "4:3",
+        description => "The default width:height aspect ratio used in monitors",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{string},
+        category    => "config",
+    },
+    {
+        name        => "ZM_USER_SELF_EDIT",
+        default     => "no",
+        description => "Allow unprivileged users to change their details",
+        help        => qqq("
+            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
+        "),
+        type        => $types{boolean},
+        category    => "config",
+    },
+    {
+        name        => "ZM_OPT_FRAME_SERVER",
+        default     => "no",
+        description => "Should analysis farm out the writing of images to disk",
+        #requires   => [ { name => "ZM_OPT_ADAPTIVE_SKIP", value => "yes" } ],
+        help        => qqq("
+            In some circumstances it is possible for a slow disk to take so
+            long writing images to disk that it causes the analysis daemon
+            to fall behind especially during high frame rate events.
+            Setting this option to yes enables a frame server daemon (zmf)
+            which will be sent the images from the analysis daemon and will
+            do the actual writing of images itself freeing up the analysis
+            daemon to get on with other things. Should this transmission
+            fail or other permanent or transient error occur, this function
+            will fall back to the analysis daemon.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_FRAME_SOCKET_SIZE",
+        default     => "0",
+        description => "Specify the frame server socket buffer size if non-standard",
+        requires    => [ { name => "ZM_OPT_FRAME_SERVER", value => "yes" } ],
+        help        => qqq("
+            For large captured images it is possible for the writes from
+            the analysis daemon to the frame server to fail as the amount
+            to be written exceeds the default buffer size. While the images
+            are then written by the analysis daemon so no data is lost, it
+            defeats the object of the frame server daemon in the first
+            place. You can use this option to indicate that a larger buffer
+            size should be used. Note that you may have to change the
+            existing maximum socket buffer size on your system via sysctl
+            (or in /proc/sys/net/core/wmem_max) to allow this new size to
+            be set. Alternatively you can change the default buffer size on
+            your system in the same way in which case that will be used
+            with no change necessary in this option
+        "),
+        type        => $types{integer},
+        category    => "system",
+    },
+    {
+        name        => "ZM_OPT_CONTROL",
+        default     => "no",
+        description => "Support controllable (e.g. PTZ) cameras",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_OPT_TRIGGERS",
+        default     => "no",
+        description => "Interface external event triggers via socket or device files",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_CHECK_FOR_UPDATES",
+        default     => "yes",
+        description => "Check with zoneminder.com for updated versions",
+        help        => qqq("
+            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
+        "),
+        type        => $types{boolean},
+        category    => "system",
+    },
+    {
+        name        => "ZM_UPDATE_CHECK_PROXY",
+        default     => "",
+        description => "Proxy url if required to access zoneminder.com",
+        help        => qqq("
+            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>/
+        "),
+        type        => $types{string},
+        category    => "system",
+    },
+    {
+        name        => "ZM_SHM_KEY",
+        default     => "0x7a6d0000",
+        description => "Shared memory root key to use",
+        help        => qqq("
+            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.
+        "),
+        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 => "Many windows in Javascript 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",
-		description => "Default field the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what field is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore", pattern=>qr|.|, format=>q( $1 ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENT_SORT_ORDER",
-		default => "asc",
-		description => "Default order the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what order (ascending or descending) is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"asc|desc", pattern=>qr|^([ad])|i, format=>q( $1 =~ /^a/i ? "asc" : "desc" ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENTS_PER_PAGE",
-		default => "25",
-		description => "How many events to list per page in paged mode",
-		help => "In the event list view you can either list all events or just a page at a time. This option controls how many events are listed per page in paged mode and how often to repeat the column headers in non-paged mode.",
-		type => $types{integer},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMBS",
-		default => "no",
-		description => "Display mini-thumbnails of event images in event lists",
-		help => "Ordinarily the event lists just display text details of the events to save space and time. By switching this option on you can also display small thumbnails to help you identify events of interest. The size of these thumbnails is controlled by the following two options.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_WIDTH",
-		default => "48",
-		description => "The width of the thumbnails that appear in the event lists",
-		help => "This options controls the width 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 height instead in the next 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.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_HEIGHT",
-		default => "0",
-		description => "The height of the thumbnails that appear in the event lists",
-		help => "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.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_USE_OBJECT_TAGS",
-		default => "yes",
-		description => "Wrap embed in object tags for media content",
-		help => "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.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_MAIN",
-		default => "60",
-		introduction => "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.\n\nThe next few options control what happens when the client is running in 'high' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a local network or high speed link. In most cases the default values will be suitable as a starting point.",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_CYCLE",
-		default => "10",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_IMAGE",
-		default => "3",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_STATUS",
-		default => "1",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_EVENTS",
-		default => "5",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_BITRATE",
-		default => "150000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_MAXFPS",
-		default => "30",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SCALE_THUMBS",
-		default => "no",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_AJAX_TIMEOUT",
-		default => "3000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		introduction => "The next few options control what happens when the client is running in 'medium' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a slower cable or DSL link. In most cases the default values will be suitable as a starting point.",
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_CYCLE",
-		default => "20",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_IMAGE",
-		default => "10",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_STATUS",
-		default => "5",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_EVENTS",
-		default => "60",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_BITRATE",
-		default => "75000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_MAXFPS",
-		default => "10",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_AJAX_TIMEOUT",
-		default => "5000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		introduction => "The next few options control what happens when the client is running in 'low' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a modem or slow link. In most cases the default values will be suitable as a starting point.",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_CYCLE",
-		default => "30",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_IMAGE",
-		default => "15",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_STATUS",
-		default => "10",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_EVENTS",
-		default => "180",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_BITRATE",
-		default => "25000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SHOW_PROGRESS",
-		default => "no",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_P_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_BITRATE",
-		default => "8000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_DYN_LAST_VERSION",
-		default => "",
-		description => "What the last version of ZoneMinder recorded from zoneminder.com is",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_CURR_VERSION",
-		default => "@VERSION@",
-		description => "What the effective current version of ZoneMinder is, might be different from actual if versions ignored",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DB_VERSION",
-		default => "@VERSION@",
-		description => "What the version of the database is, from zmupdate",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_LAST_CHECK",
-		default => "",
-		description => "When the last check for version from zoneminder.com was",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_NEXT_REMINDER",
-		default => "",
-		description => "When the earliest time to remind about versions will be",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DONATE_REMINDER_TIME",
-		default => 0,
-		description => "When the earliest time to remind about donations will be",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_SHOW_DONATE_REMINDER",
-		default => "yes",
-		description => "Remind about donations or not",
-		help => "",
-		type => $types{boolean},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_EYEZM_DEBUG",
-		default => "no",
-		description => "Switch additional debugging on for eyeZm Plugin",
-		help => "Enable or Disable extra debugging from the eyeZm Plugin. Extra debugging information will be displayed in it's own file (EYEZM_LOG_TO_FILE is set), or your Apache error log",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_TO_FILE",
-		default => "yes",
-		description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
-		help => "When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output generated from the eyeZm Plugin will go to it's own file. Otherwise it will go to the apache error log.",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_FILE",
-		default => "@ZM_LOGDIR@/zm_xml.log",
-		description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
-		help => "This file will contain it's own output from the eyeZm Plugin when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_EVENT_VCODEC",
-		default => "mpeg4",
-		description => "Default video-codec to use for encoding events",
-		help => "The eyeZm Plugin calls FFMPEG externally to encode the captured images. If your FFMPEG is not built with support for H264, change this to MPEG-4. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+).",
-		type => { db_type=>"string", hint=>"mpeg4|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mpeg4" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_FEED_VCODEC",
-		default => "mjpeg",
-		description => "Default video-codec to use for streaming the live feed",
-		help => "Determines whether the live stream is generated using native MJPEG streaming with ZoneMinder, or H264 using FFMPEG and HTML-5 streaming. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+). This is just a default parameter, and can be overridden with eyeZm.",
-		type => { db_type=>"string", hint=>"mjpeg|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mjpeg" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_BR",
-		default => "96k",
-		description => "Default bit-rate to use with FFMPEG for H264 streaming",
-		help => "When using the eyeZm Plugin to stream H264 data, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_EVBR",
-		default => "128k",
-		description => "Default bit-rate to use with FFMPEG for H264 event viewing",
-		help => "When using the eyeZm Plugin to view events in H264, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_TIMEOUT",
-		default => "20",
-		description => "Timeout (sec) to wait for H264 stream to start before terminating",
-		help => "The eyeZm Plugin will attempt to spawn an H264 stream when requested, and require that it complete within the timeout specified. If you have a slow system or find through the logs that the H264 stream is not starting because the timeout is expiring, even though FFMPEG is running, try increasing this value. If you have a fast system, decreasing this value can improve the responsiveness when there are issues starting H264 streams",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_SEG_DURATION",
-		default => "3",
-		description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
-		help => "The HTTP-5 Live Streaming Protocol segments the input video stream into small chunks of a duration specified by this parameter. Increasing the segment duration will help with choppy connections on the other end, but will increase the latency in starting a stream.",
-		type => $types{string},
-		category => "eyeZm",
-	},
+    {
+        name        => "ZM_WEB_REFRESH_METHOD",
+        default     => "javascript",
+        description => "What method windows should use to refresh themselves",
+        help        => qqq("
+            Many windows in Javascript 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",
+        description => "Default field the event lists are sorted by",
+        help        => qqq("
+            Events in lists can be initially ordered in any way you want.
+            This option controls what field is used to sort them. You can
+            modify this ordering from filters or by clicking on headings in
+            the lists themselves. Bear in mind however that the 'Prev' and
+            'Next' links, when scrolling through events, relate to the
+            ordering in the lists and so not always to time based ordering.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore",
+            pattern     =>qr|.|,
+            format      =>q( $1 )
+        },
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_EVENT_SORT_ORDER",
+        default     => "asc",
+        description => "Default order the event lists are sorted by",
+        help        => qqq("
+            Events in lists can be initially ordered in any way you want.
+            This option controls what order (ascending or descending) is
+            used to sort them. You can modify this ordering from filters or
+            by clicking on headings in the lists themselves. Bear in mind
+            however that the 'Prev' and 'Next' links, when scrolling
+            through events, relate to the ordering in the lists and so not
+            always to time based ordering.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"asc|desc",
+            pattern     =>qr|^([ad])|i,
+            format      =>q( $1 =~ /^a/i ? "asc" : "desc" )
+        },
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_EVENTS_PER_PAGE",
+        default     => "25",
+        description => "How many events to list per page in paged mode",
+        help        => qqq("
+            In the event list view you can either list all events or just a
+            page at a time. This option controls how many events are listed
+            per page in paged mode and how often to repeat the column
+            headers in non-paged mode.
+        "),
+        type        => $types{integer},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_LIST_THUMBS",
+        default     => "no",
+        description => "Display mini-thumbnails of event images in event lists",
+        help        => qqq("
+            Ordinarily the event lists just display text details of the
+            events to save space and time. By switching this option on you
+            can also display small thumbnails to help you identify events
+            of interest. The size of these thumbnails is controlled by the
+            following two options.
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_LIST_THUMB_WIDTH",
+        default     => "48",
+        description => "The width of the thumbnails that appear in the event lists",
+        help        => qqq("
+            This options controls the width 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
+            height instead in the next 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.
+        "),
+        type        => $types{integer},
+        requires    => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_LIST_THUMB_HEIGHT",
+        default     => "0",
+        description => "The height of the thumbnails that appear in the event lists",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{integer},
+        requires    => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_USE_OBJECT_TAGS",
+        default     => "yes",
+        description => "Wrap embed in object tags for media content",
+        help        => qqq("
+            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.
+        "),
+        type        => $types{boolean},
+        category    => "web",
+    },
+    {
+        name        => "ZM_WEB_H_REFRESH_MAIN",
+        default     => "60",
+        introduction => qqq("
+            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.\n\nThe next few options
+            control what happens when the client is running in 'high'
+            bandwidth mode. You should set these options for when accessing
+            the ZoneMinder client over a local network or high speed link.
+            In most cases the default values will be suitable as a starting
+            point.
+        "),
+        description => "How often (in seconds) the main console window should refresh itself",
+        help        => qqq("
+            The main console window lists a general status and the event
+            totals for all monitors. This is not a trivial task and should
+            not be repeated too frequently or it may affect the performance
+            of the rest of the system.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_REFRESH_CYCLE",
+        default     => "10",
+        description => "How often (in seconds) the cycle watch window swaps to the next monitor",
+        help        => qqq("
+            The cycle watch window is a method of continuously cycling
+            between images from all of your monitors. This option
+            determines how often to refresh with a new image.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_REFRESH_IMAGE",
+        default     => "3",
+        description => "How often (in seconds) the watched image is refreshed (if not streaming)",
+        help        => qqq("
+            The live images from a monitor can be viewed in either streamed
+            or stills mode. This option determines how often a stills image
+            is refreshed, it has no effect if streaming is selected.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_REFRESH_STATUS",
+        default     => "1",
+        description => "How often (in seconds) the status refreshes itself in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            one in the middle merely contains a monitor status which needs
+            to refresh fairly frequently to give a true indication. This
+            option determines that frequency.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_REFRESH_EVENTS",
+        default     => "5",
+        description => "How often (in seconds) the event listing is refreshed in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            lower framme contains a listing of the last few events for easy
+            access. This option determines how often this is refreshed.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_CAN_STREAM",
+        default     => "auto",
+        description => "Override the automatic detection of browser streaming capability",
+        help        => qqq("
+            If you know that your browser can handle image streams of the
+            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
+            this correctly you can set this option to ensure that the
+            stream is delivered with or without the use of the Cambozola
+            plugin. Selecting 'yes' will tell ZoneMinder that your browser
+            can handle the streams natively, 'no' means that it can't and
+            so the plugin will be used while 'auto' lets ZoneMinder decide.
+        "),
+        type        => $types{tristate},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_STREAM_METHOD",
+        default     => "jpeg",
+        description => "Which method should be used to send video streams to your browser.",
+        help        => qqq("
+            ZoneMinder can be configured to use either mpeg encoded video
+            or a series or still jpeg images when sending video streams.
+            This option defines which is used. If you choose mpeg you
+            should ensure that you have the appropriate plugins available
+            on your browser whereas choosing jpeg will work natively on
+            Mozilla and related browsers and with a Java applet on Internet
+            Explorer
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mpeg|jpeg",
+            pattern     =>qr|^([mj])|i,
+            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
+        },
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_DEFAULT_SCALE",
+        default     => "100",
+        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'live' or 'event' streams in
+            their native size. However if you have monitors with large
+            dimensions or a slow link you may prefer to reduce this size,
+            alternatively for small monitors you can enlarge it. This
+            options lets you specify what the default scaling factor will
+            be. It is expressed as a percentage so 100 is normal size, 200
+            is double size etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|33|50|75|100|150|200|300|400",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_DEFAULT_RATE",
+        default     => "100",
+        description => "What the default replay rate factor applied to 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'event' streams at their
+            native rate, i.e. as close to real-time as possible. However if
+            you have long events it is often convenient to replay them at a
+            faster rate for review. This option lets you specify what the
+            default replay rate will be. It is expressed as a percentage so
+            100 is normal rate, 200 is double speed etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_VIDEO_BITRATE",
+        default     => "150000",
+        description => "What the bitrate of the video encoded stream should be set to",
+        help        => qqq("
+            When encoding real video via the ffmpeg library a bit rate can
+            be specified which roughly corresponds to the available
+            bandwidth used for the stream. This setting effectively
+            corresponds to a 'quality' setting for the video. A low value
+            will result in a blocky image whereas a high value will produce
+            a clearer view. Note that this setting does not control the
+            frame rate of the video however the quality of the video
+            produced is affected both by this setting and the frame rate
+            that the video is produced at. A higher frame rate at a
+            particular bit rate result in individual frames being at a
+            lower quality.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_VIDEO_MAXFPS",
+        default     => "30",
+        description => "What the maximum frame rate for streamed video should be",
+        help        => qqq("
+            When using streamed video the main control is the bitrate which
+            determines how much data can be transmitted. However a lower
+            bitrate at high frame rates results in a lower quality image.
+            This option allows you to limit the maximum frame rate to
+            ensure that video quality is maintained. An additional
+            advantage is that encoding video at high frame rates is a
+            processor intensive task when for the most part a very high
+            frame rate offers little perceptible improvement over one that
+            has a more manageable resource requirement. Note, this option
+            is implemented as a cap beyond which binary reduction takes
+            place. So if you have a device capturing at 15fps and set this
+            option to 10fps then the video is not produced at 10fps, but
+            rather at 7.5fps (15 divided by 2) as the final frame rate must
+            be the original divided by a power of 2.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_SCALE_THUMBS",
+        default     => "no",
+        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
+        help        => qqq("
+            If unset, this option sends the whole image to the browser
+            which resizes it in the window. If set the image is scaled down
+            on the server before sending a reduced size image to the
+            browser to conserve bandwidth at the cost of cpu on the server.
+            Note that ZM can only perform the resizing if the appropriate
+            PHP graphics functionality is installed. This is usually
+            available in the php-gd package.
+        "),
+        type        => $types{boolean},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_EVENTS_VIEW",
+        default     => "events",
+        description => "What the default view of multiple events should be.",
+        help        => qqq("
+            Stored events can be viewed in either an events list format or
+            in a timeline based one. This option sets the default view that
+            will be used. Choosing one view here does not prevent the other
+            view being used as it will always be selectable from whichever
+            view is currently being used.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"events|timeline",
+            pattern     =>qr|^([lt])|i,
+            format      =>q( $1 =~ /^e/ ? "events" : "timeline" )
+        },
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_SHOW_PROGRESS",
+        default     => "yes",
+        description => "Show the progress of replay in event view.",
+        help        => qqq("
+            When viewing events an event navigation panel and progress bar
+            is shown below the event itself. This allows you to jump to
+            specific points in the event, but can can also dynamically
+            update to display the current progress of the event replay
+            itself. This progress is calculated from the actual event
+            duration and is not directly linked to the replay itself, so on
+            limited bandwidth connections may be out of step with the
+            replay. This option allows you to turn off the progress
+            display, whilst still keeping the navigation aspect, where
+            bandwidth prevents it functioning effectively.
+        "),
+        type        => $types{boolean},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_H_AJAX_TIMEOUT",
+        default     => "3000",
+        description => "How long to wait for Ajax request responses (ms)",
+        help        => qqq("
+            The newer versions of the live feed and event views use Ajax to
+            request information from the server and populate the views
+            dynamically. This option allows you to specify a timeout if
+            required after which requests are abandoned. A timeout may be
+            necessary if requests would overwise hang such as on a slow
+            connection. This would tend to consume a lot of browser memory
+            and make the interface unresponsive. Ordinarily no requests
+            should timeout so this setting should be set to a value greater
+            than the slowest expected response. This value is in
+            milliseconds but if set to zero then no timeout will be used.
+        "),
+        type        => $types{integer},
+        category    => "highband",
+    },
+    {
+        name        => "ZM_WEB_M_REFRESH_MAIN",
+        default     => "300",
+        description => "How often (in seconds) the main console window should refresh itself",
+        help        => qqq("
+            The main console window lists a general status and the event
+            totals for all monitors. This is not a trivial task and should
+            not be repeated too frequently or it may affect the performance
+            of the rest of the system.
+        "),
+        type        => $types{integer},
+        introduction => qqq("
+            The next few options control what happens when the client is
+            running in 'medium' bandwidth mode. You should set these
+            options for when accessing the ZoneMinder client over a slower
+            cable or DSL link. In most cases the default values will be
+            suitable as a starting point.
+        "),
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_REFRESH_CYCLE",
+        default     => "20",
+        description => "How often (in seconds) the cycle watch window swaps to the next monitor",
+        help        => qqq("
+            The cycle watch window is a method of continuously cycling
+            between images from all of your monitors. This option
+            determines how often to refresh with a new image.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_REFRESH_IMAGE",
+        default     => "10",
+        description => "How often (in seconds) the watched image is refreshed (if not streaming)",
+        help        => qqq("
+            The live images from a monitor can be viewed in either streamed
+            or stills mode. This option determines how often a stills image
+            is refreshed, it has no effect if streaming is selected.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_REFRESH_STATUS",
+        default     => "5",
+        description => "How often (in seconds) the status refreshes itself in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            one in the middle merely contains a monitor status which needs
+            to refresh fairly frequently to give a true indication. This
+            option determines that frequency.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_REFRESH_EVENTS",
+        default     => "60",
+        description => "How often (in seconds) the event listing is refreshed in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            lower framme contains a listing of the last few events for easy
+            access. This option determines how often this is refreshed.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_CAN_STREAM",
+        default     => "auto",
+        description => "Override the automatic detection of browser streaming capability",
+        help        => qqq("
+            If you know that your browser can handle image streams of the
+            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
+            this correctly you can set this option to ensure that the
+            stream is delivered with or without the use of the Cambozola
+            plugin. Selecting 'yes' will tell ZoneMinder that your browser
+            can handle the streams natively, 'no' means that it can't and
+            so the plugin will be used while 'auto' lets ZoneMinder decide.
+        "),
+        type        => $types{tristate},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_STREAM_METHOD",
+        default     => "jpeg",
+        description => "Which method should be used to send video streams to your browser.",
+        help        => qqq("
+            ZoneMinder can be configured to use either mpeg encoded video
+            or a series or still jpeg images when sending video streams.
+            This option defines which is used. If you choose mpeg you
+            should ensure that you have the appropriate plugins available
+            on your browser whereas choosing jpeg will work natively on
+            Mozilla and related browsers and with a Java applet on Internet
+            Explorer
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mpeg|jpeg",
+            pattern     =>qr|^([mj])|i,
+            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
+        },
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_DEFAULT_SCALE",
+        default     => "100",
+        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'live' or 'event' streams in
+            their native size. However if you have monitors with large
+            dimensions or a slow link you may prefer to reduce this size,
+            alternatively for small monitors you can enlarge it. This
+            options lets you specify what the default scaling factor will
+            be. It is expressed as a percentage so 100 is normal size, 200
+            is double size etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|33|50|75|100|150|200|300|400",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_DEFAULT_RATE",
+        default     => "100",
+        description => "What the default replay rate factor applied to 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'event' streams at their
+            native rate, i.e. as close to real-time as possible. However if
+            you have long events it is often convenient to replay them at a
+            faster rate for review. This option lets you specify what the
+            default replay rate will be. It is expressed as a percentage so
+            100 is normal rate, 200 is double speed etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_VIDEO_BITRATE",
+        default     => "75000",
+        description => "What the bitrate of the video encoded stream should be set to",
+        help        => qqq("
+            When encoding real video via the ffmpeg library a bit rate can
+            be specified which roughly corresponds to the available
+            bandwidth used for the stream. This setting effectively
+            corresponds to a 'quality' setting for the video. A low value
+            will result in a blocky image whereas a high value will produce
+            a clearer view. Note that this setting does not control the
+            frame rate of the video however the quality of the video
+            produced is affected both by this setting and the frame rate
+            that the video is produced at. A higher frame rate at a
+            particular bit rate result in individual frames being at a
+            lower quality.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_VIDEO_MAXFPS",
+        default     => "10",
+        description => "What the maximum frame rate for streamed video should be",
+        help        => qqq("
+            When using streamed video the main control is the bitrate which
+            determines how much data can be transmitted. However a lower
+            bitrate at high frame rates results in a lower quality image.
+            This option allows you to limit the maximum frame rate to
+            ensure that video quality is maintained. An additional
+            advantage is that encoding video at high frame rates is a
+            processor intensive task when for the most part a very high
+            frame rate offers little perceptible improvement over one that
+            has a more manageable resource requirement. Note, this option
+            is implemented as a cap beyond which binary reduction takes
+            place. So if you have a device capturing at 15fps and set this
+            option to 10fps then the video is not produced at 10fps, but
+            rather at 7.5fps (15 divided by 2) as the final frame rate must
+            be the original divided by a power of 2.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_SCALE_THUMBS",
+        default     => "yes",
+        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
+        help        => qqq("
+            If unset, this option sends the whole image to the browser
+            which resizes it in the window. If set the image is scaled down
+            on the server before sending a reduced size image to the
+            browser to conserve bandwidth at the cost of cpu on the server.
+            Note that ZM can only perform the resizing if the appropriate
+            PHP graphics functionality is installed. This is usually
+            available in the php-gd package.
+        "),
+        type        => $types{boolean},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_EVENTS_VIEW",
+        default     => "events",
+        description => "What the default view of multiple events should be.",
+        help        => qqq("
+            Stored events can be viewed in either an events list format or
+            in a timeline based one. This option sets the default view that
+            will be used. Choosing one view here does not prevent the other
+            view being used as it will always be selectable from whichever
+            view is currently being used.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"events|timeline",
+            pattern     =>qr|^([lt])|i,
+            format      =>q( $1 =~ /^e/ ? "events" : "timeline" )
+        },
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_SHOW_PROGRESS",
+        default     => "yes",
+        description => "Show the progress of replay in event view.",
+        help        => qqq("
+            When viewing events an event navigation panel and progress bar
+            is shown below the event itself. This allows you to jump to
+            specific points in the event, but can can also dynamically
+            update to display the current progress of the event replay
+            itself. This progress is calculated from the actual event
+            duration and is not directly linked to the replay itself, so on
+            limited bandwidth connections may be out of step with the
+            replay. This option allows you to turn off the progress
+            display, whilst still keeping the navigation aspect, where
+            bandwidth prevents it functioning effectively.
+        "),
+        type        => $types{boolean},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_M_AJAX_TIMEOUT",
+        default     => "5000",
+        description => "How long to wait for Ajax request responses (ms)",
+        help        => qqq("
+            The newer versions of the live feed and event views use Ajax to
+            request information from the server and populate the views
+            dynamically. This option allows you to specify a timeout if
+            required after which requests are abandoned. A timeout may be
+            necessary if requests would overwise hang such as on a slow
+            connection. This would tend to consume a lot of browser memory
+            and make the interface unresponsive. Ordinarily no requests
+            should timeout so this setting should be set to a value greater
+            than the slowest expected response. This value is in
+            milliseconds but if set to zero then no timeout will be used.
+        "),
+        type        => $types{integer},
+        category    => "medband",
+    },
+    {
+        name        => "ZM_WEB_L_REFRESH_MAIN",
+        default     => "300",
+        description => "How often (in seconds) the main console window should refresh itself",
+        introduction => qqq("
+            The next few options control what happens when the client is
+            running in 'low' bandwidth mode. You should set these options
+            for when accessing the ZoneMinder client over a modem or slow
+            link. In most cases the default values will be suitable as a
+            starting point.
+        "),
+        help        => qqq("
+            The main console window lists a general status and the event
+            totals for all monitors. This is not a trivial task and should
+            not be repeated too frequently or it may affect the performance
+            of the rest of the system.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_REFRESH_CYCLE",
+        default     => "30",
+        description => "How often (in seconds) the cycle watch window swaps to the next monitor",
+        help        => qqq("
+            The cycle watch window is a method of continuously cycling
+            between images from all of your monitors. This option
+            determines how often to refresh with a new image.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_REFRESH_IMAGE",
+        default     => "15",
+        description => "How often (in seconds) the watched image is refreshed (if not streaming)",
+        help        => qqq("
+            The live images from a monitor can be viewed in either streamed
+            or stills mode. This option determines how often a stills image
+            is refreshed, it has no effect if streaming is selected.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_REFRESH_STATUS",
+        default     => "10",
+        description => "How often (in seconds) the status refreshes itself in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            one in the middle merely contains a monitor status which needs
+            to refresh fairly frequently to give a true indication. This
+            option determines that frequency.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_REFRESH_EVENTS",
+        default     => "180",
+        description => "How often (in seconds) the event listing is refreshed in the watch window",
+        help        => qqq("
+            The monitor window is actually made from several frames. The
+            lower framme contains a listing of the last few events for easy
+            access. This option determines how often this is refreshed.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_CAN_STREAM",
+        default     => "auto",
+        description => "Override the automatic detection of browser streaming capability",
+        help        => qqq("
+            If you know that your browser can handle image streams of the
+            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
+            this correctly you can set this option to ensure that the
+            stream is delivered with or without the use of the Cambozola
+            plugin. Selecting 'yes' will tell ZoneMinder that your browser
+            can handle the streams natively, 'no' means that it can't and
+            so the plugin will be used while 'auto' lets ZoneMinder decide.
+        "),
+        type        => $types{tristate},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_STREAM_METHOD",
+        default     => "jpeg",
+        description => "Which method should be used to send video streams to your browser.",
+        help        => qqq("
+            ZoneMinder can be configured to use either mpeg encoded video
+            or a series or still jpeg images when sending video streams.
+            This option defines which is used. If you choose mpeg you
+            should ensure that you have the appropriate plugins available
+            on your browser whereas choosing jpeg will work natively on
+            Mozilla and related browsers and with a Java applet on Internet
+            Explorer
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mpeg|jpeg",
+            pattern     =>qr|^([mj])|i,
+            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
+        },
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_DEFAULT_SCALE",
+        default     => "100",
+        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'live' or 'event' streams in
+            their native size. However if you have monitors with large
+            dimensions or a slow link you may prefer to reduce this size,
+            alternatively for small monitors you can enlarge it. This
+            options lets you specify what the default scaling factor will
+            be. It is expressed as a percentage so 100 is normal size, 200
+            is double size etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|33|50|75|100|150|200|300|400",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_DEFAULT_RATE",
+        default     => "100",
+        description => "What the default replay rate factor applied to 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'event' streams at their
+            native rate, i.e. as close to real-time as possible. However if
+            you have long events it is often convenient to replay them at a
+            faster rate for review. This option lets you specify what the
+            default replay rate will be. It is expressed as a percentage so
+            100 is normal rate, 200 is double speed etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
+            pattern     =>qr|^(\d+)$|, format=>q( $1 )
+        },
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_VIDEO_BITRATE",
+        default     => "25000",
+        description => "What the bitrate of the video encoded stream should be set to",
+        help        => qqq("
+            When encoding real video via the ffmpeg library a bit rate can
+            be specified which roughly corresponds to the available
+            bandwidth used for the stream. This setting effectively
+            corresponds to a 'quality' setting for the video. A low value
+            will result in a blocky image whereas a high value will produce
+            a clearer view. Note that this setting does not control the
+            frame rate of the video however the quality of the video
+            produced is affected both by this setting and the frame rate
+            that the video is produced at. A higher frame rate at a
+            particular bit rate result in individual frames being at a
+            lower quality.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_VIDEO_MAXFPS",
+        default     => "5",
+        description => "What the maximum frame rate for streamed video should be",
+        help        => qqq("
+            When using streamed video the main control is the bitrate which
+            determines how much data can be transmitted. However a lower
+            bitrate at high frame rates results in a lower quality image.
+            This option allows you to limit the maximum frame rate to
+            ensure that video quality is maintained. An additional
+            advantage is that encoding video at high frame rates is a
+            processor intensive task when for the most part a very high
+            frame rate offers little perceptible improvement over one that
+            has a more manageable resource requirement. Note, this option
+            is implemented as a cap beyond which binary reduction takes
+            place. So if you have a device capturing at 15fps and set this
+            option to 10fps then the video is not produced at 10fps, but
+            rather at 7.5fps (15 divided by 2) as the final frame rate must
+            be the original divided by a power of 2.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_SCALE_THUMBS",
+        default     => "yes",
+        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
+        help        => qqq("
+            If unset, this option sends the whole image to the browser
+            which resizes it in the window. If set the image is scaled down
+            on the server before sending a reduced size image to the
+            browser to conserve bandwidth at the cost of cpu on the server.
+            Note that ZM can only perform the resizing if the appropriate
+            PHP graphics functionality is installed. This is usually
+            available in the php-gd package.
+        "),
+        type        => $types{boolean},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_EVENTS_VIEW",
+        default     => "events",
+        description => "What the default view of multiple events should be.",
+        help        => qqq("
+            Stored events can be viewed in either an events list format or
+            in a timeline based one. This option sets the default view that
+            will be used. Choosing one view here does not prevent the other
+            view being used as it will always be selectable from whichever
+            view is currently being used.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"events|timeline",
+            pattern     =>qr|^([lt])|i,
+            format      =>q( $1 =~ /^e/ ? "events" : "timeline" )
+        },
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_SHOW_PROGRESS",
+        default     => "no",
+        description => "Show the progress of replay in event view.",
+        help        => qqq("
+            When viewing events an event navigation panel and progress bar
+            is shown below the event itself. This allows you to jump to
+            specific points in the event, but can can also dynamically
+            update to display the current progress of the event replay
+            itself. This progress is calculated from the actual event
+            duration and is not directly linked to the replay itself, so on
+            limited bandwidth connections may be out of step with the
+            replay. This option allows you to turn off the progress
+            display, whilst still keeping the navigation aspect, where
+            bandwidth prevents it functioning effectively.
+        "),
+        type        => $types{boolean},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_L_AJAX_TIMEOUT",
+        default     => "10000",
+        description => "How long to wait for Ajax request responses (ms)",
+        help        => qqq("
+            The newer versions of the live feed and event views use Ajax to
+            request information from the server and populate the views
+            dynamically. This option allows you to specify a timeout if
+            required after which requests are abandoned. A timeout may be
+            necessary if requests would overwise hang such as on a slow
+            connection. This would tend to consume a lot of browser memory
+            and make the interface unresponsive. Ordinarily no requests
+            should timeout so this setting should be set to a value greater
+            than the slowest expected response. This value is in
+            milliseconds but if set to zero then no timeout will be used.
+        "),
+        type        => $types{integer},
+        category    => "lowband",
+    },
+    {
+        name        => "ZM_WEB_P_CAN_STREAM",
+        default     => "auto",
+        description => "Override the automatic detection of browser streaming capability",
+        help        => qqq("
+            If you know that your browser can handle image streams of the
+            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
+            this correctly you can set this option to ensure that the
+            stream is delivered with or without the use of the Cambozola
+            plugin. Selecting 'yes' will tell ZoneMinder that your browser
+            can handle the streams natively, 'no' means that it can't and
+            so the plugin will be used while 'auto' lets ZoneMinder decide.
+        "),
+        type        => $types{tristate},
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_STREAM_METHOD",
+        default     => "jpeg",
+        description => "Which method should be used to send video streams to your browser.",
+        help        => qqq("
+            ZoneMinder can be configured to use either mpeg encoded video
+            or a series or still jpeg images when sending video streams.
+            This option defines which is used. If you choose mpeg you
+            should ensure that you have the appropriate plugins available
+            on your browser whereas choosing jpeg will work natively on
+            Mozilla and related browsers and with a Java applet on Internet
+            Explorer
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mpeg|jpeg",
+            pattern     =>qr|^([mj])|i,
+            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
+        },
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_DEFAULT_SCALE",
+        default     => "100",
+        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'live' or 'event' streams in
+            their native size. However if you have monitors with large
+            dimensions or a slow link you may prefer to reduce this size,
+            alternatively for small monitors you can enlarge it. This
+            options lets you specify what the default scaling factor will
+            be. It is expressed as a percentage so 100 is normal size, 200
+            is double size etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|33|50|75|100|150|200|300|400",
+            pattern     =>qr|^(\d+)$|, format=>q( $1 )
+        },
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_DEFAULT_RATE",
+        default     => "100",
+        description => "What the default replay rate factor applied to 'event' views is (%)",
+        help        => qqq("
+            Normally ZoneMinder will display 'event' streams at their
+            native rate, i.e. as close to real-time as possible. However if
+            you have long events it is often convenient to replay them at a
+            faster rate for review. This option lets you specify what the
+            default replay rate will be. It is expressed as a percentage so
+            100 is normal rate, 200 is double speed etc.
+        "),
+        type        => {
+            db_type     =>"integer",
+            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
+            pattern     =>qr|^(\d+)$|,
+            format      =>q( $1 )
+        },
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_VIDEO_BITRATE",
+        default     => "8000",
+        description => "What the bitrate of the video encoded stream should be set to",
+        help        => qqq("
+            When encoding real video via the ffmpeg library a bit rate can
+            be specified which roughly corresponds to the available
+            bandwidth used for the stream. This setting effectively
+            corresponds to a 'quality' setting for the video. A low value
+            will result in a blocky image whereas a high value will produce
+            a clearer view. Note that this setting does not control the
+            frame rate of the video however the quality of the video
+            produced is affected both by this setting and the frame rate
+            that the video is produced at. A higher frame rate at a
+            particular bit rate result in individual frames being at a
+            lower quality.
+        "),
+        type        => $types{integer},
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_VIDEO_MAXFPS",
+        default     => "5",
+        description => "What the maximum frame rate for streamed video should be",
+        help        => qqq("
+            When using streamed video the main control is the bitrate which
+            determines how much data can be transmitted. However a lower
+            bitrate at high frame rates results in a lower quality image.
+            This option allows you to limit the maximum frame rate to
+            ensure that video quality is maintained. An additional
+            advantage is that encoding video at high frame rates is a
+            processor intensive task when for the most part a very high
+            frame rate offers little perceptible improvement over one that
+            has a more manageable resource requirement. Note, this option
+            is implemented as a cap beyond which binary reduction takes
+            place. So if you have a device capturing at 15fps and set this
+            option to 10fps then the video is not produced at 10fps, but
+            rather at 7.5fps (15 divided by 2) as the final frame rate must
+            be the original divided by a power of 2.
+        "),
+        type        => $types{integer},
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_SCALE_THUMBS",
+        default     => "yes",
+        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
+        help        => qqq("
+            If unset, this option sends the whole image to the browser
+            which resizes it in the window. If set the image is scaled down
+            on the server before sending a reduced size image to the
+            browser to conserve bandwidth at the cost of cpu on the server.
+            Note that ZM can only perform the resizing if the appropriate
+            PHP graphics functionality is installed. This is usually
+            available in the php-gd package.
+        "),
+        type        => $types{boolean},
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_WEB_P_AJAX_TIMEOUT",
+        default     => "10000",
+        description => "How long to wait for Ajax request responses (ms)",
+        help        => qqq("
+            The newer versions of the live feed and event views use Ajax to
+            request information from the server and populate the views
+            dynamically. This option allows you to specify a timeout if
+            required after which requests are abandoned. A timeout may be
+            necessary if requests would overwise hang such as on a slow
+            connection. This would tend to consume a lot of browser memory
+            and make the interface unresponsive. Ordinarily no requests
+            should timeout so this setting should be set to a value greater
+            than the slowest expected response. This value is in
+            milliseconds but if set to zero then no timeout will be used.
+        "),
+        type        => $types{integer},
+        category    => "phoneband",
+    },
+    {
+        name        => "ZM_DYN_LAST_VERSION",
+        default     => "",
+        description => "What the last version of ZoneMinder recorded from zoneminder.com is",
+        help        => "",
+        type        => $types{string},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_CURR_VERSION",
+        default     => "@VERSION@",
+        description => qqq("
+            What the effective current version of ZoneMinder is, might be
+            different from actual if versions ignored
+        "),
+        help        => "",
+        type        => $types{string},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_DB_VERSION",
+        default     => "@VERSION@",
+        description => "What the version of the database is, from zmupdate",
+        help        => "",
+        type        => $types{string},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_LAST_CHECK",
+        default     => "",
+        description => "When the last check for version from zoneminder.com was",
+        help        => "",
+        type        => $types{integer},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_NEXT_REMINDER",
+        default     => "",
+        description => "When the earliest time to remind about versions will be",
+        help        => "",
+        type        => $types{string},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_DONATE_REMINDER_TIME",
+        default     => 0,
+        description => "When the earliest time to remind about donations will be",
+        help        => "",
+        type        => $types{integer},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_DYN_SHOW_DONATE_REMINDER",
+        default     => "yes",
+        description => "Remind about donations or not",
+        help        => "",
+        type        => $types{boolean},
+        readonly    => 1,
+        category    => "dynamic",
+    },
+    {
+        name        => "ZM_EYEZM_DEBUG",
+        default     => "no",
+        description => "Switch additional debugging on for eyeZm Plugin",
+        help        => qqq("
+            Enable or Disable extra debugging from the eyeZm Plugin. Extra
+            debugging information will be displayed in it's own file
+            (EYEZM_LOG_TO_FILE is set), or your Apache error log
+        "),
+        type        => $types{boolean},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_LOG_TO_FILE",
+        default     => "yes",
+        description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
+        help        => qqq("
+            When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output
+            generated from the eyeZm Plugin will go to it's own file.
+            Otherwise it will go to the apache error log.
+        "),
+        type        => $types{boolean},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_LOG_FILE",
+        default     => "@ZM_LOGDIR@/zm_xml.log",
+        description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
+        help        => qqq("
+            This file will contain it's own output from the eyeZm Plugin
+            when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled
+        "),
+        type        => $types{string},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_EVENT_VCODEC",
+        default     => "mpeg4",
+        description => "Default video-codec to use for encoding events",
+        help        => qqq("
+            The eyeZm Plugin calls FFMPEG externally to encode the captured
+            images. If your FFMPEG is not built with support for H264,
+            change this to MPEG-4. If using H264, please check
+            http://www.eyezm.com for H264 requirements and that your eyeZm
+            version supports H264 (v1.2+).
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mpeg4|h264",
+            pattern     =>qr|^([mh])|i,
+            format      =>q( $1 =~ /^m/ ? "mpeg4" : "h264" )
+        },
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_FEED_VCODEC",
+        default     => "mjpeg",
+        description => "Default video-codec to use for streaming the live feed",
+        help        => qqq("
+            Determines whether the live stream is generated using native
+            MJPEG streaming with ZoneMinder, or H264 using FFMPEG and
+            HTML-5 streaming. If using H264, please check
+            http://www.eyezm.com for H264 requirements and that your eyeZm
+            version supports H264 (v1.2+). This is just a default
+            parameter, and can be overridden with eyeZm.
+        "),
+        type        => {
+            db_type     =>"string",
+            hint        =>"mjpeg|h264",
+            pattern     =>qr|^([mh])|i,
+            format      =>q( $1 =~ /^m/ ? "mjpeg" : "h264" )
+        },
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_H264_DEFAULT_BR",
+        default     => "96k",
+        description => "Default bit-rate to use with FFMPEG for H264 streaming",
+        help        => qqq("
+            When using the eyeZm Plugin to stream H264 data, FFMPEG
+            requires a bitrate to control the quality and bandwidth of the
+            video. This should be specified in a format acceptable to
+            FFMPEG. The default value is sufficient for most installations.
+            This is just a default parameter, and can be overridden with
+            eyeZm.
+        "),
+        type        => $types{string},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_H264_DEFAULT_EVBR",
+        default     => "128k",
+        description => "Default bit-rate to use with FFMPEG for H264 event viewing",
+        help        => qqq("
+            When using the eyeZm Plugin to view events in H264, FFMPEG
+            requires a bitrate to control the quality and bandwidth of the
+            video. This should be specified in a format acceptable to
+            FFMPEG. The default value is sufficient for most installations.
+            This is just a default parameter, and can be overridden with
+            eyeZm.
+        "),
+        type        => $types{string},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_H264_TIMEOUT",
+        default     => "20",
+        description => "Timeout (sec) to wait for H264 stream to start before terminating",
+        help        => qqq("
+            The eyeZm Plugin will attempt to spawn an H264 stream when
+            requested, and require that it complete within the timeout
+            specified. If you have a slow system or find through the logs
+            that the H264 stream is not starting because the timeout is
+            expiring, even though FFMPEG is running, try increasing this
+            value. If you have a fast system, decreasing this value can
+            improve the responsiveness when there are issues starting H264
+            streams
+        "),
+        type        => $types{string},
+        category    => "eyeZm",
+    },
+    {
+        name        => "ZM_EYEZM_SEG_DURATION",
+        default     => "3",
+        description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
+        help        => qqq("
+            The HTTP-5 Live Streaming Protocol segments the input video
+            stream into small chunks of a duration specified by this
+            parameter. Increasing the segment duration will help with
+            choppy connections on the other end, but will increase the
+            latency in starting a stream.
+        "),
+        type        => $types{string},
+        category    => "eyeZm",
+    },
 );
 
 our %options_hash = map { ( $_->{name}, $_ ) } @options;
@@ -1968,22 +4001,22 @@ sub initialiseConfig
 {
     return if ( $configInitialised );
 
-	# Do some initial data munging to finish the data structures
-	# Create option ids
-	my $option_id = 0;
-	foreach my $option ( @options )
-	{
-		if ( defined($option->{default}) )
-		{
-			$option->{value} = $option->{default}
-		}
-		else
-		{
-			$option->{value} = '';
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		$option->{id} = $option_id++;
-	}
+    # Do some initial data munging to finish the data structures
+    # Create option ids
+    my $option_id = 0;
+    foreach my $option ( @options )
+    {
+        if ( defined($option->{default}) )
+        {
+            $option->{value} = $option->{default}
+        }
+        else
+        {
+            $option->{value} = '';
+        }
+        #next if ( $option->{category} eq 'hidden' );
+        $option->{id} = $option_id++;
+    }
     $configInitialised = 1;
 }
 
@@ -2004,9 +4037,15 @@ ZoneMinder::ConfigData - ZoneMinder Configuration Data module
 
 =head1 DESCRIPTION
 
-The ZoneMinder:ConfigData module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
+The ZoneMinder:ConfigData module contains the master definition of the
+ZoneMinder configuration options as well as helper methods. This module is
+intended for specialist confguration management and would not normally be
+used by end users.
 
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
+The configuration held in this module, which was previously in zmconfig.pl,
+includes the name, default value, description, help text, type and category
+for each option, as well as a number of additional fields in a small number
+of cases.
 
 =head1 METHODS
 
@@ -2014,11 +4053,19 @@ The configuration held in this module, which was previously in zmconfig.pl, incl
 
 =item loadConfigFromDB ();
 
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
+Loads existing configuration from the database (if any) and merges it with
+the definitions held in this module. This results in the merging of any new
+configuration and the removal of any deprecated configuration while
+preserving the existing values of every else.
 
 =item saveConfigToDB ();
 
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
+Saves configuration held in memory to the database. The act of loading and
+saving configuration is a convenient way to ensure that the configuration
+held in the database corresponds with the most recent definitions and that
+all components are using the same set of configuration.
+
+=back
 
 =head2 EXPORT
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
index 2a646772d..0822dc3d3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the base class definitions for the camera control 
+# This module contains the base class definitions for the camera control
 # protocol implementations
 #
 package ZoneMinder::Control;
@@ -45,17 +45,17 @@ our $AUTOLOAD;
 
 sub new
 {
-	my $class = shift;
-	my $id = shift;
-	my $self = {};
-	$self->{name} = "PelcoD";
+    my $class = shift;
+    my $id = shift;
+    my $self = {};
+    $self->{name} = "PelcoD";
     if ( !defined($id) )
     {
         Fatal( "No monitor defined when invoking protocol ".$self->{name} );
     }
-	$self->{id} = $id;
-	bless( $self, $class );
-	return $self;
+    $self->{id} = $id;
+    bless( $self, $class );
+    return $self;
 }
 
 sub DESTROY
@@ -64,32 +64,32 @@ sub DESTROY
 
 sub AUTOLOAD
 {
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( exists($self->{$name}) )
-	{
-		return( $self->{$name} );
-	}
-	croak( "Can't access $name member of object of class $class" );
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    croak( "Can't access $name member of object of class $class" );
 }
 
-sub getKey()
+sub getKey
 {
-	my $self = shift;
+    my $self = shift;
     return( $self->{id} );
 }
 
 sub open
 {
-	my $self = shift;
+    my $self = shift;
     Fatal( "No open method defined for protocol ".$self->{name} );
 }
 
 sub close
 {
-	my $self = shift;
+    my $self = shift;
     Fatal( "No close method defined for protocol ".$self->{name} );
 }
 
@@ -145,9 +145,9 @@ sub executeCommand
     &{$self->{$command}}( $self, $params );
 }
 
-sub printMsg()
+sub printMsg
 {
-	my $self = shift;
+    my $self = shift;
     Fatal( "No printMsg method defined for protocol ".$self->{name} );
 }
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm
index f825af109..47d783bff 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/3S.pm
@@ -21,10 +21,10 @@
 #
 # This module contains the implementation of the 3S camera control
 # protocol
-#Model:					N5071
-#Hardware Version:		00
-#Firmware Version:		V1.03_STD-1
-#Firmware Build Time:	Jun 19 2012 15:28:17
+#Model:                 N5071
+#Hardware Version:      00
+#Firmware Version:      V1.03_STD-1
+#Firmware Build Time:   Jun 19 2012 15:28:17
 
 package ZoneMinder::Control::3S;
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm
index 7ffbf248a..2e5b21f76 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8608W_Y2k.pm
@@ -53,7 +53,7 @@ our @ISA = qw(ZoneMinder::Control);
 #  of the position of your mouse on the arrow.
 #  Extremity of arrow equal to fastest speed of movement
 #  Close the base of arrow to lowest speed of movement
-#  for diagonaly you can click before the begining of the arrow for low speed
+#  for diagonaly you can click before the beginning of the arrow for low speed
 #  In round center equal to stop to move and switch of latest OSD
 # -You can clic directly on the image that equal to click on arrow (for the left there is a bug in zoneminder speed is inverted)
 # -Zoom Tele switch ON InfraRed LED and stay to manual IR MODE
@@ -63,7 +63,7 @@ our @ISA = qw(ZoneMinder::Control);
 # -8 Preset PTZ are implemented and functionnal
 # -This Script use for login "admin" this hardcoded and your password must setup in "Control Device" section
 # -This script is compatible with the basic authentification method used by mostly new camera based with hi3510 chipset
-# -AutoStop function is active and you must set up value (in sec exemple 0.7) under AutoStop section
+# -AutoStop function is active and you must set up value (in sec example 0.7) under AutoStop section
 #  or you can set up to 0 for disable it (in this case you need to click to the circle center for stop)
 # -"White In" to control Brightness, "auto" for restore the original value of Brightness
 # -"White Out" to control Contrast, "man" for restore the original value of Contrast
@@ -129,7 +129,7 @@ sub printMsg
 }
 
 sub sendCmd
-{ 
+{
     my $self = shift;
     my $cmd = shift;
     my $result = undef;
@@ -211,7 +211,7 @@ sub moveConUp
     if ( $tiltspeed < 10 ) {
              $tiltspeed = 1;
                  }
-    Debug( "Move Up" );   
+    Debug( "Move Up" );
     if ( $osd eq "on" )
    {
          my $cmd = "param.cgi?cmd=setoverlayattr&-region=1&-show=1&-name=Move Up $tiltspeed";
@@ -658,9 +658,9 @@ sub presetGoto
 __END__
 # Below is stub documentation for your module. You'd better edit it!
 
-=head1 FI-8608W
+=head1 NAME
 
-ZoneMinder::Database - Perl extension for FOSCAM FI-8608W by Christophe_Y2k
+ZoneMinder::Control::FI-8608W - Perl extension for FOSCAM FI-8608W by Christophe_Y2k
 
 =head1 SYNOPSIS
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm
index 7d9cd261d..3e2addf85 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8620_Y2k.pm
@@ -57,7 +57,7 @@ our @ISA = qw(ZoneMinder::Control);
 #  of the position of your mouse on the arrow.
 #  Extremity of arrow equal to fastest speed of movement
 #  Close the base of arrow to lowest speed of movement
-#  for diagonaly you can click before the begining of the arrow for low speed
+#  for diagonaly you can click before the beginning of the arrow for low speed
 #  In round center equal to stop to move
 # -You can clic directly on the image that equal to click on arrow (for the left there is a bug in zoneminder speed is inverted)
 # -Zoom Tele/Wide with time control to simulate speed because speed value do not work (buggy firmware or not implemented on this cam)
@@ -67,7 +67,7 @@ our @ISA = qw(ZoneMinder::Control);
 #  You Need to configure ZoneMinder PANSPEED & TILTSEPPED & ZOOMSPEED 1 to 63 by 1 step
 # -This Script use for login "admin" this hardcoded and your password must setup in "Control Device" section
 # -This script is compatible with the basic authentification method used by mostly new camera
-# -AutoStop function is active and you must set up value (in sec exemple 0.5) under AutoStop section
+# -AutoStop function is active and you must set up value (in sec example 0.5) under AutoStop section
 #  or you can set up to 0 for disable it but the camera never stop to move and trust me, she can move all the night...
 #  (you need to click to the center arrow for stop)
 # -"White In" to control Brightness, "auto" for restore the original value of Brightness
@@ -734,9 +734,9 @@ sub presetGoto
 __END__
 # Below is stub documentation for your module. You'd better edit it!
 
-=head1 FI8620
+=head1 NAME
 
-ZoneMinder::Database - Perl extension for FOSCAM FI8620
+ZoneMinder::Control::FI8620 - Perl extension for FOSCAM FI8620
 
 =head1 SYNOPSIS
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm
index ab877c609..dd30484c3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI8908W.pm
@@ -43,176 +43,176 @@ use ZoneMinder::Config qw(:all);
 use Time::HiRes qw( usleep );
 
 sub new
-{ 
-	my $class = shift;
-	my $id = shift;
-	my $self = ZoneMinder::Control->new( $id );
-	bless( $self, $class );
-	srand( time() );
-	return $self;
+{
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    bless( $self, $class );
+    srand( time() );
+    return $self;
 }
 
 our $AUTOLOAD;
 
 sub AUTOLOAD
 {
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( exists($self->{$name}) )
-	{
-		return( $self->{$name} );
-	}
-	Fatal( "Can't access $name member of object of class $class" );
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    Fatal( "Can't access $name member of object of class $class" );
 }
 
 sub open
 {
-	my $self = shift;
+    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 close
 { 
-	my $self = shift;
-	$self->{state} = 'closed';
+    my $self = shift;
+    $self->{state} = 'closed';
 }
 
 sub printMsg
 {
-	my $self = shift;
-	my $msg = shift;
-	my $msg_len = length($msg);
+    my $self = shift;
+    my $msg = shift;
+    my $msg_len = length($msg);
 
-	Debug( $msg."[".$msg_len."]" );
+    Debug( $msg."[".$msg_len."]" );
 }
 
 sub sendCmd
 {
-	my $self = shift;
-	my $cmd = shift;
-	my $result = undef;
+    my $self = shift;
+    my $cmd = shift;
+    my $result = undef;
 
-	my ($user, $password) = split /:/, $self->{Monitor}->{ControlDevice};
+    my ($user, $password) = split /:/, $self->{Monitor}->{ControlDevice};
 
-	if ( !defined $password ) {
-		# If value of "Control device" does not consist of two parts, then only password is given and we fallback to default user:
-		$password = $user;
-		$user = 'admin';
-	}
+    if ( !defined $password ) {
+        # If value of "Control device" does not consist of two parts, then only password is given and we fallback to default user:
+        $password = $user;
+        $user = 'admin';
+    }
 
-	$cmd .= "user=$user&pwd=$password";
+    $cmd .= "user=$user&pwd=$password";
 
-	printMsg( $cmd, "Tx" );
+    printMsg( $cmd, "Tx" );
 
-	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}."/$cmd" );
+    my $res = $self->{ua}->request($req);
 
-	if ( $res->is_success )
-	{
-		$result = !undef;
-	}
-	else
-	{
-		Error( "Error check failed: '".$res->status_line()."' for URL ".$req->uri() );
-	}
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+        Error( "Error check failed: '".$res->status_line()."' for URL ".$req->uri() );
+    }
 
-	return( $result );
+    return( $result );
 }
 
 sub reset
 {
-	my $self = shift;
-	Debug( "Camera Reset" );
-	$self->sendCmd( 'reboot.cgi?' );
+    my $self = shift;
+    Debug( "Camera Reset" );
+    $self->sendCmd( 'reboot.cgi?' );
 }
 
 #Up Arrow
 sub moveConUp
 {
-	my $self = shift;
-	Debug( "Move Up" );
-	$self->sendCmd( 'decoder_control.cgi?command=0&' );
+    my $self = shift;
+    Debug( "Move Up" );
+    $self->sendCmd( 'decoder_control.cgi?command=0&' );
 }
 
 #Down Arrow
 sub moveConDown
 {
-	my $self = shift;
-	Debug( "Move Down" );
-	$self->sendCmd( 'decoder_control.cgi?command=2&' );
+    my $self = shift;
+    Debug( "Move Down" );
+    $self->sendCmd( 'decoder_control.cgi?command=2&' );
 }
 
 #Left Arrow
 sub moveConLeft
 {
-	my $self = shift;
-	Debug( "Move Left" );
-	$self->sendCmd( 'decoder_control.cgi?command=6&' );
+    my $self = shift;
+    Debug( "Move Left" );
+    $self->sendCmd( 'decoder_control.cgi?command=6&' );
 }
 
 #Right Arrow
 sub moveConRight
 {
-	my $self = shift;
-	Debug( "Move Right" );
-	$self->sendCmd( 'decoder_control.cgi?command=4&' );
+    my $self = shift;
+    Debug( "Move Right" );
+    $self->sendCmd( 'decoder_control.cgi?command=4&' );
 }
 
 #Diagonally Up Right Arrow
 sub moveConUpRight
 {
-	my $self = shift;
-	Debug( "Move Diagonally Up Right" );
-	$self->sendCmd( 'decoder_control.cgi?command=90&' );
+    my $self = shift;
+    Debug( "Move Diagonally Up Right" );
+    $self->sendCmd( 'decoder_control.cgi?command=90&' );
 }
 
 #Diagonally Down Right Arrow
 sub moveConDownRight
 {
-	my $self = shift;
-	Debug( "Move Diagonally Down Right" );
-	$self->sendCmd( 'decoder_control.cgi?command=92&' );
+    my $self = shift;
+    Debug( "Move Diagonally Down Right" );
+    $self->sendCmd( 'decoder_control.cgi?command=92&' );
 }
 
 #Diagonally Up Left Arrow
 sub moveConUpLeft
 {
-	my $self = shift;
-	Debug( "Move Diagonally Up Left" );
-	$self->sendCmd( 'decoder_control.cgi?command=91&' );
+    my $self = shift;
+    Debug( "Move Diagonally Up Left" );
+    $self->sendCmd( 'decoder_control.cgi?command=91&' );
 }
 
 #Diagonally Down Left Arrow
 sub moveConDownLeft
 {
-	my $self = shift;
-	Debug( "Move Diagonally Down Left" );
-	$self->sendCmd( 'decoder_control.cgi?command=93&' );
+    my $self = shift;
+    Debug( "Move Diagonally Down Left" );
+    $self->sendCmd( 'decoder_control.cgi?command=93&' );
 }
 
 #Stop
 sub moveStop
 {
-	my $self = shift;
-	Debug( "Move Stop" );
-	$self->sendCmd( 'decoder_control.cgi?command=1&' );
+    my $self = shift;
+    Debug( "Move Stop" );
+    $self->sendCmd( 'decoder_control.cgi?command=1&' );
 }
 
 #Move Camera to Home Position
 sub presetHome
 {
-	my $self = shift;
-	Debug( "Home Preset" );
-	$self->sendCmd( 'decoder_control.cgi?command=25&' );
+    my $self = shift;
+    Debug( "Home Preset" );
+    $self->sendCmd( 'decoder_control.cgi?command=25&' );
 }
 
 1;
@@ -220,12 +220,17 @@ sub presetHome
 __END__
 =pod
 
+=head1 NAME
+
+ZoneMinder::Control::FI8908W - Foscam FI8908W camera control
+
 =head1 DESCRIPTION
 
-This module contains the implementation of the Foscam FI8908W / FI8918W IP camera control
-protocol.
+This module contains the implementation of the Foscam FI8908W / FI8918W IP
+camera control protocol.
+
+The module uses "Control Device" value to retrieve user and password. User
+and password should be separated by colon, e.g. user:password. If colon is
+not provided, then "admin" is used as a fallback value for the user.
 
-The module uses "Control Device" value to retrieve user and password. User and password should
-be separated by colon, e.g. user:password. If colon is not provided, then "admin" is used
-as a fallback value for the user.
 =cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm
index 4177f5857..dd73a04e6 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FI9821W_Y2k.pm
@@ -102,7 +102,6 @@ sub close
 
 sub printMsg
 {
-    my $self = shift;
     my $msg = shift;
     my $msg_len = length($msg);
     Debug( $msg."[".$msg_len."]" );
@@ -113,9 +112,28 @@ sub sendCmd
     my $self = shift;
     my $cmd = shift;
     my $result = undef;
+
+	my ($user, $password) = split /:/, $self->{Monitor}->{ControlDevice};
+	if ( ! $password ) {
+		$password = $user;
+		$user = 'admin';
+	}
+	$user = 'admin' if ! $user;
+	$password = 'pwd' if ! $password;
+
+	$cmd .= "&usr=$user&pwd=$password";
+
     printMsg( $cmd, "Tx" );
-    my $temps = time();
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/cgi-bin/CGIProxy.fcgi?usr%3Dadmin%26pwd%3D".$self->{Monitor}->{ControlDevice}."%26cmd%3D".$cmd."%26".$temps );
+    my $url;
+    if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
+        $url = $self->{Monitor}->{ControlAddress};
+    } else {
+        $url = "http://".$self->{Monitor}->{ControlAddress};
+    }
+	$url .= "/cgi-bin/CGIProxy.fcgi?cmd=$cmd%26".time;
+    printMsg( $url, "Tx" );
+
+    my $req = HTTP::Request->new( GET=>$url );
     my $res = $self->{ua}->request($req);
     if ( $res->is_success )
     {
@@ -134,7 +152,7 @@ sub reset
    # Setup OSD
    my $cmd = "setOSDSetting%26isEnableTimeStamp%3D0%26isEnableDevName%3D1%26dispPos%3D0%26isEnabledOSDMask%3D0";
    $self->sendCmd( $cmd );
-   # Setup For Stream=0 Resolution=720p Bandwith=4M FPS=30 KeyFrameInterval/GOP=100 VBR=ON
+   # Setup For Stream=0 Resolution=720p Bandwidth=4M FPS=30 KeyFrameInterval/GOP=100 VBR=ON
    $cmd = "setVideoStreamParam%26streamType%3D0%26resolution%3D0%26bitRate%3D4194304%26frameRate%3D30%26GOP%3D100%26isVBR%3D1";
    $self->sendCmd( $cmd );
    # Setup For Infrared AUTO
@@ -696,9 +714,9 @@ sub presetGoto
 __END__
 # Below is stub documentation for your module. You'd better edit it!
 
-=head1 FI9821W
+=head1 NAME
 
-ZoneMinder::Database - Perl extension for FOSCAM FI9821W
+ZoneMinder::Control::FI9821W - Perl extension for FOSCAM FI9821W
 
 =head1 SYNOPSIS
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm
index 584e04dd1..10bbea5de 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/M8640.pm
@@ -107,14 +107,18 @@ sub sendCmd {
     printMsg( $cmd, "Tx" );
     #print( "http://$address/$cmd\n" );
     #my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-	
-	my $url;
-	if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
-		$url = $self->{Monitor}->{ControlAddress}.'/cgi-bin/setGPIO.cgi?preventCache='.time;
-	} else {
-		$url = 'http://'.$self->{Monitor}->{ControlAddress}.'/cgi-bin/setGPIO.cgi?preventCache='.time;
-	} # en dif
-	Error("Url: $url  $cmd");
+
+    my $url;
+    if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
+        $url = $self->{Monitor}->{ControlAddress}
+            .'/cgi-bin/setGPIO.cgi?preventCache='.time
+        ;
+    } else {
+        $url = 'http://'.$self->{Monitor}->{ControlAddress}
+            .'/cgi-bin/setGPIO.cgi?preventCache='.time
+        ;
+    } # en dif
+    Error("Url: $url  $cmd");
     my $uri     = URI::Encode->new( { encode_reserved => 0 } );
     my $encoded = $uri->encode( $cmd );
     my $res = $self->{ua}->post( $url, Content=>"data=$encoded" );
@@ -203,7 +207,11 @@ sub moveMap
     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};
+    my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth="
+              .$self->{Monitor}->{Width}
+              ."&imageheight="
+              .$self->{Monitor}->{Height}
+    ;
     $self->sendCmd( $cmd );
 }
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
index c9d9d907d..c8fafe023 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PelcoP.pm
@@ -22,7 +22,7 @@
 # This module contains the implementation of the Pelco-P camera control
 # protocol
 #
-package ZoneMinder::Control::PelcoD;
+package ZoneMinder::Control::PelcoP;
 
 use 5.006;
 use strict;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm
index 7f5058dec..050e2bb75 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm
@@ -60,16 +60,16 @@ our @ISA = qw(ZoneMinder::Control);
 
 #
 #  ********  YOU MUST CHANGE THE FOLLOWING LINES TO MATCH YOUR CAMERA!  **********
-#  
+#
 #  I assume that "TV-IP672WI" would work for the TV-IP672WI, but can't test since I don't own one.
-#  
+#
 #  TV-IP672PI works for the PI version, of course.
 #
 #  Finally, the username is the username you'd like to authenticate as.
 #
 our $REALM = 'TV-IP862IC';
 our $USERNAME = 'admin';
-our	$PASSWORD = '';
+our $PASSWORD = '';
 our $ADDRESS = '';
 
 # ==========================================================================
@@ -111,26 +111,32 @@ sub open
     my $self = shift;
     $self->loadMonitor();
 
-	my ( $protocol, $username, $password, $address ) = $self->{Monitor}->{ControlAddress} =~ /^(https?:\/\/)?([^:]+):([^\/@]+)@(.*)$/;
-	if ( $username ) {
-		$USERNAME = $username;
-		$PASSWORD = $password;
-		$ADDRESS = $address;
-	} else {
-		Error( "Failed to parse auth from address");
-		$ADDRESS = $self->{Monitor}->{ControlAddress};
-	}
-	if ( ! $ADDRESS =~ /:/ ) {
-		Error( "You generally need to also specify the port.  I will append :80" );
-		$ADDRESS .= ':80';
-	}
+    my ( $protocol, $username, $password, $address )
+       = $self->{Monitor}->{ControlAddress} =~ /^(https?:\/\/)?([^:]+):([^\/@]+)@(.*)$/;
+    if ( $username ) {
+        $USERNAME = $username;
+        $PASSWORD = $password;
+        $ADDRESS = $address;
+    } else {
+        Error( "Failed to parse auth from address");
+        $ADDRESS = $self->{Monitor}->{ControlAddress};
+    }
+    if ( ! $ADDRESS =~ /:/ ) {
+        Error( "You generally need to also specify the port.  I will append :80" );
+        $ADDRESS .= ':80';
+    }
 
     use LWP::UserAgent;
     $self->{ua} = LWP::UserAgent->new;
     $self->{ua}->agent( "ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION );
     $self->{state} = 'open';
-#	credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
-    Debug ( "sendCmd credentials control address:'".$ADDRESS."'  realm:'" . $REALM . "'  username:'" . $USERNAME . "'  password:'".$PASSWORD."'"); 
+#   credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
+    Debug ( "sendCmd credentials control address:'".$ADDRESS
+            ."'  realm:'" . $REALM
+            . "'  username:'" . $USERNAME
+            . "'  password:'".$PASSWORD
+            ."'"
+    ); 
     $self->{ua}->credentials($ADDRESS,$REALM,$USERNAME,$PASSWORD);
 }
 
@@ -159,29 +165,29 @@ sub sendCmd
 
     my $result = undef;
 
-	my $url = "http://".$ADDRESS."/cgi/ptdc.cgi?command=".$cmd;
+    my $url = "http://".$ADDRESS."/cgi/ptdc.cgi?command=".$cmd;
     my $req = HTTP::Request->new( GET=>$url );
 
     Debug ("sendCmd command: " . $url );
-    
+
     my $res = $self->{ua}->request($req);
 
     if ( $res->is_success ) {
         $result = !undef;
     } else {
-		if ( $res->status_line() eq '401 Unauthorized' ) {
-			Error( "Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
-			Error("Content was " . $res->content() );
-			my $res = $self->{ua}->request($req);
-			if ( $res->is_success ) {
-				$result = !undef;
-			} else {
-				Error("Content was " . $res->content() );
-			}
-		} 
-		if ( ! $result ) {
-			Error( "Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
-		}
+        if ( $res->status_line() eq '401 Unauthorized' ) {
+            Error( "Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
+            Error("Content was " . $res->content() );
+            my $res = $self->{ua}->request($req);
+            if ( $res->is_success ) {
+                $result = !undef;
+            } else {
+                Error("Content was " . $res->content() );
+            }
+        }
+        if ( ! $result ) {
+            Error( "Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
+        }
     }
 
     return( $result );
@@ -203,10 +209,10 @@ sub sendCmdPost
     my $result = undef;
 
     if ($url eq undef)
-	{
-		Error ("url passed to sendCmdPost is undefined.");
-		return(-1);
-	}
+    {
+        Error ("url passed to sendCmdPost is undefined.");
+        return(-1);
+    }
 
     Debug ("sendCmdPost url: " . $url . " cmd: " . $cmd);
 
@@ -215,7 +221,7 @@ sub sendCmdPost
     $req->content($cmd);
 
     Debug ( "sendCmdPost credentials control address:'".$ADDRESS."'  realm:'" . $REALM . "'  username:'" . $USERNAME . "' password:'".$PASSWORD."'");
-    
+
     my $res = $self->{ua}->request($req);
 
     if ( $res->is_success )
@@ -225,11 +231,11 @@ sub sendCmdPost
     else
     {
         Error( "sendCmdPost Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
-		if ( $res->status_line() eq '401 Unauthorized' ) {
-			Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
-		} else {
-			Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
-		} # endif
+        if ( $res->status_line() eq '401 Unauthorized' ) {
+            Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
+        } else {
+            Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
+        } # endif
     }
 
     return( $result );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm
index b2ed3e2b5..f419aacfc 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Wanscam.pm
@@ -16,8 +16,8 @@
 #   Rename to Wanscam
 #   Pan Left/Right switched
 #   IR On/Off switched
-#   Brightness Increase/Decrease in 16 steps 
-#   
+#   Brightness Increase/Decrease in 16 steps
+#
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm
index 255dac056..18a73cae8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm
@@ -126,32 +126,32 @@ sub sendCmd
 sub Up
 {
    my $self = shift;
-   $self->moveConUp();	
+   $self->moveConUp();
 }
 
 sub Down
 {
    my $self = shift;
-   $self->moveConDown();	
+   $self->moveConDown();
 }
 
 sub Left
 {
    my $self = shift;
-   $self->moveConLeft();	
+   $self->moveConLeft();
 }
 
 sub Right
 {
    my $self = shift;
-   $self->moveConRight();	
+   $self->moveConRight();
 }
 
 
 sub reset
 {
    my $self = shift;
-   $self->cameraReset();	
+   $self->cameraReset();
 }
 
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
index 09ef59c8e..76b161582 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
@@ -36,7 +36,7 @@ our %CamParams = ();
 # ==========================================================================
 #
 # ONVIF Control Protocol
-# 
+#
 # On ControlAddress use the format :
 #   USERNAME:PASSWORD@ADDRESS:PORT
 #   eg : admin:@10.1.2.1:80
@@ -50,7 +50,7 @@ use ZoneMinder::Config qw(:all);
 use Time::HiRes qw( usleep );
 
 sub new
-{ 
+{
 
     my $class = shift;
     my $id = shift;
@@ -90,7 +90,7 @@ sub open
 }
 
 sub close
-{ 
+{
     my $self = shift;
     $self->{state} = 'closed';
 }
@@ -133,7 +133,7 @@ sub getCamParams
     my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/get_camera_params.cgi" );
     my $res = $self->{ua}->request($req);
 
-    if ( $res->is_success ) 
+    if ( $res->is_success )
     {
         # Parse results setting values in %FCParams
         my $content = $res->decoded_content;
@@ -141,7 +141,7 @@ sub getCamParams
         while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
             $CamParams{$1} = $2;
         }
-    } 
+    }
     else
     {
         Error( "Error check failed:'".$res->status_line()."'" );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 29b3c8b2a..7dfe0654b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Database;
@@ -37,17 +37,17 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
     'functions' => [ qw(
-		zmDbConnect
-		zmDbDisconnect
-		zmDbGetMonitors
-		zmDbGetMonitor
-		zmDbGetMonitorAndControl
-	) ]
+        zmDbConnect
+        zmDbDisconnect
+        zmDbGetMonitors
+        zmDbGetMonitor
+        zmDbGetMonitorAndControl
+    ) ]
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -70,37 +70,46 @@ use Carp;
 
 our $dbh = undef;
 
-sub zmDbConnect( ;$ )
+sub zmDbConnect
 {
-	my $force = shift;
-	if ( $force )
-	{
-		 zmDbDisconnect();
-	}
-	if ( !defined( $dbh ) )
-	{
+    my $force = shift;
+    if ( $force )
+    {
+         zmDbDisconnect();
+    }
+    if ( !defined( $dbh ) )
+    {
         my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
 
         if ( defined($port) )
         {
-		    $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$host.";port=".$port, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
+            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                .";host=".$host
+                                .";port=".$port
+                                , $Config{ZM_DB_USER}
+                                , $Config{ZM_DB_PASS}
+            );
         }
         else
         {
-		    $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$Config{ZM_DB_HOST}, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
+            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                .";host=".$Config{ZM_DB_HOST}
+                                , $Config{ZM_DB_USER}
+                                , $Config{ZM_DB_PASS}
+            );
         }
         $dbh->trace( 0 );
-	}
-	return( $dbh );
+    }
+    return( $dbh );
 }
 
-sub zmDbDisconnect()
+sub zmDbDisconnect
 {
-	if ( defined( $dbh ) )
-	{
-		$dbh->disconnect();
-		$dbh = undef;
-	}
+    if ( defined( $dbh ) )
+    {
+        $dbh->disconnect();
+        $dbh = undef;
+    }
 }
 
 use constant DB_MON_ALL => 0; # All monitors
@@ -110,78 +119,88 @@ use constant DB_MON_MOTION => 3; # All monitors that are doing motion detection
 use constant DB_MON_RECORD => 4; # All monitors that are doing unconditional recording
 use constant DB_MON_PASSIVE => 5; # All monitors that are in nodect state
 
-sub zmDbGetMonitors( ;$ )
+sub zmDbGetMonitors
 {
-	zmDbConnect();
+    zmDbConnect();
 
-	my $function = shift || DB_MON_ALL;
-	my $sql = "select * from Monitors";
+    my $function = shift || DB_MON_ALL;
+    my $sql = "select * from Monitors";
 
-	if ( $function )
-	{
-		if ( $function == DB_MON_CAPT )
-		{
-			$sql .= " where Function >= 'Monitor'";
-		}
-		elsif ( $function == DB_MON_ACTIVE )
-		{
-			$sql .= " where Function > 'Monitor'";
-		}
-		elsif ( $function == DB_MON_MOTION )
-		{
-			$sql .= " where Function = 'Modect' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_RECORD )
-		{
-			$sql .= " where Function = 'Record' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_PASSIVE )
-		{
-			$sql .= " where Function = 'Nodect'";
-		}
-	}
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute '$sql': ".$sth->errstr() );
+    if ( $function )
+    {
+        if ( $function == DB_MON_CAPT )
+        {
+            $sql .= " where Function >= 'Monitor'";
+        }
+        elsif ( $function == DB_MON_ACTIVE )
+        {
+            $sql .= " where Function > 'Monitor'";
+        }
+        elsif ( $function == DB_MON_MOTION )
+        {
+            $sql .= " where Function = 'Modect' or Function = 'Mocord'";
+        }
+        elsif ( $function == DB_MON_RECORD )
+        {
+            $sql .= " where Function = 'Record' or Function = 'Mocord'";
+        }
+        elsif ( $function == DB_MON_PASSIVE )
+        {
+            $sql .= " where Function = 'Nodect'";
+        }
+    }
+    my $sth = $dbh->prepare_cached( $sql )
+        or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute()
+        or croak( "Can't execute '$sql': ".$sth->errstr() );
 
-	my @monitors;
+    my @monitors;
     while( my $monitor = $sth->fetchrow_hashref() )
     {
-		push( @monitors, $monitor );
-	}
-	$sth->finish();
-	return( \@monitors );
+        push( @monitors, $monitor );
+    }
+    $sth->finish();
+    return( \@monitors );
 }
 
-sub zmDbGetMonitor( $ )
+sub zmDbGetMonitor
 {
-	zmDbConnect();
+    zmDbConnect();
 
-	my $id = shift;
+    my $id = shift;
 
-	return( undef ) if ( !defined($id) );
+    return( undef ) if ( !defined($id) );
 
-	my $sql = "select * from Monitors where Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or croak( "Can't execute '$sql': ".$sth->errstr() );
+    my $sql = "select * from Monitors where Id = ?";
+    my $sth = $dbh->prepare_cached( $sql )
+        or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $id )
+        or croak( "Can't execute '$sql': ".$sth->errstr() );
     my $monitor = $sth->fetchrow_hashref();
 
-	return( $monitor );
+    return( $monitor );
 }
 
-sub zmDbGetMonitorAndControl( $ )
+sub zmDbGetMonitorAndControl
 {
-	zmDbConnect();
+    zmDbConnect();
 
-	my $id = shift;
+    my $id = shift;
 
-	return( undef ) if ( !defined($id) );
+    return( undef ) if ( !defined($id) );
 
-    my $sql = "select C.*,M.*,C.Protocol from Monitors as M inner join Controls as C on (M.ControlId = C.Id) where M.Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    my $sql = "SELECT C.*,M.*,C.Protocol
+               FROM Monitors as M
+               INNER JOIN Controls as C on (M.ControlId = C.Id)
+               WHERE M.Id = ?"
+    ;
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $id )
+        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
     my $monitor = $sth->fetchrow_hashref();
 
-	return( $monitor );
+    return( $monitor );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index 4d60852a7..195bd265f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::General;
@@ -76,7 +76,7 @@ use ZoneMinder::Database qw(:all);
 use POSIX;
 
 # For running general shell commands
-sub executeShellCommand( $ )
+sub executeShellCommand
 {
     my $command = shift;
     my $output = qx( $command );
@@ -90,7 +90,7 @@ sub executeShellCommand( $ )
     return( $status );
 }
 
-sub getCmdFormat()
+sub getCmdFormat
 {
     Debug( "Testing valid shell syntax\n" );
 
@@ -162,7 +162,7 @@ our $testedShellSyntax = 0;
 our ( $cmdPrefix, $cmdSuffix );
 
 # For running ZM daemons etc
-sub runCommand( $ )
+sub runCommand
 {
     if ( !$testedShellSyntax )
     {
@@ -196,30 +196,45 @@ sub runCommand( $ )
     return( $output );
 }
 
-sub getEventPath( $ )
+sub getEventPath
 {
     my $event = shift;
 
     my $event_path = "";
     if ( $Config{ZM_USE_DEEP_STORAGE} )
     {
-        $event_path = $Config{ZM_DIR_EVENTS}.'/'.$event->{MonitorId}.'/'.strftime( "%y/%m/%d/%H/%M/%S", localtime($event->{Time}) );
+        $event_path = $Config{ZM_DIR_EVENTS}
+                      .'/'.$event->{MonitorId}
+                      .'/'.strftime( "%y/%m/%d/%H/%M/%S",
+                                     localtime($event->{Time})
+                                   )
+        ;
     }
     else
     {
-        $event_path = $Config{ZM_DIR_EVENTS}.'/'.$event->{MonitorId}.'/'.$event->{Id};
+        $event_path = $Config{ZM_DIR_EVENTS}
+                      .'/'.$event->{MonitorId}
+                      .'/'.$event->{Id}
+        ;
+    }
+
+    if ( index($Config{ZM_DIR_EVENTS},'/') != 0 ){
+        $event_path = $Config{ZM_PATH_WEB}
+                      .'/'.$event_path
+        ;
     }
-    $event_path = $Config{ZM_PATH_WEB}.'/'.$event_path if ( index($Config{ZM_DIR_EVENTS},'/') != 0 );
     return( $event_path );
 }
 
-sub createEventPath( $ )
+sub createEventPath
 {
     #
     # WARNING assumes running from events directory
     #
     my $event = shift;
-    my $eventRootPath = ($Config{ZM_DIR_EVENTS}=~m|/|)?$Config{ZM_DIR_EVENTS}:($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS});
+    my $eventRootPath = ($Config{ZM_DIR_EVENTS}=~m|/|)
+                       ? $Config{ZM_DIR_EVENTS}
+                       : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS});
     my $eventPath = $eventRootPath.'/'.$event->{MonitorId};
 
     if ( $Config{ZM_USE_DEEP_STORAGE} )
@@ -242,7 +257,8 @@ sub createEventPath( $ )
 
         # Create event id symlink
         my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        symlink( $timePath, $idFile ) or Fatal( "Can't symlink $idFile -> $eventPath: $!" );
+        symlink( $timePath, $idFile )
+            or Fatal( "Can't symlink $idFile -> $eventPath: $!" );
 
         makePath( $timePath, $eventPath );
         $eventPath .= '/'.$timePath;
@@ -250,8 +266,9 @@ sub createEventPath( $ )
 
         # Create empty id tag file
         $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
+        open( my $ID_FP, ">", $idFile )
+            or Fatal( "Can't open $idFile: $!" );
+        close( $ID_FP );
         setFileOwner( $idFile );
     }
     else
@@ -260,8 +277,9 @@ sub createEventPath( $ )
         $eventPath .= '/'.$event->{Id};
 
         my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
+        open( my $ID_FP, ">", $idFile )
+            or Fatal( "Can't open $idFile: $!" );
+        close( $ID_FP );
         setFileOwner( $idFile );
     }
     return( $eventPath );
@@ -272,15 +290,20 @@ use Data::Dumper;
 our $_setFileOwner = undef;
 our ( $_ownerUid, $_ownerGid );
 
-sub _checkProcessOwner()
+sub _checkProcessOwner
 {
     if ( !defined($_setFileOwner) )
     {
         my ( $processOwner ) = getpwuid( $> );
         if ( $processOwner ne $Config{ZM_WEB_USER} )
         {
-            # Not running as web user, so should be root in whch case chown the temporary directory
-            ( my $ownerName, my $ownerPass, $_ownerUid, $_ownerGid ) = getpwnam( $Config{ZM_WEB_USER} ) or Fatal( "Can't get user details for web user '".$Config{ZM_WEB_USER}."': $!" );
+            # Not running as web user, so should be root in which case chown
+            # the temporary directory
+            ( my $ownerName, my $ownerPass, $_ownerUid, $_ownerGid )
+                = getpwnam( $Config{ZM_WEB_USER} )
+                or Fatal( "Can't get user details for web user '"
+                          .$Config{ZM_WEB_USER}."': $!"
+                   );
             $_setFileOwner = 1;
         }
         else
@@ -291,19 +314,22 @@ sub _checkProcessOwner()
     return( $_setFileOwner );
 }
 
-sub setFileOwner( $ )
+sub setFileOwner
 {
     my $file = shift;
 
     if ( _checkProcessOwner() )
     {
-        chown( $_ownerUid, $_ownerGid, $file ) or Fatal( "Can't change ownership of file '$file' to '".$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!" );
+        chown( $_ownerUid, $_ownerGid, $file )
+            or Fatal( "Can't change ownership of file '$file' to '"
+                      .$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!"
+                    );
     }
 }
 
 our $_hasImageInfo = undef;
 
-sub _checkForImageInfo()
+sub _checkForImageInfo
 {
     if ( !defined($_hasImageInfo) )
     {
@@ -317,7 +343,7 @@ sub _checkForImageInfo()
     return( $_hasImageInfo );
 }
 
-sub createEvent( $;$ )
+sub createEvent
 {
     my $event = shift;
 
@@ -335,9 +361,14 @@ sub createEvent( $;$ )
     elsif ( $event->{MonitorId} )
     {
         my $sql = "select * from Monitors where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{MonitorId} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-        $event->{monitor} = $sth->fetchrow_hashref() or Fatal( "Unable to create event, can't load monitor with id '".$event->{MonitorId}."'" );
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{MonitorId} )
+            or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
+        $event->{monitor} = $sth->fetchrow_hashref()
+            or Fatal( "Unable to create event, can't load monitor with id '"
+                      .$event->{MonitorId}."'"
+                    );
         $sth->finish();
     }
     else
@@ -358,7 +389,9 @@ sub createEvent( $;$ )
                 my $imageInfo = Image::Info::image_info( $frame->{imagePath} );
                 if ( $imageInfo->{error} )
                 {
-                    Error( "Unable to extract image info from '".$frame->{imagePath}."': ".$imageInfo->{error} );
+                    Error( "Unable to extract image info from '"
+                           .$frame->{imagePath}."': ".$imageInfo->{error}
+                    );
                 }
                 else
                 {
@@ -394,18 +427,25 @@ sub createEvent( $;$ )
         push( @values, $event->{$field} );
     }
 
-    my $sql = "insert into Events (".join(',',@fields).") values (".join(',',@formats).")";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
+    my $sql = "INSERT INTO Events (".join(',',@fields)
+             .") VALUES (".join(',',@formats).")"
+    ;
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( @values )
+        or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
     $event->{Id} = $dbh->{mysql_insertid};
     Info( "Created event ".$event->{Id} );
 
     if ( $event->{EndTime} )
     {
-        $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
+        $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id}
+            if ( $event->{Name} eq 'New Event' );
         my $sql = "update Events set Name = ? where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Name}, $event->{Id} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{Name}, $event->{Id} )
+            or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
     }
 
     my $eventPath = createEventPath( $event );
@@ -428,26 +468,46 @@ sub createEvent( $;$ )
             push( @values, $frame->{$field} );
         }
 
-        my $sql = "insert into Frames (".join(',',@fields).") values (".join(',',@formats).")";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
+        my $sql = "insert into Frames (".join(',',@fields)
+                 .") values (".join(',',@formats).")"
+        ;
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( @values )
+            or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
         #$frame->{FrameId} = $dbh->{mysql_insertid};
         if ( $frame->{imagePath} )
         {
-            $frame->{capturePath} = sprintf( "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg", $eventPath, $frame->{FrameId} );
-            rename( $frame->{imagePath}, $frame->{capturePath} ) or Fatal( "Can't copy ".$frame->{imagePath}." to ".$frame->{capturePath}.": $!" );
+            $frame->{capturePath} = sprintf(
+                "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}
+                ."d-capture.jpg"
+                , $eventPath
+                , $frame->{FrameId}
+            );
+            rename( $frame->{imagePath}, $frame->{capturePath} )
+                or Fatal( "Can't copy ".$frame->{imagePath}
+                         ." to ".$frame->{capturePath}.": $!"
+                        );
             setFileOwner( $frame->{capturePath} );
             if ( 0 && $Config{ZM_CREATE_ANALYSIS_IMAGES} )
             {
-                $frame->{analysePath} = sprintf( "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-analyse.jpg", $eventPath, $frame->{FrameId} );
-                link( $frame->{capturePath}, $frame->{analysePath} ) or Fatal( "Can't link ".$frame->{capturePath}." to ".$frame->{analysePath}.": $!" );
+                $frame->{analysePath} = sprintf(
+                    "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}
+                    ."d-analyse.jpg"
+                    , $eventPath
+                    , $frame->{FrameId}
+                );
+                link( $frame->{capturePath}, $frame->{analysePath} )
+                    or Fatal( "Can't link ".$frame->{capturePath}
+                             ." to ".$frame->{analysePath}.": $!"
+                            );
                 setFileOwner( $frame->{analysePath} );
             }
         }
     }
 }
 
-sub addEventImage( $$ )
+sub addEventImage
 {
     my $event = shift;
     my $frame = shift;
@@ -455,7 +515,7 @@ sub addEventImage( $$ )
     # TBD
 }
 
-sub updateEvent( $ )
+sub updateEvent
 {
     my $event = shift;
 
@@ -467,7 +527,8 @@ sub updateEvent( $ )
 
     my $dbh = zmDbConnect();
 
-    $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
+    $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id}
+        if ( $event->{Name} eq 'New Event' );
 
     my %formats = (
         StartTime => 'from_unixtime(?)',
@@ -484,11 +545,13 @@ sub updateEvent( $ )
     my $sql = "update Events set ".join(',',@sets)." where Id = ?";
     push( @values, $event->{Id} );
 
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( @values )
+        or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
 }
 
-sub deleteEventFiles( $;$ )
+sub deleteEventFiles
 {
     #
     # WARNING assumes running from events directory
@@ -541,7 +604,7 @@ sub deleteEventFiles( $;$ )
     }
 }
 
-sub makePath( $;$ )
+sub makePath
 {
     my $path = shift;
     my $root = shift;
@@ -585,7 +648,7 @@ sub _testJSON
     $hasJSONAny = 1 if ( $result );
 }
 
-sub _getJSONType( $ )
+sub _getJSONType
 {
     my $value = shift;
     return( 'null' ) unless( defined($value) );
@@ -596,9 +659,9 @@ sub _getJSONType( $ )
     return( 'string' );
 }
 
-sub jsonEncode( $ );
+sub jsonEncode;
 
-sub jsonEncode( $ )
+sub jsonEncode
 {
     my $value = shift;
 
@@ -649,7 +712,7 @@ sub jsonEncode( $ )
     }
 }
 
-sub jsonDecode( $ )
+sub jsonDecode
 {
     my $value = shift;
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 5b4438c72..a6a82db87 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the debug definitions and functions used by the rest 
+# This module contains the debug definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Logger;
@@ -126,6 +126,7 @@ our %priorities = (
 );
 
 our $logger;
+our $LOGFILE;
 
 sub new
 {
@@ -257,7 +258,12 @@ sub initialise( @ )
     {
         foreach my $target ( split( /\|/, $Config{ZM_LOG_DEBUG_TARGET} ) )
         {
-            if ( $target eq $this->{id} || $target eq "_".$this->{id} || $target eq $this->{idRoot} || $target eq "_".$this->{idRoot} || $target eq "" )
+            if ( $target eq $this->{id}
+                 || $target eq "_".$this->{id}
+                 || $target eq $this->{idRoot}
+                 || $target eq "_".$this->{idRoot}
+                 || $target eq ""
+            )
             {
                 if ( $Config{ZM_LOG_DEBUG_LEVEL} > NOLOG )
                 {
@@ -286,11 +292,18 @@ sub initialise( @ )
     $this->{autoFlush} = $ENV{'LOG_FLUSH'}?1:0 if ( defined($ENV{'LOG_FLUSH'}) );
 
     $this->{initialised} = !undef;
-    
-    Debug( "LogOpts: level=".$codes{$this->{level}}."/".$codes{$this->{effectiveLevel}}.", screen=".$codes{$this->{termLevel}}.", database=".$codes{$this->{databaseLevel}}.", logfile=".$codes{$this->{fileLevel}}."->".$this->{logFile}.", syslog=".$codes{$this->{syslogLevel}} );
+
+    Debug( "LogOpts: level=".$codes{$this->{level}}
+            ."/".$codes{$this->{effectiveLevel}}
+            .", screen=".$codes{$this->{termLevel}}
+            .", database=".$codes{$this->{databaseLevel}}
+            .", logfile=".$codes{$this->{fileLevel}}
+            ."->".$this->{logFile}
+            .", syslog=".$codes{$this->{syslogLevel}}
+    );
 }
 
-sub terminate()
+sub terminate
 {
     my $this = shift;
     return unless ( $this->{initialised} );
@@ -300,7 +313,7 @@ sub terminate()
     $this->termLevel( NOLOG );
 }
 
-sub reinitialise()
+sub reinitialise
 {
     my $this = shift;
 
@@ -322,7 +335,7 @@ sub reinitialise()
     $this->databaseLevel( $databaseLevel ) if ( $databaseLevel > NOLOG );
 }
 
-sub limit( $ )
+sub limit
 {
     my $this = shift;
     my $level = shift;
@@ -331,7 +344,7 @@ sub limit( $ )
     return( $level );
 }
 
-sub getTargettedEnv( $ )
+sub getTargettedEnv
 {
     my $this = shift;
     my $name = shift;
@@ -354,7 +367,7 @@ sub getTargettedEnv( $ )
     return( $value );
 }
 
-sub fetch()
+sub fetch
 {
     if ( !$logger )
     {
@@ -364,7 +377,7 @@ sub fetch()
     return( $logger );
 }
 
-sub id( ;$ )
+sub id
 {
     my $this = shift;
     my $id = shift;
@@ -388,7 +401,7 @@ sub id( ;$ )
     return( $this->{id} );
 }
 
-sub level( ;$ )
+sub level
 {
     my $this = shift;
     my $level = shift;
@@ -405,20 +418,20 @@ sub level( ;$ )
     return( $this->{level} );
 }
 
-sub debugOn()
+sub debugOn
 {
     my $this = shift;
     return( $this->{effectiveLevel} >= DEBUG );
 }
 
-sub trace( ;$ )
+sub trace
 {
     my $this = shift;
     $this->{trace} = $_[0] if ( @_ );
     return( $this->{trace} );
 }
 
-sub termLevel( ;$ )
+sub termLevel
 {
     my $this = shift;
     my $termLevel = shift;
@@ -434,7 +447,7 @@ sub termLevel( ;$ )
     return( $this->{termLevel} );
 }
 
-sub databaseLevel( ;$ )
+sub databaseLevel
 {
     my $this = shift;
     my $databaseLevel = shift;
@@ -451,23 +464,39 @@ sub databaseLevel( ;$ )
 
                     if ( defined($port) )
                     {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$host.";port=".$port, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
+                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                                    .";host=".$host
+                                                    .";port=".$port
+                                                    , $Config{ZM_DB_USER}
+                                                    , $Config{ZM_DB_PASS}
+                        );
                     }
                     else
                     {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}.";host=".$Config{ZM_DB_HOST}, $Config{ZM_DB_USER}, $Config{ZM_DB_PASS} );
+                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                                    .";host=".$Config{ZM_DB_HOST}
+                                                    , $Config{ZM_DB_USER}
+                                                    , $Config{ZM_DB_PASS}
+                        );
                     }
                     if ( !$this->{dbh} )
                     {
                         $databaseLevel = NOLOG;
-                        Error( "Unable to write log entries to DB, can't connect to database '".$Config{ZM_DB_NAME}."' on host '".$Config{ZM_DB_HOST}."'" );
+                        Error( "Unable to write log entries to DB, can't connect to database '"
+                               .$Config{ZM_DB_NAME}
+                               ."' on host '"
+                               .$Config{ZM_DB_HOST}
+                               ."'"
+                        );
                     }
                     else
                     {
                         $this->{dbh}->{AutoCommit} = 1;
-                        Fatal( "Can't set AutoCommit on in database connection" ) unless( $this->{dbh}->{AutoCommit} );
+                        Fatal( "Can't set AutoCommit on in database connection" )
+                            unless( $this->{dbh}->{AutoCommit} );
                         $this->{dbh}->{mysql_auto_reconnect} = 1;
-                        Fatal( "Can't set mysql_auto_reconnect on in database connection" ) unless( $this->{dbh}->{mysql_auto_reconnect} );
+                        Fatal( "Can't set mysql_auto_reconnect on in database connection" )
+                            unless( $this->{dbh}->{mysql_auto_reconnect} );
                         $this->{dbh}->trace( 0 );
                     }
                 }
@@ -486,7 +515,7 @@ sub databaseLevel( ;$ )
     return( $this->{databaseLevel} );
 }
 
-sub fileLevel( ;$ )
+sub fileLevel
 {
     my $this = shift;
     my $fileLevel = shift;
@@ -503,7 +532,7 @@ sub fileLevel( ;$ )
     return( $this->{fileLevel} );
 }
 
-sub syslogLevel( ;$ )
+sub syslogLevel
 {
     my $this = shift;
     my $syslogLevel = shift;
@@ -520,19 +549,19 @@ sub syslogLevel( ;$ )
     return( $this->{syslogLevel} );
 }
 
-sub openSyslog()
+sub openSyslog
 {
     my $this = shift;
     openlog( $this->{id}, "pid", "local1" );
 }
 
-sub closeSyslog()
+sub closeSyslog
 {
     my $this = shift;
     #closelog();
 }
 
-sub logFile( $ )
+sub logFile
 {
     my $this = shift;
     my $logFile = shift;
@@ -546,18 +575,21 @@ sub logFile( $ )
     }
 }
 
-sub openFile()
+sub openFile
 {
     my $this = shift;
-    if ( open( LOGFILE, ">>".$this->{logFile} ) )
+    if ( open( $LOGFILE, ">>", $this->{logFile} ) )
     {
-        LOGFILE->autoflush() if ( $this->{autoFlush} );
+        $LOGFILE->autoflush() if ( $this->{autoFlush} );
 
         my $webUid = (getpwnam( $Config{ZM_WEB_USER} ))[2];
         my $webGid = (getgrnam( $Config{ZM_WEB_GROUP} ))[2];
         if ( $> == 0 )
         {
-            chown( $webUid, $webGid, $this->{logFile} ) or Fatal( "Can't change permissions on log file '".$this->{logFile}."': $!" )
+            chown( $webUid, $webGid, $this->{logFile} )
+                or Fatal( "Can't change permissions on log file '"
+                          .$this->{logFile}."': $!"
+                        )
         }
     }
     else
@@ -567,13 +599,13 @@ sub openFile()
     }
 }
 
-sub closeFile()
+sub closeFile
 {
     my $this = shift;
-    close( LOGFILE ) if ( fileno(LOGFILE) );
+    close( $LOGFILE ) if ( fileno($LOGFILE) );
 }
 
-sub logPrint( $;$ )
+sub logPrint
 {
     my $this = shift;
     my $level = shift;
@@ -586,7 +618,17 @@ sub logPrint( $;$ )
         my $code = $codes{$level};
 
         my ($seconds, $microseconds) = gettimeofday();
-        my $message = sprintf( "%s.%06d %s[%d].%s [%s]", strftime( "%x %H:%M:%S", localtime( $seconds ) ), $microseconds, $this->{id}, $$, $code, $string );
+        my $message = sprintf(
+            "%s.%06d %s[%d].%s [%s]"
+            , strftime( "%x %H:%M:%S"
+                        ,localtime( $seconds )
+                      )
+            , $microseconds
+            , $this->{id}
+            , $$
+            , $code
+            , $string
+        );
         if ( $this->{trace} )
         {
             $message = Carp::shortmess( $message );
@@ -595,8 +637,9 @@ sub logPrint( $;$ )
         {
             $message = $message."\n";
         }
-        syslog( $priorities{$level}, $code." [%s]", $string ) if ( $level <= $this->{syslogLevel} );
-        print( LOGFILE $message ) if ( $level <= $this->{fileLevel} );
+        syslog( $priorities{$level}, $code." [%s]", $string )
+            if ( $level <= $this->{syslogLevel} );
+        print( $LOGFILE $message ) if ( $level <= $this->{fileLevel} );
         if ( $level <= $this->{databaseLevel} )
         {
             my $sql = "insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, NULL )";
@@ -606,7 +649,14 @@ sub logPrint( $;$ )
                 $this->{databaseLevel} = NOLOG;
                 Fatal( "Can't prepare log entry '$sql': ".$this->{dbh}->errstr() );
             }
-            my $res = $this->{sth}->execute( $seconds+($microseconds/1000000.0), $this->{id}, $$, $level, $code, $string, $this->{fileName} );
+            my $res = $this->{sth}->execute( $seconds+($microseconds/1000000.0)
+                                            , $this->{id}
+                                            , $$
+                                            , $level
+                                            , $code
+                                            , $string
+                                            , $this->{fileName}
+            );
             if ( !$res )
             {
                 $this->{databaseLevel} = NOLOG;
@@ -624,7 +674,7 @@ sub logInit( ;@ )
     $logger->initialise( %options );
 }
 
-sub logReinit()
+sub logReinit
 {
     fetch()->reinitialise();
 }
@@ -636,7 +686,7 @@ sub logTerm
     $logger = undef;
 }
 
-sub logHupHandler()
+sub logHupHandler
 {
     my $savedErrno = $!;
     return unless( $logger );
@@ -645,47 +695,47 @@ sub logHupHandler()
     $! = $savedErrno;
 }
 
-sub logSetSignal()
+sub logSetSignal
 {
     $SIG{HUP} = \&logHupHandler;
 }
 
-sub logClearSignal()
+sub logClearSignal
 {
     $SIG{HUP} = 'DEFAULT';
 }
 
-sub logLevel( ;$ )
+sub logLevel
 {
     return( fetch()->level( @_ ) );
 }
 
-sub logDebugging()
+sub logDebugging
 {
     return( fetch()->debugOn() );
 }
 
-sub logTermLevel( ;$ )
+sub logTermLevel
 {
     return( fetch()->termLevel( @_ ) );
 }
 
-sub logDatabaseLevel( ;$ )
+sub logDatabaseLevel
 {
     return( fetch()->databaseLevel( @_ ) );
 }
 
-sub logFileLevel( ;$ )
+sub logFileLevel
 {
     return( fetch()->fileLevel( @_ ) );
 }
 
-sub logSyslogLevel( ;$ )
+sub logSyslogLevel
 {
     return( fetch()->syslogLevel( @_ ) );
 }
 
-sub Mark( ;$$ )
+sub Mark
 {
     my $level = shift;
     $level = DEBUG unless( defined($level) );
@@ -693,7 +743,7 @@ sub Mark( ;$$ )
     fetch()->logPrint( $level, $tag );
 }
 
-sub Dump( \$;$ )
+sub Dump
 {
     my $var = shift;
     my $label = shift;
@@ -756,11 +806,19 @@ ZoneMinder::Logger - ZoneMinder Logger module
 
 =head1 DESCRIPTION
 
-The ZoneMinder:Logger module contains the common debug and error reporting routines used by the ZoneMinder scripts.
+The ZoneMinder:Logger module contains the common debug and error reporting
+routines used by the ZoneMinder scripts.
 
-To use debug in your scripts you need to include this module, and call logInit. Thereafter you can sprinkle Debug or Error calls etc throughout the code safe in the knowledge that they will be reported to your error log, and possibly the syslogger, in a meaningful and consistent format.
+To use debug in your scripts you need to include this module, and call
+logInit. Thereafter you can sprinkle Debug or Error calls etc throughout
+the code safe in the knowledge that they will be reported to your error
+log, and possibly the syslogger, in a meaningful and consistent format.
 
-Debug is discussed in terms of levels where 1 and above (currently only 1 for scripts) is considered debug, 0 is considered as informational, -1 is a warning, -2 is an error and -3 is a fatal error or panic. Where levels are mentioned below as thresholds the value given and anything with a lower level (ie. more serious) will be included.
+Debug is discussed in terms of levels where 1 and above (currently only 1
+for scripts) is considered debug, 0 is considered as informational, -1 is a
+warning, -2 is an error and -3 is a fatal error or panic. Where levels are
+mentioned below as thresholds the value given and anything with a lower
+level (ie. more serious) will be included.
 
 =head1 METHODS
 
@@ -768,7 +826,12 @@ Debug is discussed in terms of levels where 1 and above (currently only 1 for sc
 
 =item logInit ( $id, %options );
 
-Initialises the debug and prepares the logging for forthcoming operations. If not called explicitly it will be called by the first debug call in your script, but with default (and probably meaningless) options. The only compulsory arguments are $id which must be a string that will identify debug coming from this script in mixed logs. Other options may be provided as below,
+Initialises the debug and prepares the logging for forthcoming operations.
+If not called explicitly it will be called by the first debug call in your
+script, but with default (and probably meaningless) options. The only
+compulsory arguments are $id which must be a string that will identify
+debug coming from this script in mixed logs. Other options may be provided
+as below,
 
  Option        Default        Description
  ---------     ---------      -----------
@@ -805,27 +868,41 @@ These methods can be used to get and set the current settings as defined in logI
 
 =item Debug( $string );
 
-This method will output a debug message if the current debug level permits it, otherwise does nothing. This message will be tagged with the DBG string in the logs.
+This method will output a debug message if the current debug level permits
+it, otherwise does nothing. This message will be tagged with the DBG string
+in the logs.
 
 =item Info( $string );
 
-This method will output an informational message if the current debug level permits it, otherwise does nothing. This message will be tagged with the INF string in the logs.
+This method will output an informational message if the current debug level
+permits it, otherwise does nothing. This message will be tagged with the
+INF string in the logs.
 
 =item Warning( $string );
 
-This method will output a warning message if the current debug level permits it, otherwise does nothing. This message will be tagged with the WAR string in the logs.
+This method will output a warning message if the current debug level
+permits it, otherwise does nothing. This message will be tagged with the
+WAR string in the logs.
 
 =item Error( $string );
 
-This method will output an error message if the current debug level permits it, otherwise does nothing. This message will be tagged with the ERR string in the logs.
+This method will output an error message if the current debug level permits
+it, otherwise does nothing. This message will be tagged with the ERR string
+in the logs.
 
 =item Fatal( $string );
 
-This method will output a fatal error message and then die if the current debug level permits it, otherwise does nothing. This message will be tagged with the FAT string in the logs.
+This method will output a fatal error message and then die if the current
+debug level permits it, otherwise does nothing. This message will be tagged
+with the FAT string in the logs.
 
 =item Panic( $string );
 
-This method will output a panic error message and then die with a stack trace if the current debug level permits it, otherwise does nothing. This message will be tagged with the PNC string in the logs.
+This method will output a panic error message and then die with a stack
+trace if the current debug level permits it, otherwise does nothing. This
+message will be tagged with the PNC string in the logs.
+
+=back
 
 =head2 EXPORT
 
@@ -841,7 +918,8 @@ The :all tag will export all above symbols.
 Carp
 Sys::Syslog
 
-The ZoneMinder README file Troubleshooting section for an extended discussion on the use and configuration of syslog with ZoneMinder.
+The ZoneMinder README file Troubleshooting section for an extended
+discussion on the use and configuration of syslog with ZoneMinder.
 
 http://www.zoneminder.com
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index 844074911..8e7b9228e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Memory;
@@ -37,48 +37,48 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		STATE_IDLE
-		STATE_PREALARM
-		STATE_ALARM
-		STATE_ALERT
-		STATE_TAPE
-		ACTION_GET
-		ACTION_SET
-		ACTION_RELOAD
-		ACTION_SUSPEND
-		ACTION_RESUME
-		TRIGGER_CANCEL
-		TRIGGER_ON
-		TRIGGER_OFF 
-	) ],
-	'functions' => [ qw(
-		zmMemVerify
-		zmMemInvalidate
-		zmMemRead
-		zmMemWrite
-		zmMemTidy
-		zmGetMonitorState
-		zmGetAlarmLocation
-		zmIsAlarmed
-		zmInAlarm
-		zmHasAlarmed
-		zmGetLastEvent
-		zmGetLastWriteTime
-		zmGetLastReadTime
-		zmMonitorEnable
-		zmMonitorDisable
-		zmMonitorSuspend
-		zmMonitorResume
-		zmTriggerEventOn
-		zmTriggerEventOff
-		zmTriggerEventCancel
-		zmTriggerShowtext
-	) ],
+    'constants' => [ qw(
+        STATE_IDLE
+        STATE_PREALARM
+        STATE_ALARM
+        STATE_ALERT
+        STATE_TAPE
+        ACTION_GET
+        ACTION_SET
+        ACTION_RELOAD
+        ACTION_SUSPEND
+        ACTION_RESUME
+        TRIGGER_CANCEL
+        TRIGGER_ON
+        TRIGGER_OFF
+    ) ],
+    'functions' => [ qw(
+        zmMemVerify
+        zmMemInvalidate
+        zmMemRead
+        zmMemWrite
+        zmMemTidy
+        zmGetMonitorState
+        zmGetAlarmLocation
+        zmIsAlarmed
+        zmInAlarm
+        zmHasAlarmed
+        zmGetLastEvent
+        zmGetLastWriteTime
+        zmGetLastReadTime
+        zmMonitorEnable
+        zmMonitorDisable
+        zmMonitorSuspend
+        zmMonitorResume
+        zmTriggerEventOn
+        zmTriggerEventOff
+        zmTriggerEventCancel
+        zmTriggerShowtext
+    ) ],
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -144,48 +144,42 @@ our $mem_seq = 0;
 
 our $mem_data =
 {
-	"shared_data" => { "type"=>"SharedData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_write_index" => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_read_index"  => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"state"            => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_event"       => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"action"           => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"brightness"       => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"hue"              => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"colour"           => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"contrast"         => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_x"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_y"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"valid"            => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"active"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"signal"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"format"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"imagesize"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding1"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding2"        => { "type"=>"uint32", "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++ },
-		}
-	},
-	"trigger_data" => { "type"=>"TriggerData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_state"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_score"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"padding"          => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_cause"    => { "type"=>"int8[32]", "seq"=>$mem_seq++ },
-		"trigger_text"     => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		"trigger_showtext" => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		}
-	},
-    "video_store_data" => { "type"=>"VideoStoreData", "seq"=>$mem_seq++, "contents"=> {
+    "shared_data" => { "type"=>"SharedData", "seq"=>$mem_seq++, "contents"=> {
         "size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"event_directory"  => { "type"=>"int8[4096]", "seq"=>$mem_seq++ },
-		"recording"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-        	}
-	},
-	"end" => { "seq"=>$mem_seq++, "size"=> 0 }
+        "last_write_index" => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "last_read_index"  => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "state"            => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "last_event"       => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "action"           => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "brightness"       => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "hue"              => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "colour"           => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "contrast"         => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "alarm_x"          => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "alarm_y"          => { "type"=>"int32", "seq"=>$mem_seq++ },
+        "valid"            => { "type"=>"uint8", "seq"=>$mem_seq++ },
+        "active"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
+        "signal"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
+        "format"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
+        "imagesize"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "epadding1"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "epadding2"        => { "type"=>"uint32", "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++ },
+        }
+    },
+    "trigger_data" => { "type"=>"TriggerData", "seq"=>$mem_seq++, "contents"=> {
+        "size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "trigger_state"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "trigger_score"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "padding"          => { "type"=>"uint32", "seq"=>$mem_seq++ },
+        "trigger_cause"    => { "type"=>"int8[32]", "seq"=>$mem_seq++ },
+        "trigger_text"     => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
+        "trigger_showtext" => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
+        }
+    },
+    "end" => { "seq"=>$mem_seq++, "size"=> 0 }
 };
 
 our $mem_size = 0;
@@ -193,222 +187,248 @@ our $mem_verified = {};
 
 sub zmMemInit
 {
-	my $offset = 0;
+    my $offset = 0;
 
-	foreach my $section_data ( sort { $a->{seq} <=> $b->{seq} } values( %$mem_data ) )
-	{
-		$section_data->{offset} = $offset;
-		$section_data->{align} = 0;
+    foreach my $section_data ( sort { $a->{seq} <=> $b->{seq} } values( %$mem_data ) )
+    {
+        $section_data->{offset} = $offset;
+        $section_data->{align} = 0;
 
-		if ( $section_data->{align} > 1 )
-		{
-			my $rem = $offset % $section_data->{align};
-			if ( $rem > 0 )
-			{
-				$offset += ($section_data->{align} - $rem);
-			}
-		}
-		foreach my $member_data ( sort { $a->{seq} <=> $b->{seq} } values( %{$section_data->{contents}} ) )
-		{
-			if ( $member_data->{type} eq "long" || $member_data->{type} eq "ulong" || $member_data->{type} eq "size_t")
-			{
-				$member_data->{size} = $member_data->{align} = $native;
-			}
-			elsif( $member_data->{type} eq "int64" || $member_data->{type} eq "uint64" || $member_data->{type} eq "time_t64")
-			{
-				$member_data->{size} = $member_data->{align} = 8;
-			}
-			elsif ( $member_data->{type} eq "int32" || $member_data->{type} eq "uint32" || $member_data->{type} eq "bool4" )
-			{
-				$member_data->{size} = $member_data->{align} = 4;
-			}
-			elsif ($member_data->{type} eq "int16" || $member_data->{type} eq "uint16")
-			{
-				$member_data->{size} = $member_data->{align} = 2;
-			}
-			elsif ( $member_data->{type} eq "int8" || $member_data->{type} eq "uint8" || $member_data->{type} eq "bool1" )
-			{
-				$member_data->{size} = $member_data->{align} = 1;
-			}
-			elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ )
-			{
-				$member_data->{size} = $1;
-				$member_data->{align} = 1;
-			}
-			else
-			{
-				Fatal( "Unexpected type '".$member_data->{type}."' found in shared data definition." );
-			}
+        if ( $section_data->{align} > 1 )
+        {
+            my $rem = $offset % $section_data->{align};
+            if ( $rem > 0 )
+            {
+                $offset += ($section_data->{align} - $rem);
+            }
+        }
+        foreach my $member_data ( sort { $a->{seq} <=> $b->{seq} } values( %{$section_data->{contents}} ) )
+        {
+            if ( $member_data->{type} eq "long"
+                 || $member_data->{type} eq "ulong"
+                 || $member_data->{type} eq "size_t"
+            )
+            {
+                $member_data->{size} = $member_data->{align} = $native;
+            }
+            elsif( $member_data->{type} eq "int64"
+                   || $member_data->{type} eq "uint64"
+                   || $member_data->{type} eq "time_t64"
+            )
+            {
+                $member_data->{size} = $member_data->{align} = 8;
+            }
+            elsif ( $member_data->{type} eq "int32"
+                    || $member_data->{type} eq "uint32"
+                    || $member_data->{type} eq "bool4"
+            )
+            {
+                $member_data->{size} = $member_data->{align} = 4;
+            }
+            elsif ($member_data->{type} eq "int16"
+                   || $member_data->{type} eq "uint16"
+            )
+            {
+                $member_data->{size} = $member_data->{align} = 2;
+            }
+            elsif ( $member_data->{type} eq "int8"
+                    || $member_data->{type} eq "uint8"
+                    || $member_data->{type} eq "bool1"
+            )
+            {
+                $member_data->{size} = $member_data->{align} = 1;
+            }
+            elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ )
+            {
+                $member_data->{size} = $1;
+                $member_data->{align} = 1;
+            }
+            else
+            {
+                Fatal( "Unexpected type '".$member_data->{type}
+                      ."' found in shared data definition."
+                );
+            }
 
-			if ( $member_data->{align} > 1 && ($offset%$member_data->{align}) > 0 )
-			{
-				$offset += ($member_data->{align} - ($offset%$member_data->{align}));
-			}
-			$member_data->{offset} = $offset;
-			$offset += $member_data->{size}
-		}
-		$section_data->{size} = $offset - $section_data->{offset};
-	}
+            if ( $member_data->{align} > 1 && ($offset%$member_data->{align}) > 0 )
+            {
+                $offset += ($member_data->{align} - ($offset%$member_data->{align}));
+            }
+            $member_data->{offset} = $offset;
+            $offset += $member_data->{size}
+        }
+        $section_data->{size} = $offset - $section_data->{offset};
+    }
 
-	$mem_size = $offset;
+    $mem_size = $offset;
 }
 
 &zmMemInit();
 
-sub zmMemVerify( $ )
+sub zmMemVerify
 {
-	my $monitor = shift;
-	if ( !zmMemAttach( $monitor, $mem_size ) )
-	{
-		return( undef );
-	}
+    my $monitor = shift;
+    if ( !zmMemAttach( $monitor, $mem_size ) )
+    {
+        return( undef );
+    }
 
     my $mem_key = zmMemKey( $monitor );
-	if ( !defined($mem_verified->{$mem_key}) )
-	{
-		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 ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			return( undef );
-		}
-		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 ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			return( undef );
-		}
-        	my $vs_size = zmMemRead( $monitor, "video_store_data:size", 1 );
-		if ( $vs_size != $mem_data->{video_store_data}->{size} )
-		{
-			if ( $vs_size )
-			{
-				Error( "Shared data size conflict in video_store_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{video_store_data}->{size}.", got ".$vs_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in video_store_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{video_store_data}->{size}.", got ".$vs_size );
-			}
-			return( undef );
-		}
-		$mem_verified->{$mem_key} = !undef;
-	}
-	return( !undef );
+    if ( !defined($mem_verified->{$mem_key}) )
+    {
+        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 "
+                       .$monitor->{Name}
+                       .", expected "
+                       .$mem_data->{shared_data}->{size}
+                       .", got "
+                       .$sd_size
+                );
+            }
+            else
+            {
+                Debug( "Shared data size conflict in shared_data for monitor "
+                       .$monitor->{Name}
+                       .", expected "
+                       .$mem_data->{shared_data}->{size}
+                       .", got ".$sd_size
+                );
+            }
+            return( undef );
+        }
+        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 "
+                      .$monitor->{Name}
+                      .", expected "
+                      .$mem_data->{triggger_data}->{size}
+                      .", got "
+                      .$td_size
+                );
+            }
+            else
+            {
+                Debug( "Shared data size conflict in trigger_data for monitor "
+                      .$monitor->{Name}
+                      .", expected "
+                      .$mem_data->{triggger_data}->{size}
+                      .", got "
+                      .$td_size
+                );
+            }
+            return( undef );
+        }
+        $mem_verified->{$mem_key} = !undef;
+    }
+    return( !undef );
 }
 
-sub zmMemRead( $$;$ )
+sub zmMemRead
 {
-	my $monitor = shift;
-	my $fields = shift;
-	my $nocheck = shift;
+    my $monitor = shift;
+    my $fields = shift;
+    my $nocheck = shift;
 
-	if ( !($nocheck || zmMemVerify( $monitor )) )
-	{
-		return( undef );
-	}
+    if ( !($nocheck || zmMemVerify( $monitor )) )
+    {
+        return( undef );
+    }
 
-	if ( !ref($fields) )
-	{
-		$fields = [ $fields ];
-	}
-	my @values;
-	foreach my $field ( @$fields )
-	{
-		my ( $section, $element ) = split( /[\/:.]/, $field );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
+    if ( !ref($fields) )
+    {
+        $fields = [ $fields ];
+    }
+    my @values;
+    foreach my $field ( @$fields )
+    {
+        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};
+        my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
+        my $type = $mem_data->{$section}->{contents}->{$element}->{type};
+        my $size = $mem_data->{$section}->{contents}->{$element}->{size};
 
-		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 );
         }
-		my $value;
-		if ( $type eq "long" )
-		{
-			( $value ) = unpack( "l!", $data );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			( $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 );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			( $value ) = unpack( "L!", $data );
-		}
-		elsif ( $type eq "int32" )
-		{
-			( $value ) = unpack( "l", $data );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			( $value ) = unpack( "L", $data );
-		}
-		elsif ( $type eq "int16" )
-		{
-			( $value ) = unpack( "s", $data );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			( $value ) = unpack( "S", $data );
-		}
-		elsif ( $type eq "int8" )
-		{
-			( $value ) = unpack( "c", $data );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			( $value ) = unpack( "C", $data );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "Z".$size, $data );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "C".$size, $data );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
-		push( @values, $value );
-	}
-	if ( wantarray() )
-	{
-		return( @values )
-	}
-	return( $values[0] );
+        my $value;
+        if ( $type eq "long" )
+        {
+            ( $value ) = unpack( "l!", $data );
+        }
+        elsif ( $type eq "ulong" || $type eq "size_t" )
+        {
+            ( $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 );
+        }
+        elsif ( $type eq "uint64" )
+        {
+            # The "q" type is only available on 64bit platforms, so use native.
+            ( $value ) = unpack( "L!", $data );
+        }
+        elsif ( $type eq "int32" )
+        {
+            ( $value ) = unpack( "l", $data );
+        }
+        elsif ( $type eq "uint32" || $type eq "bool4" )
+        {
+            ( $value ) = unpack( "L", $data );
+        }
+        elsif ( $type eq "int16" )
+        {
+            ( $value ) = unpack( "s", $data );
+        }
+        elsif ( $type eq "uint16" )
+        {
+            ( $value ) = unpack( "S", $data );
+        }
+        elsif ( $type eq "int8" )
+        {
+            ( $value ) = unpack( "c", $data );
+        }
+        elsif ( $type eq "uint8" || $type eq "bool1" )
+        {
+            ( $value ) = unpack( "C", $data );
+        }
+        elsif ( $type =~ /^int8\[\d+\]$/ )
+        {
+            ( $value ) = unpack( "Z".$size, $data );
+        } 
+        elsif ( $type =~ /^uint8\[\d+\]$/ )
+        {
+            ( $value ) = unpack( "C".$size, $data );
+        } 
+        else
+        {
+            Fatal( "Unexpected type '".$type."' found for '".$field."'" );
+        }
+        push( @values, $value );
+    }
+    if ( wantarray() )
+    {
+        return( @values )
+    }
+    return( $values[0] );
 }
 
-sub zmMemInvalidate( $ )
+sub zmMemInvalidate
 {
-	my $monitor = shift;
+    my $monitor = shift;
     my $mem_key = zmMemKey($monitor);
     if ( $mem_key )
     {
@@ -417,307 +437,313 @@ sub zmMemInvalidate( $ )
     }
 }
 
-sub zmMemTidy()
+sub zmMemTidy
 {
     zmMemClean();
 }
 
-sub zmMemWrite( $$;$ )
+sub zmMemWrite
 {
-	my $monitor = shift;
-	my $field_values = shift;
-	my $nocheck = shift;
+    my $monitor = shift;
+    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 );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
+    while ( my ( $field, $value ) = each( %$field_values ) )
+    {
+        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};
+        my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
+        my $type = $mem_data->{$section}->{contents}->{$element}->{type};
+        my $size = $mem_data->{$section}->{contents}->{$element}->{size};
 
-		my $data;
-		if ( $type eq "long" )
-		{
-			$data = pack( "l!", $value );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			$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 );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			$data = pack( "L!", $value );
-		}
-		elsif ( $type eq "int32" )
-		{
-			$data = pack( "l", $value );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			$data = pack( "L", $value );
-		}
-		elsif ( $type eq "int16" )
-		{
-			$data = pack( "s", $value );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			$data = pack( "S", $value );
-		}
-		elsif ( $type eq "int8" )
-		{
-			$data = pack( "c", $value );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			$data = pack( "C", $value );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			$data = pack( "Z".$size, $value );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			$data = pack( "C".$size, $value );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
+        my $data;
+        if ( $type eq "long" )
+        {
+            $data = pack( "l!", $value );
+        }
+        elsif ( $type eq "ulong" || $type eq "size_t" )
+        {
+            $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 );
+        }
+        elsif ( $type eq "uint64" )
+        {
+            # The "q" type is only available on 64bit platforms, so use native.
+            $data = pack( "L!", $value );
+        }
+        elsif ( $type eq "int32" )
+        {
+            $data = pack( "l", $value );
+        }
+        elsif ( $type eq "uint32" || $type eq "bool4" )
+        {
+            $data = pack( "L", $value );
+        }
+        elsif ( $type eq "int16" )
+        {
+            $data = pack( "s", $value );
+        }
+        elsif ( $type eq "uint16" )
+        {
+            $data = pack( "S", $value );
+        }
+        elsif ( $type eq "int8" )
+        {
+            $data = pack( "c", $value );
+        }
+        elsif ( $type eq "uint8" || $type eq "bool1" )
+        {
+            $data = pack( "C", $value );
+        }
+        elsif ( $type =~ /^int8\[\d+\]$/ )
+        {
+            $data = pack( "Z".$size, $value );
+        } 
+        elsif ( $type =~ /^uint8\[\d+\]$/ )
+        {
+            $data = pack( "C".$size, $value );
+        } 
+        else
+        {
+            Fatal( "Unexpected type '".$type."' found for '".$field."'" );
+        }
 
         if ( !zmMemPut( $monitor, $offset, $size, $data ) )
         {
-            Error( "Unable to write '$value' to '$field' in memory for monitor ".$monitor->{Id} );
+            Error( "Unable to write '$value' to '$field' in memory for monitor "
+                  .$monitor->{Id}
+            );
             zmMemInvalidate( $monitor );
             return( undef );
         }
-	}
-	return( !undef );
+    }
+    return( !undef );
 }
 
-sub zmGetMonitorState( $ )
+sub zmGetMonitorState
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:state" ) );
+    return( zmMemRead( $monitor, "shared_data:state" ) );
 }
 
-sub zmGetAlarmLocation( $ )
+sub zmGetAlarmLocation
 {
-	my $monitor = shift;
+    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( $$ )
+sub zmSetControlState
 {
-	my $monitor = shift;
-	my $control_state = shift;
+    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( $ )
+sub zmGetControlState
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:control_state" ) );
+    return( zmMemRead( $monitor, "shared_data:control_state" ) );
 }
 
-sub zmSaveControlState( $$ )
+sub zmSaveControlState
 {
-	my $monitor = shift;
-	my $control_state = shift;
+    my $monitor = shift;
+    my $control_state = shift;
 
-	zmSetControlState( $monitor, freeze( $control_state ) );
+    zmSetControlState( $monitor, freeze( $control_state ) );
 }
 
-sub zmRestoreControlState( $ )
+sub zmRestoreControlState
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( thaw( zmGetControlState( $monitor ) ) );
+    return( thaw( zmGetControlState( $monitor ) ) );
 }
 
-sub zmIsAlarmed( $ )
+sub zmIsAlarmed
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $state = zmGetMonitorState( $monitor );
+    my $state = zmGetMonitorState( $monitor );
 
-	return( $state == STATE_ALARM );
+    return( $state == STATE_ALARM );
 }
 
-sub zmInAlarm( $ )
+sub zmInAlarm
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $state = zmGetMonitorState( $monitor );
+    my $state = zmGetMonitorState( $monitor );
 
-	return( $state == STATE_ALARM || $state == STATE_ALERT );
+    return( $state == STATE_ALARM || $state == STATE_ALERT );
 }
 
-sub zmHasAlarmed( $$ )
+sub zmHasAlarmed
 {
-	my $monitor = shift;
-	my $last_event_id = shift;
+    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 );
-	}
-	elsif( $last_event != $last_event_id )
-	{
-		return( $last_event );
-	}
-	return( undef );
+    if ( $state == STATE_ALARM || $state == STATE_ALERT )
+    {
+        return( $last_event );
+    }
+    elsif( $last_event != $last_event_id )
+    {
+        return( $last_event );
+    }
+    return( undef );
 }
 
-sub zmGetLastEvent( $ )
+sub zmGetLastEvent
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:last_event" ) );
+    return( zmMemRead( $monitor, "shared_data:last_event" ) );
 }
 
-sub zmGetLastWriteTime( $ )
+sub zmGetLastWriteTime
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:last_write_time" ) );
+    return( zmMemRead( $monitor, "shared_data:last_write_time" ) );
 }
 
-sub zmGetLastReadTime( $ )
+sub zmGetLastReadTime
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:last_read_time" ) );
+    return( zmMemRead( $monitor, "shared_data:last_read_time" ) );
 }
 
-sub zmGetMonitorActions( $ )
+sub zmGetMonitorActions
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "shared_data:action" ) );
+    return( zmMemRead( $monitor, "shared_data:action" ) );
 }
 
-sub zmMonitorEnable( $ )
+sub zmMonitorEnable
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
+    my $action = zmMemRead( $monitor, "shared_data:action" );
+    $action |= ACTION_SUSPEND;
+    zmMemWrite( $monitor, { "shared_data:action" => $action } );
 }
 
-sub zmMonitorDisable( $ )
+sub zmMonitorDisable
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
+    my $action = zmMemRead( $monitor, "shared_data:action" );
+    $action |= ACTION_RESUME;
+    zmMemWrite( $monitor, { "shared_data:action" => $action } );
 }
 
-sub zmMonitorSuspend( $ )
+sub zmMonitorSuspend
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
+    my $action = zmMemRead( $monitor, "shared_data:action" );
+    $action |= ACTION_SUSPEND;
+    zmMemWrite( $monitor, { "shared_data:action" => $action } );
 }
 
-sub zmMonitorResume( $ )
+sub zmMonitorResume
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
+    my $action = zmMemRead( $monitor, "shared_data:action" );
+    $action |= ACTION_RESUME;
+    zmMemWrite( $monitor, { "shared_data:action" => $action } );
 }
 
-sub zmGetTriggerState( $ )
+sub zmGetTriggerState
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	return( zmMemRead( $monitor, "trigger_data:trigger_state" ) );
+    return( zmMemRead( $monitor, "trigger_data:trigger_state" ) );
 }
 
-sub zmTriggerEventOn( $$$;$$ )
+sub zmTriggerEventOn
 {
-	my $monitor = shift;
-	my $score = shift;
-	my $cause = shift;
-	my $text = shift;
-	my $showtext = shift;
+    my $monitor = shift;
+    my $score = shift;
+    my $cause = shift;
+    my $text = shift;
+    my $showtext = shift;
 
-	my $values = {
-		"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_state"} = TRIGGER_ON; # Write state last so event not read incomplete
+    my $values = {
+        "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_state"} = TRIGGER_ON; # Write state last so event not read incomplete
 
-	zmMemWrite( $monitor, $values );
+    zmMemWrite( $monitor, $values );
 }
 
-sub zmTriggerEventOff( $ )
+sub zmTriggerEventOff
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_OFF,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
+    my $values = {
+        "trigger_data:trigger_state"    => TRIGGER_OFF,
+        "trigger_data:trigger_score"    => 0,
+        "trigger_data:trigger_cause"    => "",
+        "trigger_data:trigger_text"     => "",
+        "trigger_data:trigger_showtext" => "",
+    };
 
-	zmMemWrite( $monitor, $values );
+    zmMemWrite( $monitor, $values );
 }
 
-sub zmTriggerEventCancel( $ )
+sub zmTriggerEventCancel
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_CANCEL,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
+    my $values = {
+        "trigger_data:trigger_state"    => TRIGGER_CANCEL,
+        "trigger_data:trigger_score"    => 0,
+        "trigger_data:trigger_cause"    => "",
+        "trigger_data:trigger_text"     => "",
+        "trigger_data:trigger_showtext" => "",
+    };
 
-	zmMemWrite( $monitor, $values );
+    zmMemWrite( $monitor, $values );
 }
 
-sub zmTriggerShowtext( $$ )
+sub zmTriggerShowtext
 {
-	my $monitor = shift;
-	my $showtext = shift;
+    my $monitor = shift;
+    my $showtext = shift;
 
-	my $values = {
-		"trigger_data:trigger_showtext" => $showtext,
-	};
+    my $values = {
+        "trigger_data:trigger_showtext" => $showtext,
+    };
 
-	zmMemWrite( $monitor, $values );
+    zmMemWrite( $monitor, $values );
 }
 
 1;
@@ -741,44 +767,76 @@ ZoneMinder::MappedMem - ZoneMinder Mapped Memory access module
     }
   }
 
-  ( $lri, $lwi ) = zmMemRead( $monitor, [ "shared_data:last_read_index", "shared_data:last_write_index" ] );
+  ( $lri, $lwi ) = zmMemRead( $monitor, [ "shared_data:last_read_index",
+                                          "shared_data:last_write_index"
+                                        ]
+                            );
   zmMemWrite( $monitor, { "trigger_data:trigger_showtext" => "Some Text" } );
 
 =head1 DESCRIPTION
 
-The ZoneMinder:MappedMem module contains methods for accessing and writing to mapped memory as well as helper methods for common operations.
+The ZoneMinder:MappedMem module contains methods for accessing and writing
+to mapped memory as well as helper methods for common operations.
 
-The core elements of ZoneMinder used mapped memory to allow multiple access to resources. Although ZoneMinder scripts have used this information before, up until now it was difficult to access and prone to errors. This module introduces a common API for mapped memory access (both reading and writing) making it a lot easier to customise scripts or even create your own.
+The core elements of ZoneMinder used mapped memory to allow multiple access
+to resources. Although ZoneMinder scripts have used this information
+before, up until now it was difficult to access and prone to errors. This
+module introduces a common API for mapped memory access (both reading and
+writing) making it a lot easier to customise scripts or even create your
+own.
 
-All the methods listed below require a 'monitor' parameter. This must be a reference to a hash with at least the 'Id' field set to the monitor id of the mapped memory you wish to access. Using database methods to select the monitor details will also return this kind of data. Some of the mapped memory methods will add and amend new fields to this hash.
-
-=over 4
+All the methods listed below require a 'monitor' parameter. This must be a
+reference to a hash with at least the 'Id' field set to the monitor id of
+the mapped memory you wish to access. Using database methods to select the
+monitor details will also return this kind of data. Some of the mapped
+memory methods will add and amend new fields to this hash.
 
 =head1 METHODS
 
+=over 4
+
 =item zmMemVerify ( $monitor );
 
-Verify that the mapped memory of the monitor given exists and is valid. It will return an undefined value if it is not valid. You should generally call this method first before using any of the other methods, but most of the remaining methods will also do so if the memory has not already been verified.
+Verify that the mapped memory of the monitor given exists and is valid. It
+will return an undefined value if it is not valid. You should generally
+call this method first before using any of the other methods, but most of
+the remaining methods will also do so if the memory has not already been
+verified.
 
 =item zmMemInvalidate ( $monitor );
 
-Following an error, reset the mapped memory ids and attempt to reverify on the next operation. This is mostly used when a mapped memory segment has gone away and been recreated with a different id.
+Following an error, reset the mapped memory ids and attempt to reverify on
+the next operation. This is mostly used when a mapped memory segment has
+gone away and been recreated with a different id.
 
 =item zmMemRead ( $monitor, $readspec );
 
-This method is used to read data from mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'readspec' must either be a string of the form "<section>:<field>" or a reference to an array of strings of the same format. In the first case a single value is returned, in the latter case a list of values is return. Errors will cause undefined to be returned. The allowable sections and field names are described below.
+This method is used to read data from mapped memory attached to the given
+monitor. The mapped memory will be verified if it has not already been. The
+'readspec' must either be a string of the form "<section>:<field>" or a
+reference to an array of strings of the same format. In the first case a
+single value is returned, in the latter case a list of values is return.
+Errors will cause undefined to be returned. The allowable sections and
+field names are described below.
 
 =item zmMemWrite ( $monitor, $writespec );
 
-This method is used to write data to mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'writespec' must be a reference to a hash with keys of the form "<section>:<field>" and values as the data to be written. Errors will cause undefined to be returned, otherwise a non-undefined value will be returned. The allowable sections and field names are described below.
+This method is used to write data to mapped memory attached to the given
+monitor. The mapped memory will be verified if it has not already been. The
+'writespec' must be a reference to a hash with keys of the form
+"<section>:<field>" and values as the data to be written. Errors will cause
+undefined to be returned, otherwise a non-undefined value will be returned.
+The allowable sections and field names are described below.
 
 =item $state = zmGetMonitorState ( $monitor );
 
-Return the current state of the given monitor. This is an integer value and can be compared with the STATE constants given below.
+Return the current state of the given monitor. This is an integer value and
+can be compared with the STATE constants given below.
 
 =item $event_id = zmGetLastEvent ( $monitor );
 
-Return the event id of the last event that the monitor generated, or 0 if no event has been generated by the current monitor process.
+Return the event id of the last event that the monitor generated, or 0 if
+no event has been generated by the current monitor process.
 
 =item zmIsAlarmed ( $monitor );
 
@@ -786,27 +844,38 @@ Return 1 if the monitor given is currently in an alarm state, 0 otherwise.
 
 =item zmInAlarm ( $monitor );
 
-Return 1 if the monitor given is currently in an alarm or alerted state, 0 otherwise.
+Return 1 if the monitor given is currently in an alarm or alerted state, 0
+otherwise.
 
 =item zmHasAlarmed ( $monitor );
 
-Return 1 if the given monitor is in an alarm state, or has been in an alarm state since the last call to this method.
+Return 1 if the given monitor is in an alarm state, or has been in an alarm
+state since the last call to this method.
 
 =item ( $x, $y ) = zmGetAlarmLocation ( $monitor );
 
-Return an x,y pair indicating the image co-ordinates of the centre of the last motion event generated by the given monitor. If no event has been generated by the current monitor process, or the alarm was not motion related, returns -1,-1.
+Return an x,y pair indicating the image co-ordinates of the centre of the
+last motion event generated by the given monitor. If no event has been
+generated by the current monitor process, or the alarm was not motion
+related, returns -1,-1.
 
 =item zmGetLastWriteTime ( $monitor );
 
-Returns the time (in utc seconds) since the last image was captured by the given monitor and written to shared memory, or 0 otherwise.
+Returns the time (in utc seconds) since the last image was captured by the
+given monitor and written to shared memory, or 0 otherwise.
 
 =item zmGetLastReadTime ( $monitor );
 
-Returns the time (in utc seconds) since the last image was read from shared memory by the analysis daemon of the given monitor, or 0 otherwise or if the monitor is in monitor only mode.
+Returns the time (in utc seconds) since the last image was read from shared
+memory by the analysis daemon of the given monitor, or 0 otherwise or if
+the monitor is in monitor only mode.
 
 =item zmMonitorSuspend ( $monitor );
 
-Suspend the given monitor from generating events caused by motion. This method can be used to prevent camera actions such as panning or zooming from causing events. If configured to do so, the monitor may automatically resume after a defined period.
+Suspend the given monitor from generating events caused by motion. This
+method can be used to prevent camera actions such as panning or zooming
+from causing events. If configured to do so, the monitor may automatically
+resume after a defined period.
 
 =item zmMonitorResume ( $monitor );
 
@@ -814,23 +883,43 @@ Allow the given monitor to resume generating events caused by motion.
 
 =item zmTriggerEventOn ( $monitor, $score, $cause [, $text, $showtext ] );
 
-Trigger the given monitor to generate an event. You must supply an event score and a cause string indicating the reason for the event. You may also supply a text string containing further details about the event and a showtext string which may be included in the timestamp annotation on any images captured during the event, if configured to do so.
+Trigger the given monitor to generate an event. You must supply an event
+score and a cause string indicating the reason for the event. You may also
+supply a text string containing further details about the event and a
+showtext string which may be included in the timestamp annotation on any
+images captured during the event, if configured to do so.
 
 =item zmTriggerEventOff ( $monitor );
 
-Trigger the given monitor to not generate any events. This method does not cancel zmTriggerEventOn, but is exclusive to it. This method is intended to allow external triggers to prevent normal events being generated by monitors in the same way as zmMonitorSuspend but applies to all events and not just motion, and is intended for longer timescales than are appropriate for suspension.
+Trigger the given monitor to not generate any events. This method does not
+cancel zmTriggerEventOn, but is exclusive to it. This method is intended to
+allow external triggers to prevent normal events being generated by
+monitors in the same way as zmMonitorSuspend but applies to all events and
+not just motion, and is intended for longer timescales than are appropriate
+for suspension.
 
 =item zmTriggerEventCancel ( $monitor );
 
-Cancel any previous trigger on or off requests. This stops a triggered alarm if it exists from a previous 'on' and allows events to be generated once more following a previous 'off'.
+Cancel any previous trigger on or off requests. This stops a triggered
+alarm if it exists from a previous 'on' and allows events to be generated
+once more following a previous 'off'.
 
 =item zmTriggerShowtext ( $monitor, $showtest );
 
-Indicate that the given text should be displayed in the timestamp annotation on any images captured, if the format of the annotation string defined for the monitor permits.
+Indicate that the given text should be displayed in the timestamp
+annotation on any images captured, if the format of the annotation string
+defined for the monitor permits.
+
+=back
 
 =head1 DATA
 
-The data fields in mapped memory that may be accessed are as follows. There are two main sections, shared_data which is general data and trigger_data which is used for event triggering. Whilst reading from these fields is harmless, extreme care must be taken when writing to mapped memory, especially in the shared_data section as this is normally written to only by monitor capture and analysis processes.
+The data fields in mapped memory that may be accessed are as follows. There
+are two main sections, shared_data which is general data and trigger_data
+which is used for event triggering. Whilst reading from these fields is
+harmless, extreme care must be taken when writing to mapped memory,
+especially in the shared_data section as this is normally written to only
+by monitor capture and analysis processes.
 
   shared_data         The general mapped memory section
     size              The size, in bytes, of this section
@@ -861,19 +950,40 @@ The data fields in mapped memory that may be accessed are as follows. There are
 
 =head1 CONSTANTS
 
-The following constants are used by the methods above, but can also be used by user scripts if required.
+The following constants are used by the methods above, but can also be used
+by user scripts if required.
+
+=over 4
 
 =item STATE_IDLE STATE_PREALARM STATE_ALARM STATE_ALERT STATE_TAPE
 
-These constants define the state of the monitor with respect to alarms and events. They are used in the shared_data:state field.
+These constants define the state of the monitor with respect to alarms and
+events. They are used in the shared_data:state field.
 
 =item ACTION_GET ACTION_SET ACTION_RELOAD ACTION_SUSPEND ACTION_RESUME
 
-These constants defines the various values that can exist in the shared_data:action field. This is a bitmask which when non-zero defines an action that an executing monitor process should take. ACTION_GET requires that the current values of brightness, contrast, colour and hue are taken from the camera and written to the equivalent mapped memory fields. ACTION_SET implies the reverse, that the values in mapped memory should be written to the camera. ACTION_RELOAD signal that the monitor process should reload itself from the database in case any settings have changed there. ACTION_SUSPEND signals that a monitor should stop exaiming images for motion, though other alarms may still occur. ACTION_RESUME sigansl that a monitor should resume motion detectiom.
+These constants defines the various values that can exist in the
+shared_data:action field. This is a bitmask which when non-zero defines an
+action that an executing monitor process should take. ACTION_GET requires
+that the current values of brightness, contrast, colour and hue are taken
+from the camera and written to the equivalent mapped memory fields.
+ACTION_SET implies the reverse, that the values in mapped memory should be
+written to the camera. ACTION_RELOAD signal that the monitor process should
+reload itself from the database in case any settings have changed there.
+ACTION_SUSPEND signals that a monitor should stop exaiming images for
+motion, though other alarms may still occur. ACTION_RESUME sigansl that a
+monitor should resume motion detectiom.
 
-=item TRIGGER_CANCEL TRIGGER_ON TRIGGER_OFF 
+=item TRIGGER_CANCEL TRIGGER_ON TRIGGER_OFF
 
-These constants are used in the definition of external triggers. TRIGGER_CANCEL is used to indicated that any previous trigger settings should be cancelled, TRIGGER_ON signals that an alarm should be created (or continued)) as a result of the current trigger and TRIGGER_OFF signals that the trigger should prevent any alarms from being generated. See the trigger methods above for further details.
+These constants are used in the definition of external triggers.
+TRIGGER_CANCEL is used to indicated that any previous trigger settings
+should be cancelled, TRIGGER_ON signals that an alarm should be created (or
+continued)) as a result of the current trigger and TRIGGER_OFF signals that
+the trigger should prevent any alarms from being generated. See the trigger
+methods above for further details.
+
+=back
 
 =head1 EXPORT
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
index 173c48493..017b5aa8c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
@@ -36,18 +36,18 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		zmMemKey
-		zmMemAttach
-		zmMemDetach
-		zmMemGet
-		zmMemPut
-		zmMemClean
-	) ],
+    'functions' => [ qw(
+        zmMemKey
+        zmMemAttach
+        zmMemDetach
+        zmMemGet
+        zmMemPut
+        zmMemClean
+    ) ],
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -68,117 +68,131 @@ use ZoneMinder::Logger qw(:all);
 
 use Sys::Mmap;
 
-sub zmMemKey( $ )
+sub zmMemKey
 {
-	my $monitor = shift;
+    my $monitor = shift;
     return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
 }
 
-sub zmMemAttach( $$ )
+sub zmMemAttach
 {
-	my ( $monitor, $size ) = @_;
-	if ( ! $size ) {
-		Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
-		return( undef );
-	}
-	if ( !defined($monitor->{MMapAddr}) )
-	{
+    my ( $monitor, $size ) = @_;
+    if ( ! $size ) {
+        Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
+        return( undef );
+    }
+    if ( !defined($monitor->{MMapAddr}) )
+    {
 
         my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
-		if ( ! -e $mmap_file ) {
-			Error( sprintf( "Memory map file '%s' does not exist.  zmc might not be running.", $mmap_file ) );
-			return ( undef );
-		} 
+        if ( ! -e $mmap_file ) {
+            Error( sprintf( "Memory map file '%s' does not exist.  zmc might not be running."
+                            , $mmap_file
+                          )
+            );
+            return ( undef );
+        }
 
-		my $mmap_file_size = -s $mmap_file;
+        my $mmap_file_size = -s $mmap_file;
 
-		if ( $mmap_file_size < $size ) {
-			Error( sprintf( "Memory map file '%s' should have been %d but was instead %d", $mmap_file, $size, $mmap_file_size ) );
-			return ( undef );
-		} 
-        if ( !open( MMAP, "+<".$mmap_file ) )
+        if ( $mmap_file_size < $size ) {
+            Error( sprintf( "Memory map file '%s' should have been %d but was instead %d"
+                            , $mmap_file
+                            , $size
+                            , $mmap_file_size
+                          )
+            );
+            return ( undef );
+        }
+        if ( !open( MMAP, "+<", $mmap_file ) )
         {
-    		Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
-			return( undef );
+            Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
+            return( undef );
         }
         my $mmap = undef;
         my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, \*MMAP );
         if ( !$mmap_addr || !$mmap )
         {
-    		Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
-			close( MMAP );
-			return( undef );
+            Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
+            close( MMAP );
+            return( undef );
         }
-		$monitor->{MMapHandle} = \*MMAP;
-		$monitor->{MMapAddr} = $mmap_addr;
-		$monitor->{MMap} = \$mmap;
-	}
-	return( !undef );
+        $monitor->{MMapHandle} = \*MMAP;
+        $monitor->{MMapAddr} = $mmap_addr;
+        $monitor->{MMap} = \$mmap;
+    }
+    return( !undef );
 }
 
-sub zmMemDetach( $ )
+sub zmMemDetach
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
     if ( $monitor->{MMap} )
     {
         if ( ! munmap( ${$monitor->{MMap}} ) ) {
-			Warn( "Unable to munmap for monitor $$monitor{Id}\n");
-		} 
-	    delete $monitor->{MMap};
+            Warn( "Unable to munmap for monitor $$monitor{Id}\n");
+        }
+        delete $monitor->{MMap};
     }
     if ( $monitor->{MMapAddr} )
     {
-	    delete $monitor->{MMapAddr};
+        delete $monitor->{MMapAddr};
     }
     if ( $monitor->{MMapHandle} )
     {
         close( $monitor->{MMapHandle} );
-	    delete $monitor->{MMapHandle};
+        delete $monitor->{MMapHandle};
     }
 }
 
-sub zmMemGet( $$$ )
+sub zmMemGet
 {
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
+    my $monitor = shift;
+    my $offset = shift;
+    my $size = shift;
 
-	my $mmap = $monitor->{MMap};
+    my $mmap = $monitor->{MMap};
     if ( !$mmap || !$$mmap )
     {
-        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
+        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?"
+                        , $monitor->{Id}
+                      )
+        );
         return( undef );
     }
-	my $data = substr( $$mmap, $offset, $size );
+    my $data = substr( $$mmap, $offset, $size );
     return( $data );
 }
 
-sub zmMemPut( $$$$ )
+sub zmMemPut
 {
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
+    my $monitor = shift;
+    my $offset = shift;
+    my $size = shift;
+    my $data = shift;
 
-	my $mmap = $monitor->{MMap};
+    my $mmap = $monitor->{MMap};
     if ( !$mmap || !$$mmap )
     {
-        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
+        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?"
+                        , $monitor->{Id}
+                      )
+        );
         return( undef );
     }
-	substr( $$mmap, $offset, $size ) = $data;
-	return( !undef );
+    substr( $$mmap, $offset, $size ) = $data;
+    return( !undef );
 }
 
 sub zmMemClean
 {
-	Debug( "Removing memory map files\n" );
+    Debug( "Removing memory map files\n" );
     my $mapPath = $Config{ZM_PATH_MAP}."/zm.mmap.*";
     foreach my $mapFile( glob( $mapPath ) )
     {
         ( $mapFile ) = $mapFile =~ /^(.+)$/;
-	    Debug( "Removing memory map file '$mapFile'\n" );
+        Debug( "Removing memory map file '$mapFile'\n" );
         unlink( $mapFile );
     }
 }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
index 59dc399f1..301327095 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
@@ -19,7 +19,7 @@
 #
 # ==========================================================================
 #
-# This module contains the common definitions and functions used by the rest 
+# This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
 package ZoneMinder::Memory::Shared;
@@ -39,18 +39,18 @@ eval 'sub IPC_CREAT {0001000}' unless defined &IPC_CREAT;
 # names by default without a very good reason. Use EXPORT_OK instead.
 # Do not simply export all your public functions/methods/constants.
 
-# This allows declaration	use ZoneMinder ':all';
+# This allows declaration   use ZoneMinder ':all';
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-	'functions' => [ qw(
+    'functions' => [ qw(
         zmMemKey
         zmMemAttach
         zmMemDetach
         zmMemGet
         zmMemPut
         zmMemClean
-	) ],
+    ) ],
 );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
@@ -69,82 +69,98 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 
-sub zmMemKey( $ )
+sub zmMemKey
 {
-	my $monitor = shift;
-	return( defined($monitor->{ShmKey})?$monitor->{ShmKey}:undef );
+    my $monitor = shift;
+    return( defined($monitor->{ShmKey})?$monitor->{ShmKey}:undef );
 }
 
-sub zmMemAttach( $$ )
+sub zmMemAttach
 {
-	my $monitor = shift;
-	my $size = shift;
-	if ( !defined($monitor->{ShmId}) )
-	{
-		my $shm_key = (hex($Config{ZM_SHM_KEY})&0xffff0000)|$monitor->{Id};
-		my $shm_id = shmget( $shm_key, $size, &IPC_CREAT | 0777  );
-		if ( !defined($shm_id) )
-		{
-    		Error( sprintf( "Can't get shared memory id '%x', %d: $!\n", $shm_key, $monitor->{Id} ) );
-			return( undef );
-		}
-		$monitor->{ShmKey} = $shm_key;
-		$monitor->{ShmId} = $shm_id;
-	}
-	return( !undef );
+    my $monitor = shift;
+    my $size = shift;
+    if ( !defined($monitor->{ShmId}) )
+    {
+        my $shm_key = (hex($Config{ZM_SHM_KEY})&0xffff0000)|$monitor->{Id};
+        my $shm_id = shmget( $shm_key, $size, &IPC_CREAT | 0777  );
+        if ( !defined($shm_id) )
+        {
+            Error( sprintf( "Can't get shared memory id '%x', %d: $!\n"
+                            , $shm_key
+                            , $monitor->{Id}
+                          )
+            );
+            return( undef );
+        }
+        $monitor->{ShmKey} = $shm_key;
+        $monitor->{ShmId} = $shm_id;
+    }
+    return( !undef );
 }
 
-sub zmMemDetach( $ )
+sub zmMemDetach
 {
-	my $monitor = shift;
+    my $monitor = shift;
 
-	delete $monitor->{ShmId};
+    delete $monitor->{ShmId};
 }
 
-sub zmMemGet( $$$ )
+sub zmMemGet
 {
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
+    my $monitor = shift;
+    my $offset = shift;
+    my $size = shift;
+
+    my $shm_key = $monitor->{ShmKey};
+    my $shm_id = $monitor->{ShmId};
 
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
     my $data;
     if ( !shmread( $shm_id, $data, $offset, $size ) )
     {
-        Error( sprintf( "Can't read from shared memory '%x/%d': $!", $shm_key, $shm_id ) );
+        Error( sprintf( "Can't read from shared memory '%x/%d': $!"
+                        , $shm_key
+                        , $shm_id
+                      )
+        );
         return( undef );
     }
-	return( $data );
+    return( $data );
 }
 
-sub zmMemPut( $$$$ )
+sub zmMemPut
 {
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
+    my $monitor = shift;
+    my $offset = shift;
+    my $size = shift;
+    my $data = shift;
+
+    my $shm_key = $monitor->{ShmKey};
+    my $shm_id = $monitor->{ShmId};
 
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
     if ( !shmwrite( $shm_id, $data, $offset, $size ) )
     {
-        Error( sprintf( "Can't write to shared memory '%x/%d': $!", $shm_key, $shm_id ) );
+        Error( sprintf( "Can't write to shared memory '%x/%d': $!"
+                        , $shm_key
+                        , $shm_id
+                      )
+        );
         return( undef );
     }
-	return( !undef );
+    return( !undef );
 }
 
 sub zmMemClean
 {
     Debug( "Removing shared memory\n" );
     # Find ZoneMinder shared memory
-    my $command = "ipcs -m | grep '^".substr( sprintf( "0x%x", hex($Config{ZM_SHM_KEY}) ), 0, -2 )."'";
+    my $command = "ipcs -m | grep '^"
+                  .substr( sprintf( "0x%x", hex($Config{ZM_SHM_KEY}) ), 0, -2 )
+                  ."'"
+    ;
     Debug( "Checking for shared memory with '$command'\n" );
-    open( CMD, "$command |" ) or Fatal( "Can't execute '$command': $!" );
-    while( <CMD> )
+    open( my $CMD, '<', "$command |" )
+        or Fatal( "Can't execute '$command': $!" );
+    while( <$CMD> )
     {
         chomp;
         my ( $key, $id ) = split( /\s+/ );
@@ -156,7 +172,7 @@ sub zmMemClean
             qx( $command );
         }
     }
-    close( CMD );
+    close( $CMD );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm
index 0344e6d94..8b746ac3d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm
@@ -46,53 +46,53 @@ our $AUTOLOAD;
 
 sub new
 {
-	my $class = shift;
-	my $self = {};
-	$self->{readable} = !undef;
-	$self->{writeable} = !undef;
-	$self->{selectable} = undef;
-	$self->{state} = 'closed';
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my $self = {};
+    $self->{readable} = !undef;
+    $self->{writeable} = !undef;
+    $self->{selectable} = undef;
+    $self->{state} = 'closed';
+    bless( $self, $class );
+    return $self;
 }
 
 sub clone
 {
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
+    my $self = shift;
+    my $clone = { %$self };
+    bless $clone, ref $self;
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
+    my $self = shift;
+    my $class = ref($self) or croak( "Can't get class for non object $self" );
+    croak( "Abstract base class method called for object of class $class" );
 }
 
-sub close()
+sub close
 {
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
+    my $self = shift;
+    my $class = ref($self) or croak( "Can't get class for non object $self" );
+    croak( "Abstract base class method called for object of class $class" );
 }
 
-sub getState()
+sub getState
 {
-	my $self = shift;
-	return( $self->{state} );
+    my $self = shift;
+    return( $self->{state} );
 }
 
-sub isOpen()
+sub isOpen
 {
-	my $self = shift;
-	return( $self->{state} eq "open" );
+    my $self = shift;
+    return( $self->{state} eq "open" );
 }
 
-sub isConnected()
+sub isConnected
 {
-	my $self = shift;
-	return( $self->{state} eq "connected" );
+    my $self = shift;
+    return( $self->{state} eq "connected" );
 }
 
 sub DESTROY
@@ -101,15 +101,15 @@ sub DESTROY
 
 sub AUTOLOAD
 {
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( !exists($self->{$name}) )
-	{
-		croak( "Can't access $name member of object of class $class" );
-	}
-	return( $self->{$name} );
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( !exists($self->{$name}) )
+    {
+        croak( "Can't access $name member of object of class $class" );
+    }
+    return( $self->{$name} );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
index 234dae3d7..6c4254a7e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
@@ -48,23 +48,23 @@ use Fcntl;
 
 sub new
 {
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my %params = @_;
+    my $self = ZoneMinder::Trigger::Channel::Handle->new;
+    $self->{path} = $params{path};
+    bless( $self, $class );
+    return $self;
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	local *sfh;
-	#sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
-	#open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
-	open( *sfh, "+<".$self->{path} ) or croak( "Can't open: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
+    my $self = shift;
+    local *sfh;
+    #sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
+    #open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
+    open( *sfh, "+<", $self->{path} ) or croak( "Can't open: $!" );
+    $self->{state} = 'open';
+    $self->{handle} = *sfh;
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm
index 353dc4a32..d26924476 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm
@@ -46,12 +46,12 @@ use POSIX;
 
 sub new
 {
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel->new();
-	$self->{handle} = undef;
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my $port = shift;
+    my $self = ZoneMinder::Trigger::Channel->new();
+    $self->{handle} = undef;
+    bless( $self, $class );
+    return $self;
 }
 
 sub spawns
@@ -59,45 +59,51 @@ sub spawns
     return( undef );
 }
 
-sub close()
+sub close
 {
-	my $self = shift;
-	close( $self->{handle} );
-	$self->{state} = 'closed';
-	$self->{handle} = undef;
+    my $self = shift;
+    close( $self->{handle} );
+    $self->{state} = 'closed';
+    $self->{handle} = undef;
 }
 
-sub read()
+sub read
 {
-	my $self = shift;
-	my $buffer;
-	my $nbytes = sysread( $self->{handle}, $buffer, POSIX::BUFSIZ );
-	if ( !$nbytes )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' ($nbytes bytes)\n" );
-	return( $buffer );
+    my $self = shift;
+    my $buffer;
+    my $nbytes = sysread( $self->{handle}, $buffer, POSIX::BUFSIZ );
+    if ( !$nbytes )
+    {
+        return( undef );
+    }
+    Debug( "Read '$buffer' ($nbytes bytes)\n" );
+    return( $buffer );
 }
 
-sub write()
+sub write
 {
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = syswrite( $self->{handle}, $buffer );
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".($nbytes?$nbytes:'undefined').": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
+    my $self = shift;
+    my $buffer = shift;
+    my $nbytes = syswrite( $self->{handle}, $buffer );
+    if ( !defined( $nbytes) || $nbytes < length($buffer) )
+    {
+        Error( "Unable to write buffer '".$buffer
+               .", expected "
+               .length($buffer)
+               ." bytes, sent "
+               .($nbytes?$nbytes:'undefined')
+               .": $!\n"
+        );
+        return( undef );
+    }
+    Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
+    return( !undef );
 }
 
-sub fileno()
+sub fileno
 {
-	my $self = shift;
-	return( defined($self->{handle})?fileno($self->{handle}):-1 );
+    my $self = shift;
+    return( defined($self->{handle})?fileno($self->{handle}):-1 );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
index 68df0980f..6c5f21961 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
@@ -48,44 +48,45 @@ use Socket;
 
 sub new
 {
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Spawning->new();
-	$self->{selectable} = !undef;
-	$self->{port} = $params{port};
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my %params = @_;
+    my $self = ZoneMinder::Trigger::Channel::Spawning->new();
+    $self->{selectable} = !undef;
+    $self->{port} = $params{port};
+    bless( $self, $class );
+    return $self;
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	local *sfh;
-	my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
-	socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) or croak( "Can't open socket: $!" );
-	setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
+    my $self = shift;
+    local *sfh;
+    my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
+    socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') )
+        or croak( "Can't open socket: $!" );
+    setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
+    bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
+    listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
+    $self->{state} = 'open';
+    $self->{handle} = *sfh;
 }
 
-sub _spawn( $ )
+sub _spawn
 {
-	my $self = shift;
-	my $new_handle = shift;
-	my $clone = $self->clone();
-	$clone->{handle} = $new_handle;
-	$clone->{state} = 'connected';
-	return( $clone );
+    my $self = shift;
+    my $new_handle = shift;
+    my $clone = $self->clone();
+    $clone->{handle} = $new_handle;
+    $clone->{state} = 'connected';
+    return( $clone );
 }
 
-sub accept()
+sub accept
 {
-	my $self = shift;
-	local *cfh;
-	my $paddr = accept( *cfh, $self->{handle} );
-	return( $self->_spawn( *cfh ) );
+    my $self = shift;
+    local *cfh;
+    my $paddr = accept( *cfh, $self->{handle} );
+    return( $self->_spawn( *cfh ) );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm
index 7e4ad4730..a3709b5bb 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm
@@ -46,64 +46,70 @@ use Device::SerialPort;
 
 sub new
 {
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my %params = @_;
+    my $self = ZoneMinder::Trigger::Channel->new;
+    $self->{path} = $params{path};
+    bless( $self, $class );
+    return $self;
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	my $device = new Device::SerialPort( $self->{path} );
-	$device->baudrate(9600);
-	$device->databits(8);
-	$device->parity('none');
-	$device->stopbits(1);
-	$device->handshake('none');
+    my $self = shift;
+    my $device = new Device::SerialPort( $self->{path} );
+    $device->baudrate(9600);
+    $device->databits(8);
+    $device->parity('none');
+    $device->stopbits(1);
+    $device->handshake('none');
 
-	$device->read_const_time(50);
-	$device->read_char_time(10);
+    $device->read_const_time(50);
+    $device->read_char_time(10);
 
-	$self->{device} = $device;
-	$self->{state} = 'open';
-	$self->{state} = 'connected';
+    $self->{device} = $device;
+    $self->{state} = 'open';
+    $self->{state} = 'connected';
 }
 
-sub close()
+sub close
 {
-	my $self = shift;
-	$self->{device}->close();
-	$self->{state} = 'closed';
+    my $self = shift;
+    $self->{device}->close();
+    $self->{state} = 'closed';
 }
 
-sub read()
+sub read
 {
-	my $self = shift;
-	my $buffer = $self->{device}->lookfor();
-	if ( !$buffer || !length($buffer) )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' (".length($buffer)." bytes)\n" );
-	return( $buffer );
+    my $self = shift;
+    my $buffer = $self->{device}->lookfor();
+    if ( !$buffer || !length($buffer) )
+    {
+        return( undef );
+    }
+    Debug( "Read '$buffer' (".length($buffer)." bytes)\n" );
+    return( $buffer );
 }
 
-sub write()
+sub write
 {
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = $self->{device}->write( $buffer );
-	$self->{device}->write_drain();
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".$nbytes.": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
+    my $self = shift;
+    my $buffer = shift;
+    my $nbytes = $self->{device}->write( $buffer );
+    $self->{device}->write_drain();
+    if ( !defined( $nbytes) || $nbytes < length($buffer) )
+    {
+        Error( "Unable to write buffer '".$buffer
+               .", expected "
+               .length($buffer)
+               ." bytes, sent "
+               .$nbytes
+               .": $!\n"
+        );
+        return( undef );
+    }
+    Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
+    return( !undef );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm
index ff726ac38..aeaca182e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm
@@ -45,12 +45,12 @@ use ZoneMinder::Logger qw(:all);
 
 sub new
 {
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new();
-	$self->{spawns} = !undef;
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my $port = shift;
+    my $self = ZoneMinder::Trigger::Channel::Handle->new();
+    $self->{spawns} = !undef;
+    bless( $self, $class );
+    return $self;
 }
 
 sub spawns
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
index a671ccd66..71d6e89fc 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
@@ -48,28 +48,28 @@ use Socket;
 
 sub new
 {
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{selectable} = !undef;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my %params = @_;
+    my $self = ZoneMinder::Trigger::Channel->new;
+    $self->{selectable} = !undef;
+    $self->{path} = $params{path};
+    bless( $self, $class );
+    return $self;
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	local *sfh;
-	unlink( $self->{path} );
-	my $saddr = sockaddr_un( $self->{path} );
-	socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{handle} = *sfh;
+    my $self = shift;
+    local *sfh;
+    unlink( $self->{path} );
+    my $saddr = sockaddr_un( $self->{path} );
+    socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" );
+    bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
+    listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
+    $self->{handle} = *sfh;
 }
 
-sub _spawn( $ )
+sub _spawn
 {
     my $self = shift;
     my $new_handle = shift;
@@ -79,7 +79,7 @@ sub _spawn( $ )
     return( $clone );
 }
 
-sub accept()
+sub accept
 {
     my $self = shift;
     local *cfh;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm
index 41b332d46..12cf3136d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm
@@ -46,115 +46,121 @@ our $AUTOLOAD;
 
 sub new
 {
-	my $class = shift;
-	my %params = @_;
-	my $self = {};
-	$self->{name} = $params{name};
-	$self->{channel} = $params{channel};
-	$self->{input} = $params{mode} =~ /r/i;
-	$self->{output} = $params{mode} =~ /w/i;
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my %params = @_;
+    my $self = {};
+    $self->{name} = $params{name};
+    $self->{channel} = $params{channel};
+    $self->{input} = $params{mode} =~ /r/i;
+    $self->{output} = $params{mode} =~ /w/i;
+    bless( $self, $class );
+    return $self;
 }
 
 sub clone
 {
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
-	return( $clone );
+    my $self = shift;
+    my $clone = { %$self };
+    bless $clone, ref $self;
+    return( $clone );
 }
 
 sub spawns
 {
-	my $self = shift;
+    my $self = shift;
     return( $self->{channel}->spawns() );
 }
 
-sub _spawn( $ )
+sub _spawn
 {
-	my $self = shift;
-	my $new_channel = shift;
-	my $clone = $self->clone();
-	$clone->{channel} = $new_channel;
-	return( $clone );
+    my $self = shift;
+    my $new_channel = shift;
+    my $clone = $self->clone();
+    $clone->{channel} = $new_channel;
+    return( $clone );
 }
 
-sub accept()
+sub accept
 {
-	my $self = shift;
-	my $new_channel = $self->{channel}->accept();
-	return( $self->_spawn( $new_channel ) );
+    my $self = shift;
+    my $new_channel = $self->{channel}->accept();
+    return( $self->_spawn( $new_channel ) );
 }
 
-sub open()
+sub open
 {
-	my $self = shift;
-	return( $self->{channel}->open() );
+    my $self = shift;
+    return( $self->{channel}->open() );
 }
 
-sub close()
+sub close
 {
-	my $self = shift;
-	return( $self->{channel}->close() );
+    my $self = shift;
+    return( $self->{channel}->close() );
 }
 
-sub fileno()
+sub fileno
 {
-	my $self = shift;
-	return( $self->{channel}->fileno() );
+    my $self = shift;
+    return( $self->{channel}->fileno() );
 }
 
-sub isOpen()
+sub isOpen
 {
-	my $self = shift;
-	return( $self->{channel}->isOpen() );
+    my $self = shift;
+    return( $self->{channel}->isOpen() );
 }
 
-sub isConnected()
+sub isConnected
 {
-	my $self = shift;
-	return( $self->{channel}->isConnected() );
+    my $self = shift;
+    return( $self->{channel}->isConnected() );
 }
 
-sub canRead()
+sub canRead
 {
-	my $self = shift;
-	return( $self->{input} && $self->isConnected() );
+    my $self = shift;
+    return( $self->{input} && $self->isConnected() );
 }
 
-sub canWrite()
+sub canWrite
 {
-	my $self = shift;
-	return( $self->{output} && $self->isConnected() );
+    my $self = shift;
+    return( $self->{output} && $self->isConnected() );
 }
 
 sub getMessages
 {
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
+    my $self = shift;
+    my $buffer = $self->{channel}->read();
 
-	return( undef ) if ( !defined($buffer) );
+    return( undef ) if ( !defined($buffer) );
 
-	my @messages = split( /\r?\n/, $buffer );
-	return( \@messages );
+    my @messages = split( /\r?\n/, $buffer );
+    return( \@messages );
 }
 
 sub putMessages
 {
-	my $self = shift;
-	my $messages = shift;
+    my $self = shift;
+    my $messages = shift;
 
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
+    if ( @$messages )
+    {
+        my $buffer = join( "\n", @$messages );
+        $buffer .= "\n";
+        if ( !$self->{channel}->write( $buffer ) )
+        {
+            Error( "Unable to write buffer '".$buffer
+                  ." to connection "
+                  .$self->{name}
+                  ." ("
+                  .$self->fileno()
+                  .")\n"
+            );
+        }
+    }
+    return( undef );
 }
 
 sub timedActions
@@ -167,22 +173,22 @@ sub DESTROY
 
 sub AUTOLOAD
 {
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( exists($self->{$name}) )
-	{
-		return( $self->{$name} );
-	}
-	elsif ( defined($self->{channel}) )
-	{
-		if ( exists($self->{channel}->{$name}) )
-		{
-			return( $self->{channel}->{$name} );
-		}
-	}
-	croak( "Can't access $name member of object of class $class" );
+    my $self = shift;
+    my $class = ref($self) || croak( "$self not object" );
+    my $name = $AUTOLOAD;
+    $name =~ s/.*://;
+    if ( exists($self->{$name}) )
+    {
+        return( $self->{$name} );
+    }
+    elsif ( defined($self->{channel}) )
+    {
+        if ( exists($self->{channel}->{$name}) )
+        {
+            return( $self->{channel}->{$name} );
+        }
+    }
+    croak( "Can't access $name member of object of class $class" );
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm
index 3bed2b351..6f3a86575 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm
@@ -44,40 +44,40 @@ use ZoneMinder::Logger qw(:all);
 
 sub new
 {
-	my $class = shift;
-	my $path = shift;
-	my $self = ZoneMinder::Trigger::Connection->new( @_ );
-	bless( $self, $class );
-	return $self;
+    my $class = shift;
+    my $path = shift;
+    my $self = ZoneMinder::Trigger::Connection->new( @_ );
+    bless( $self, $class );
+    return $self;
 }
 
 sub getMessages
 {
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
+    my $self = shift;
+    my $buffer = $self->{channel}->read();
 
-	return( undef ) if ( !defined($buffer) );
+    return( undef ) if ( !defined($buffer) );
 
-	Debug( "Handling buffer '$buffer'\n" );
-	my @messages = grep { s/-/|/g; 1; } split( /\r?\n/, $buffer );
-	return( \@messages );
+    Debug( "Handling buffer '$buffer'\n" );
+    my @messages = grep { s/-/|/g; 1; } split( /\r?\n/, $buffer );
+    return( \@messages );
 }
 
 sub putMessages
 {
-	my $self = shift;
-	my $messages = shift;
+    my $self = shift;
+    my $messages = shift;
 
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", grep{ s/\|/-/; 1; } @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
+    if ( @$messages )
+    {
+        my $buffer = join( "\n", grep{ s/\|/-/; 1; } @$messages );
+        $buffer .= "\n";
+        if ( !$self->{channel}->write( $buffer ) )
+        {
+            Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
+        }
+    }
+    return( undef );
 }
 
 1;
diff --git a/scripts/zm.in b/scripts/zm.in
index 33c32ac6c..b600cd983 100755
--- a/scripts/zm.in
+++ b/scripts/zm.in
@@ -16,12 +16,12 @@ LOCKFILE=/var/lock/subsys/zm
 
 loadconf()
 {
-	if [ -f $ZM_CONFIG ]; then
-		. $ZM_CONFIG
-	else
-		echo "ERROR: $ZM_CONFIG not found."
-		return 1
-	fi
+    if [ -f $ZM_CONFIG ]; then
+        . $ZM_CONFIG
+    else
+        echo "ERROR: $ZM_CONFIG not found."
+        return 1
+    fi
 }
 
 loadconf
@@ -30,95 +30,95 @@ command="$ZM_PATH_BIN/zmpkg.pl"
 start()
 {
 # Commenting out as it is not needed. Leaving as a placeholder for future use.
-#	zmupdate || return $?
-	loadconf || return $?
-	#Make sure the directory for our PID folder exists or create one.
-	[ ! -d $pidfile ] \
-		&& mkdir -m 774 $pidfile \
-		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
-	#Make sure the folder for the socks file exists or create one
-	GetPath="select Value from Config where Name='ZM_PATH_SOCKS'"
+#   zmupdate || return $?
+    loadconf || return $?
+    #Make sure the directory for our PID folder exists or create one.
+    [ ! -d $pidfile ] \
+        && mkdir -m 774 $pidfile \
+        && chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
+    #Make sure the folder for the socks file exists or create one
+    GetPath="select Value from Config where Name='ZM_PATH_SOCKS'"
     dbHost=`echo $ZM_DB_HOST | cut -d: -f1`
     dbPort=`echo $ZM_DB_HOST | cut -d: -s -f2`
     if [ "$dbPort" = "" ]
     then
-	    ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$ZM_DB_HOST -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
+        ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$ZM_DB_HOST -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
     else
-	    ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$dbHost -P$dbPort -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
+        ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$dbHost -P$dbPort -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
     fi 
-	[ ! -d $ZM_PATH_SOCK ] \
-		&& mkdir -m 774 $ZM_PATH_SOCK \
-		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
-	echo -n $"Starting $prog: "
-	$command start
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && touch $LOCKFILE
-	return $RETVAL
+    [ ! -d $ZM_PATH_SOCK ] \
+        && mkdir -m 774 $ZM_PATH_SOCK \
+        && chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
+    echo -n $"Starting $prog: "
+    $command start
+    RETVAL=$?
+    [ $RETVAL = 0 ] && success || failure
+    echo
+    [ $RETVAL = 0 ] && touch $LOCKFILE
+    return $RETVAL
 }
 
 stop()
 {
-	loadconf
-	echo -n $"Stopping $prog: "
-	$command stop
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && rm -f $LOCKFILE
+    loadconf
+    echo -n $"Stopping $prog: "
+    $command stop
+    RETVAL=$?
+    [ $RETVAL = 0 ] && success || failure
+    echo
+    [ $RETVAL = 0 ] && rm -f $LOCKFILE
 }
 
 zmstatus()
 {
-	loadconf
-	result=`$command status`
-	if [ "$result" = "running" ]; then
-		echo "ZoneMinder is running"
-		$ZM_PATH_BIN/zmu -l
-		RETVAL=0
-	else
-		echo "ZoneMinder is stopped"
-		RETVAL=1
-	fi
+    loadconf
+    result=`$command status`
+    if [ "$result" = "running" ]; then
+        echo "ZoneMinder is running"
+        $ZM_PATH_BIN/zmu -l
+        RETVAL=0
+    else
+        echo "ZoneMinder is stopped"
+        RETVAL=1
+    fi
 }
 
 zmupdate()
 {
-	if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
-		$ZM_PATH_BIN/zmupdate.pl -f
-	fi
+    if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
+        $ZM_PATH_BIN/zmupdate.pl -f
+    fi
 }
 
 
 case "$1" in
-	'start')
-		start
-		;;
-	'stop')
-		stop
-		;;
-	'restart')
-		stop
-		start
-		;;
-	'condrestart')
-		loadconf
-		result=`$ZM_PATH_BIN/zmdc.pl check`
-		if [ "$result" = "running" ]; then
-			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
-			rm -f $LOCKFILE
-			start
-		fi
-		;;
-	'status')
-		status httpd
-		status mysqld
-		zmstatus
-		;;
-	*)
-		echo "Usage: $0 { start | stop | restart | condrestart | status }"
-		RETVAL=1
-		;;
+    'start')
+        start
+        ;;
+    'stop')
+        stop
+        ;;
+    'restart')
+        stop
+        start
+        ;;
+    'condrestart')
+        loadconf
+        result=`$ZM_PATH_BIN/zmdc.pl check`
+        if [ "$result" = "running" ]; then
+            $ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
+            rm -f $LOCKFILE
+            start
+        fi
+        ;;
+    'status')
+        status httpd
+        status mysqld
+        zmstatus
+        ;;
+    *)
+        echo "Usage: $0 { start | stop | restart | condrestart | status }"
+        RETVAL=1
+        ;;
 esac
 exit $RETVAL
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index f7bd18540..7a74303fc 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -20,15 +20,33 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script checks for consistency between the event filesystem and
-# the database. If events are found in one and not the other they are
-# deleted (optionally). Additionally any monitor event directories that
-# do not correspond to a database monitor are similarly disposed of.
-# However monitors in the database that don't have a directory are left
-# alone as this is valid if they are newly created and have no events
-# yet.
-#
+
+=head1 NAME
+
+zmaudit.pl - ZoneMinder event file system and database consistency checker
+
+=head1 SYNOPSIS
+
+ zmaudit.pl [-r,-report|-i,-interactive]
+
+=head1 DESCRIPTION
+
+This script checks for consistency between the event filesystem and
+the database. If events are found in one and not the other they are
+deleted (optionally). Additionally any monitor event directories that
+do not correspond to a database monitor are similarly disposed of.
+However monitors in the database that don't have a directory are left
+alone as this is valid if they are newly created and have no events
+yet.
+
+=head1 OPTIONS
+
+ -r, --report               - Just report don't actually do anything
+ -i, --interactive          - Ask before applying any changes
+ -c, --continuous           - Run continuously
+ -v, --version              - Print the installed version of ZoneMinder
+
+=cut
 use strict;
 use bytes;
 
@@ -38,7 +56,6 @@ use bytes;
 #
 # ==========================================================================
 
-use constant MIN_AGE => 300; # Minimum age when we will delete anything
 use constant MAX_AGED_DIRS => 10; # Number of event dirs to check age on
 use constant RECOVER_TAG => "(r)"; # Tag to append to event name when recovered
 use constant RECOVER_TEXT => "Recovered."; # Text to append to event notes when recovered
@@ -56,9 +73,13 @@ use POSIX;
 use File::Find;
 use Time::HiRes qw/gettimeofday/;
 use Getopt::Long;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 
 use constant IMAGE_PATH => $Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_IMAGES};
-use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)?$Config{ZM_DIR_EVENTS}:($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS});
+use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
+                           ? $Config{ZM_DIR_EVENTS}
+                           : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
+;
 
 $| = 1;
 
@@ -71,39 +92,24 @@ my $interactive = 0;
 my $continuous = 0;
 my $version;
 
-sub usage
-{
-    print( "
-Usage: zmaudit.pl [-r,-report|-i,-interactive]
-Parameters are :-
--r, --report                    - Just report don't actually do anything
--i, --interactive               - Ask before applying any changes
--c, --continuous                - Run continuously
--v, --version					- Print the installed version of ZoneMinder
-");
-    exit( -1 );
-}
-
-sub aud_print( $ );
-sub confirm( ;$$ );
-sub deleteSwapImage();
-
 logInit();
 logSetSignal();
 
-if ( !GetOptions( report=>\$report, interactive=>\$interactive, continuous=>\$continuous, version=>\$version ) )
-{
-    usage();
-}
+GetOptions(
+    'report'        =>\$report,
+    'interactive'   =>\$interactive,
+    'continuous'    =>\$continuous,
+    'version'       =>\$version
+) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
-	print( ZoneMinder::Base::ZM_VERSION . "\n");
-	exit(0);
+    print( ZoneMinder::Base::ZM_VERSION . "\n");
+    exit(0);
 }
 if ( ($report + $interactive + $continuous) > 1 )
 {
     print( STDERR "Error, only one option may be specified\n" );
-    usage();
+    pod2usage(-exitstatus => -1);
 }
 
 my $dbh = zmDbConnect();
@@ -113,36 +119,46 @@ chdir( EVENT_PATH );
 my $max_image_age = 6/24; # 6 hours
 my $max_swap_age = 24/24; # 24 hours
 my $image_path = IMAGE_PATH;
-my $swap_image_path = $Config{ZM_PATH_SWAP};
 
 my $loop = 1;
 my $cleaned = 0;
 MAIN: while( $loop ) {
-	while ( ! ( $dbh and $dbh->ping() ) ) {
-		$dbh = zmDbConnect();
+    while ( ! ( $dbh and $dbh->ping() ) ) {
+        $dbh = zmDbConnect();
 
-		last if $dbh;
-		if ( $continuous ) {
-			# 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} );
-		} else {
-			sleep 1;
-		} # end if
-	} # end while can't connect to the db
+        last if $dbh;
+        if ( $continuous ) {
+            # 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} );
+        } else {
+            sleep 1;
+        } # end if
+    } # end while can't connect to the db
 
-	my $db_monitors;
+	if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
+        Fatal("ZM_AUDIT_MIN_AGE is not set in config.");
+    }
+
+    my $db_monitors;
     my $monitorSelectSql = "select Id 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 = ? order by Id";
-    my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql ) or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
+    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 = ? ORDER BY Id";
+    my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
+        or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
 
     $cleaned = 0;
-    my $res = $monitorSelectSth->execute() or Fatal( "Can't execute: ".$monitorSelectSth->errstr() );
+    my $res = $monitorSelectSth->execute()
+        or Fatal( "Can't execute: ".$monitorSelectSth->errstr() );
     while( my $monitor = $monitorSelectSth->fetchrow_hashref() )
     {
         Debug( "Found database monitor '$monitor->{Id}'" );
         my $db_events = $db_monitors->{$monitor->{Id}} = {};
-        my $res = $eventSelectSth->execute( $monitor->{Id} ) or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
+        my $res = $eventSelectSth->execute( $monitor->{Id} )
+            or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
         while ( my $event = $eventSelectSth->fetchrow_hashref() )
         {
             $db_events->{$event->{Id}} = $event->{Age};
@@ -151,7 +167,7 @@ MAIN: while( $loop ) {
     }
 
     my $fs_monitors;
-    foreach my $monitor ( <[0-9]*> )
+    foreach my $monitor ( glob("[0-9]*") )
     {
         Debug( "Found filesystem monitor '$monitor'" );
         my $fs_events = $fs_monitors->{$monitor} = {};
@@ -159,12 +175,13 @@ MAIN: while( $loop ) {
 
         if ( $Config{ZM_USE_DEEP_STORAGE} )
         {
-            foreach my $day_dir ( <$monitor_dir/*/*/*> )
+            foreach my $day_dir ( glob("$monitor_dir/*/*/*") )
             {
                 Debug( "Checking $day_dir" );
                 ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
                 chdir( $day_dir );
-                opendir( DIR, "." ) or Fatal( "Can't open directory '$day_dir': $!" );
+                opendir( DIR, "." )
+                    or Fatal( "Can't open directory '$day_dir': $!" );
                 my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
                 closedir( DIR );
                 my $count = 0;
@@ -231,7 +248,7 @@ MAIN: while( $loop ) {
             {
                 while ( my ( $fs_event, $age ) = each(%$fs_events ) )
                 {
-                    if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > MIN_AGE)) )
+                    if ( !defined($db_events->{$fs_event}) && ($age < 0 || ($age > $Config{ZM_AUDIT_MIN_AGE})) )
                     {
                         aud_print( "Filesystem event '$fs_monitor/$fs_event' does not exist in database" );
                         if ( confirm() )
@@ -256,7 +273,7 @@ MAIN: while( $loop ) {
     }
 
     my $monitor_links;
-    foreach my $link ( <*> )
+    foreach my $link ( glob("*") )
     {
         next if ( !-l $link );
         next if ( -e $link );
@@ -274,13 +291,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() );
+    my $deleteEventSth = $dbh->prepare_cached( $deleteEventSql )
+        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() );
+    my $deleteFramesSth = $dbh->prepare_cached( $deleteFramesSql )
+        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() );
+    my $deleteStatsSth = $dbh->prepare_cached( $deleteStatsSql )
+        or Fatal( "Can't prepare '$deleteStatsSql': ".$dbh->errstr() );
     while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) )
     {
         if ( my $fs_events = $fs_monitors->{$db_monitor} )
@@ -289,27 +310,33 @@ MAIN: while( $loop ) {
             {
                 while ( my ( $db_event, $age ) = each(%$db_events ) )
                 {
-                    if ( !defined($fs_events->{$db_event}) && ($age > MIN_AGE) )
-                    {
-                        aud_print( "Database event '$db_monitor/$db_event' does not exist in filesystem" );
-                        if ( confirm() )
-                        {
-                            my $res = $deleteEventSth->execute( $db_event ) or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
-                            $res = $deleteFramesSth->execute( $db_event ) or Fatal( "Can't execute: ".$deleteFramesSth->errstr() );
-                            $res = $deleteStatsSth->execute( $db_event ) or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
-                            $cleaned = 1;
-                        }
+                    if ( !defined($fs_events->{$db_event}) ) {
+						if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
+							aud_print( "Database event '$db_monitor/$db_event' does not exist in filesystem" );
+							if ( confirm() ) {
+								my $res = $deleteEventSth->execute( $db_event )
+									or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
+								$res = $deleteFramesSth->execute( $db_event )
+									or Fatal( "Can't execute: ".$deleteFramesSth->errstr() );
+								$res = $deleteStatsSth->execute( $db_event )
+									or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
+								$cleaned = 1;
+							}
+						} else {
+							aud_print( "Database event '$db_monitor/$db_event' does not exist in filesystem but too young to delete." );
+						}
                     }
                 }
             }
         }
         else
         {
-            #aud_print( "Database monitor '$db_monitor' does not exist in filesystem" );
+            aud_print( "Database monitor '$db_monitor' does not exist in filesystem" );
             #if ( confirm() )
             #{
                 # We don't actually do this in case it's new
-                #my $res = $deleteMonitorSth->execute( $db_monitor ) or Fatal( "Can't execute: ".$deleteMonitorSth->errstr() );
+                #my $res = $deleteMonitorSth->execute( $db_monitor )
+                #   or Fatal( "Can't execute: ".$deleteMonitorSth->errstr() );
                 #$cleaned = 1;
             #}
         }
@@ -318,15 +345,20 @@ MAIN: while( $loop ) {
 
     # Remove orphaned events (with no monitor)
     $cleaned = 0;
-    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 Fatal( "Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr() );
-    $res = $selectOrphanedEventsSth->execute() or Fatal( "Can't execute: ".$selectOrphanedEventsSth->errstr() );
+    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 Fatal( "Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr() );
+    $res = $selectOrphanedEventsSth->execute()
+        or Fatal( "Can't execute: ".$selectOrphanedEventsSth->errstr() );
     while( my $event = $selectOrphanedEventsSth->fetchrow_hashref() )
     {
         aud_print( "Found orphaned event with no monitor '$event->{Id}'" );
         if ( confirm() )
         {
-            $res = $deleteEventSth->execute( $event->{Id} ) or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
+            $res = $deleteEventSth->execute( $event->{Id} )
+                or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
             $cleaned = 1;
         }
     }
@@ -334,15 +366,19 @@ MAIN: while( $loop ) {
 
     # Remove empty events (with no frames)
     $cleaned = 0;
-    my $selectEmptyEventsSql = "select * from Events as E left join Frames as F on (E.Id = F.EventId) where isnull(F.EventId) and now() - interval ".MIN_AGE." second > E.StartTime";
-    my $selectEmptyEventsSth = $dbh->prepare_cached( $selectEmptyEventsSql ) or Fatal( "Can't prepare '$selectEmptyEventsSql': ".$dbh->errstr() );
-    $res = $selectEmptyEventsSth->execute() or Fatal( "Can't execute: ".$selectEmptyEventsSth->errstr() );
+    my $selectEmptyEventsSql = "SELECT * 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 $selectEmptyEventsSth = $dbh->prepare_cached( $selectEmptyEventsSql )
+        or Fatal( "Can't prepare '$selectEmptyEventsSql': ".$dbh->errstr() );
+    $res = $selectEmptyEventsSth->execute()
+        or Fatal( "Can't execute: ".$selectEmptyEventsSth->errstr() );
     while( my $event = $selectEmptyEventsSth->fetchrow_hashref() )
     {
         aud_print( "Found empty event with no frame records '$event->{Id}'" );
         if ( confirm() )
         {
-            $res = $deleteEventSth->execute( $event->{Id} ) or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
+            $res = $deleteEventSth->execute( $event->{Id} )
+                or Fatal( "Can't execute: ".$deleteEventSth->errstr() );
             $cleaned = 1;
         }
     }
@@ -350,15 +386,19 @@ MAIN: while( $loop ) {
 
     # Remove orphaned frame records
     $cleaned = 0;
-    my $selectOrphanedFramesSql = "select distinct EventId from Frames where EventId not in (select Id from Events)";
-    my $selectOrphanedFramesSth = $dbh->prepare_cached( $selectOrphanedFramesSql ) or Fatal( "Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr() );
-    $res = $selectOrphanedFramesSth->execute() or Fatal( "Can't execute: ".$selectOrphanedFramesSth->errstr() );
+    my $selectOrphanedFramesSql = "SELECT DISTINCT EventId FROM Frames
+                                   WHERE EventId NOT IN (SELECT Id FROM Events)";
+    my $selectOrphanedFramesSth = $dbh->prepare_cached( $selectOrphanedFramesSql )
+        or Fatal( "Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr() );
+    $res = $selectOrphanedFramesSth->execute()
+        or Fatal( "Can't execute: ".$selectOrphanedFramesSth->errstr() );
     while( my $frame = $selectOrphanedFramesSth->fetchrow_hashref() )
     {
         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;
         }
     }
@@ -366,32 +406,84 @@ MAIN: while( $loop ) {
 
     # Remove orphaned stats records
     $cleaned = 0;
-    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() );
-    $res = $selectOrphanedStatsSth->execute() or Fatal( "Can't execute: ".$selectOrphanedStatsSth->errstr() );
+    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() );
+    $res = $selectOrphanedStatsSth->execute()
+        or Fatal( "Can't execute: ".$selectOrphanedStatsSth->errstr() );
     while( my $stat = $selectOrphanedStatsSth->fetchrow_hashref() )
     {
         aud_print( "Found orphaned statistic records for event '$stat->{EventId}'" );
         if ( confirm() )
         {
-            $res = $deleteStatsSth->execute( $stat->{EventId} ) or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
+            $res = $deleteStatsSth->execute( $stat->{EventId} )
+                or Fatal( "Can't execute: ".$deleteStatsSth->errstr() );
             $cleaned = 1;
         }
     }
     redo MAIN if ( $cleaned );
 
     # New audit to close any events that were left open for longer than MIN_AGE seconds
-    my $selectUnclosedEventsSql = "select E.Id, max(F.TimeStamp) as EndTime, unix_timestamp(max(F.TimeStamp)) - unix_timestamp(E.StartTime) as Length, max(F.FrameId) as Frames, count(if(F.Score>0,1,NULL)) as AlarmFrames, sum(F.Score) as TotScore, max(F.Score) as MaxScore, M.EventPrefix as Prefix from Events as E left join Monitors as M on E.MonitorId = M.Id inner join Frames as F on E.Id = F.EventId where isnull(E.Frames) or isnull(E.EndTime) group by E.Id having EndTime < (now() - interval ".MIN_AGE." second)"; 
-    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 = ?";
-    my $updateUnclosedEventsSth = $dbh->prepare_cached( $updateUnclosedEventsSql ) or Fatal( "Can't prepare '$updateUnclosedEventsSql': ".$dbh->errstr() );
-    $res = $selectUnclosedEventsSth->execute() or Fatal( "Can't execute: ".$selectUnclosedEventsSth->errstr() );
+    my $selectUnclosedEventsSql =
+       "SELECT E.Id,
+               max(F.TimeStamp) as EndTime,
+               unix_timestamp(max(F.TimeStamp)) - unix_timestamp(E.StartTime) as Length,
+               max(F.FrameId) as Frames,
+               count(if(F.Score>0,1,NULL)) as AlarmFrames,
+               sum(F.Score) as TotScore,
+               max(F.Score) as MaxScore,
+               M.EventPrefix as Prefix
+        FROM Events as E
+        LEFT JOIN Monitors as M on E.MonitorId = M.Id
+        INNER JOIN Frames as F on E.Id = F.EventId
+        WHERE isnull(E.Frames) or isnull(E.EndTime)
+        GROUP BY E.Id HAVING EndTime < (now() - interval ".$Config{ZM_AUDIT_MIN_AGE}." second)"
+    ;
+    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 = ?"
+    ;
+    my $updateUnclosedEventsSth = $dbh->prepare_cached( $updateUnclosedEventsSql )
+        or Fatal( "Can't prepare '$updateUnclosedEventsSql': ".$dbh->errstr() );
+    $res = $selectUnclosedEventsSth->execute()
+        or Fatal( "Can't execute: ".$selectUnclosedEventsSth->errstr() );
     while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() )
     {
         aud_print( "Found open event '$event->{Id}'" );
         if ( confirm( 'close', 'closing' ) )
         {
-            $res = $updateUnclosedEventsSth->execute( sprintf( "%s%d%s", $event->{Prefix}, $event->{Id}, RECOVER_TAG ), $event->{EndTime}, $event->{Length}, $event->{Frames}, $event->{AlarmFrames}, $event->{TotScore}, $event->{AlarmFrames}?int($event->{TotScore}/$event->{AlarmFrames}):0, $event->{MaxScore}, RECOVER_TEXT, $event->{Id} ) or Fatal( "Can't execute: ".$updateUnclosedEventsSth->errstr() );
+            $res = $updateUnclosedEventsSth->execute
+            (
+                sprintf("%s%d%s",
+                        $event->{Prefix},
+                        $event->{Id},
+                        RECOVER_TAG
+                ),
+                $event->{EndTime},
+                $event->{Length},
+                $event->{Frames},
+                $event->{AlarmFrames},
+                $event->{TotScore},
+                $event->{AlarmFrames}
+                    ? int($event->{TotScore} / $event->{AlarmFrames})
+                    : 0
+                ,
+                $event->{MaxScore},
+                RECOVER_TEXT,
+                $event->{Id}
+            ) or Fatal( "Can't execute: ".$updateUnclosedEventsSth->errstr() );
         }
     }
 
@@ -405,7 +497,7 @@ MAIN: while( $loop ) {
     }
 
     # Now delete any old swap files
-    ( my $swap_image_root ) = ( $swap_image_path =~ /^(.*)$/ ); # De-taint
+    ( my $swap_image_root ) = ( $Config{ZM_PATH_SWAP} =~ /^(.*)$/ ); # De-taint
     File::Find::find( { wanted=>\&deleteSwapImage, untaint=>1 }, $swap_image_root );
 
     # Prune the Logs table if required
@@ -414,26 +506,43 @@ MAIN: while( $loop ) {
         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() );
-            $res = $selectLogRowCountSth->execute() or Fatal( "Can't execute: ".$selectLogRowCountSth->errstr() );
+            my $selectLogRowCountSql = "SELECT count(*) as Rows from Logs";
+            my $selectLogRowCountSth = $dbh->prepare_cached( $selectLogRowCountSql )
+                or Fatal( "Can't prepare '$selectLogRowCountSql': ".$dbh->errstr() );
+            $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() );
-                aud_print( "Deleted ".$deleteLogByRowsSth->rows()." log table entries by count\n" ) if ( $deleteLogByRowsSth->rows() );
+                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() )
+                {
+                    aud_print( "Deleted ".$deleteLogByRowsSth->rows()
+                              ." log table entries by count\n" )
+                    ;
+                }
             }
         }
         else
         {
             # Time of record
-            my $deleteLogByTimeSql = "delete low_priority from Logs where TimeKey < unix_timestamp(now() - interval ".$Config{ZM_LOG_DATABASE_LIMIT}.")";
-            my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql ) or Fatal( "Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr() );
-            $res = $deleteLogByTimeSth->execute() or Fatal( "Can't execute: ".$deleteLogByTimeSth->errstr() );
-            aud_print( "Deleted ".$deleteLogByTimeSth->rows()." log table entries by time\n" ) if ( $deleteLogByTimeSth->rows() );
+            my $deleteLogByTimeSql =
+               "DELETE low_priority FROM Logs
+                WHERE TimeKey < unix_timestamp(now() - interval ".$Config{ZM_LOG_DATABASE_LIMIT}.")";
+            my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql )
+                or Fatal( "Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr() );
+            $res = $deleteLogByTimeSth->execute()
+                or Fatal( "Can't execute: ".$deleteLogByTimeSth->errstr() );
+            if ( $deleteLogByTimeSth->rows() ){
+                aud_print( "Deleted ".$deleteLogByTimeSth->rows()
+                          ." log table entries by time\n" )
+                ;
+            }
         }
     }
     $loop = $continuous;
@@ -443,7 +552,7 @@ MAIN: while( $loop ) {
 
 exit( 0 );
 
-sub aud_print( $ )
+sub aud_print
 {
     my $string = shift;
     if ( !$continuous )
@@ -456,7 +565,7 @@ sub aud_print( $ )
     }
 }
 
-sub confirm( ;$$ )
+sub confirm
 {
     my $prompt = shift || "delete";
     my $action = shift || "deleting";
@@ -496,7 +605,7 @@ sub confirm( ;$$ )
     return( $yesno );
 }
 
-sub deleteSwapImage()
+sub deleteSwapImage
 {
     my $file = $_;
 
diff --git a/scripts/zmcamtool.pl.in b/scripts/zmcamtool.pl.in
index cb4e036a9..eaa32edef 100644
--- a/scripts/zmcamtool.pl.in
+++ b/scripts/zmcamtool.pl.in
@@ -20,12 +20,43 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script provides a way to import new ptz camera controls & camera presets
-# into existing zoneminder systems. This script also provides a way to export
-# ptz camera controls & camera presets from an existing zoneminder system into
-# a sql file, which can then be easily imported to another zoneminder system.
-#
+
+=head1 NAME
+
+zmcamtool.pl - ZoneMinder tool to import camera controls and presets
+
+=head1 SYNOPSIS
+
+ zmcamtool.pl [--user=<dbuser> --pass=<dbpass>]
+              [--import [file.sql] [--overwrite]]
+              [--export [name]]
+              [--topreset id [--noregex]]
+
+=head1 DESCRIPTION
+
+This script provides a way to import new ptz camera controls & camera presets
+into existing zoneminder systems. This script also provides a way to export
+ptz camera controls & camera presets from an existing zoneminder system into
+a sql file, which can then be easily imported to another zoneminder system.
+
+=head1 OPTIONS
+
+ --export            - Export all camera controls and presets to STDOUT.
+                       Optionally specify a control or preset name.
+ --import [file.sql] - Import new camera controls and presets found in
+                       zm_create.sql into the ZoneMinder dB.
+                       Optionally specify an alternate sql file to read from.
+ --overwrite         - Overwrite any existing controls or presets.
+                       with the same name as the new controls or presets.
+ --topreset id       - Copy a monitor to a Camera Preset given the monitor id.
+ --noregex           - Do not try to find and replace fields such as usernames,
+                       passwords, IP addresses, etc with generic placeholders
+                       when converting a monitor to a preset.
+ --help              - Print usage information.
+ --user=<dbuser>     - Alternate dB user with privileges to alter dB.
+ --pass=<dbpass>     - Password of alternate dB user with privileges to alter dB.
+
+=cut
 use strict;
 use bytes;
 
@@ -35,6 +66,7 @@ use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Database qw(:all);
 use DBI;
 use Getopt::Long;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
@@ -57,256 +89,258 @@ my $dbUser = $Config{ZM_DB_USER};
 my $dbPass = $Config{ZM_DB_PASS};
 my $version = 0;
 
-# Process commandline parameters with getopt long
-if ( !GetOptions( 'export'=>\$export, 'import'=>\$import, 'overwrite'=>\$overwrite, 'help'=>\$help, 'topreset'=>\$topreset, 'noregex'=>\$noregex, 'user:s'=>\$dbUser, 'pass:s'=>\$dbPass, 'version'=>\$version ) ) {
-	Usage();
-}
+GetOptions(
+    'export'        =>\$export,
+    'import'        =>\$import,
+    'overwrite'     =>\$overwrite,
+    'help'          =>\$help,
+    'topreset'      =>\$topreset,
+    'noregex'       =>\$noregex,
+    'user:s'        =>\$dbUser,
+    'pass:s'        =>\$dbPass,
+    'version'       =>\$version
+) or pod2usage(-exitstatus => -1);
 
 $Config{ZM_DB_USER} = $dbUser;
 $Config{ZM_DB_PASS} = $dbPass;
 
 if ( $version ) {
-	print( ZoneMinder::Base::ZM_VERSION . "\n");
-	exit(0);
+    print( ZoneMinder::Base::ZM_VERSION . "\n");
+    exit(0);
 }
 # Check to make sure commandline params make sense
 if ( ((!$help) && ($import + $export + $topreset) != 1 )) {
-	print( STDERR qq/Please give only one of the following: "import", "export", or "topreset".\n/ );
-	Usage();
+    print( STDERR qq/Please give only one of the following: "import", "export", or "topreset".\n/ );
+    pod2usage(-exitstatus => -1);
 }
 
 if ( ($export)&&($overwrite) ) {
-	print( "Warning: Overwrite parameter ignored during an export.\n");
+    print( "Warning: Overwrite parameter ignored during an export.\n");
 }
 
 if ( ($noregex)&&(!$topreset) ) {
-	print( qq/Warning: Noregex parameter only applies when "topreset" parameter is also set. Ignoring.\n/);
+    print( qq/Warning: Noregex parameter only applies when "topreset" parameter is also set. Ignoring.\n/);
 }
 
 if ( ($topreset)&&($ARGV[0] !~ /\d\d*/) ) {
-	print( STDERR qq/Parameter "topreset" requires a valid monitor ID.\n/ );
-	Usage();
+    print( STDERR qq/Parameter "topreset" requires a valid monitor ID.\n/ );
+    pod2usage(-exitstatus => -1);
 }
 
 # Call the appropriate subroutine based on the params given on the commandline
 if ($help) {
-	Usage();
+    pod2usage(-exitstatus => -1);
 }
 
 if ($export) {
-	exportsql();
+    exportsql();
 }
 
 if ($import) {
-	importsql();
+    importsql();
 }
 
 if ($topreset) {
-	toPreset();
+    toPreset();
 }
 
 ###############
 # SUBROUTINES #
 ###############
 
-# Usage subroutine help text
-sub Usage
-{
-die("
-USAGE: 
-zmcamtool.pl [--user=<dbuser> --pass=<dbpass>]
-	     [--import [file.sql] [--overwrite]]
-	     [--export [name]]
-	     [--topreset id [--noregex]]
-
-PARAMETERS:
---export            - Export all camera controls and presets to STDOUT.
-		      Optionally specify a control or preset name.
---import [file.sql] - Import new camera controls and presets found in
-		      zm_create.sql into the ZoneMinder dB.
-		      Optionally specify an alternate sql file to read from.
---overwrite         - Overwrite any existing controls or presets.
-		      with the same name as the new controls or presets.
---topreset id       - Copy a monitor to a Camera Preset given the monitor id.
---noregex	    - Do not try to find and replace fields such as usernames,
-		      passwords, ip addresses, etc with generic placeholders
-		      when converting a monitor to a preset.
---help		    - Print usage information.
---user=<dbuser>     - Alternate dB user with privileges to alter dB.
---pass=<dbpass>     - Password of alternate dB user with privileges to alter dB.
-\n");
-}
-
 # Execute a pre-built sql select query
 sub selectQuery
 {
-	my $dbh = shift;
-	my $sql = shift;
-	my $monitorid = shift;
+    my $dbh = shift;
+    my $sql = shift;
+    my $monitorid = shift;
 
-	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute($monitorid) 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($monitorid)
+        or die( "Can't execute: ".$sth->errstr() );
 
-	my @data = $sth->fetchrow_array();
-	$sth->finish();
+    my @data = $sth->fetchrow_array();
+    $sth->finish();
 
-	return @data;
+    return @data;
 }
 
 # Exectute a pre-built sql query
 sub runQuery
 {
-	my $dbh = shift;
-	my $sql = shift;
-	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();
+    my $dbh = shift;
+    my $sql = shift;
+    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();
 
-	return $res;
+    return $res;
 }
 
 # Build and execute a sql insert query
 sub insertQuery
 {
-	my $dbh = shift;
-	my $tablename = shift;
-	my @data = @_;
+    my $dbh = shift;
+    my $tablename = shift;
+    my @data = @_;
 
-	my $sql = "insert into $tablename values (NULL,".(join ", ", ("?") x @data).")"; # Add "?" for each array element
+    my $sql = "INSERT INTO $tablename VALUES (NULL,"
+              .(join ", ", ("?") x @data).")"; # Add "?" for each array element
 
-	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute(@data) or die( "Can't execute: ".$sth->errstr() );
-	$sth->finish();
+    my $sth = $dbh->prepare_cached( $sql )
+        or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute(@data)
+        or die( "Can't execute: ".$sth->errstr() );
+    $sth->finish();
 
-	return $res;
+    return $res;
 }
 
 # Build and execute a sql delete query
 sub deleteQuery
 {
-	my $dbh = shift;
-	my $sqltable = shift;
-	my $sqlname = shift;
+    my $dbh = shift;
+    my $sqltable = shift;
+    my $sqlname = shift;
 
-	my $sql = "delete from $sqltable where Name = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute($sqlname) or die( "Can't execute: ".$sth->errstr() );
-	$sth->finish();
+    my $sql = "DELETE FROM $sqltable WHERE Name = ?";
+    my $sth = $dbh->prepare_cached( $sql )
+        or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute($sqlname)
+        or die( "Can't execute: ".$sth->errstr() );
+    $sth->finish();
 
-	return $res;
+    return $res;
 }
 
 # Build and execute a sql select count query
 sub checkExists
 {
-	my $dbh = shift;
-	my $sqltable = shift;
-	my $sqlname = shift;
-	my $result = 0;	
+    my $dbh = shift;
+    my $sqltable = shift;
+    my $sqlname = shift;
+    my $result = 0; 
 
-	my $sql = "select count(*) from $sqltable where Name = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute($sqlname) or die( "Can't execute: ".$sth->errstr() );
+    my $sql = "SELECT count(*) FROM $sqltable WHERE Name = ?";
+    my $sth = $dbh->prepare_cached( $sql )
+        or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute($sqlname)
+        or die( "Can't execute: ".$sth->errstr() );
 
-	my $rows = $sth->fetchrow_arrayref();
-	$sth->finish();
+    my $rows = $sth->fetchrow_arrayref();
+    $sth->finish();
 
-	if ($rows->[0] > 0) {
-		$result = 1;
-	}
+    if ($rows->[0] > 0) {
+        $result = 1;
+    }
 
-	return $result;
+    return $result;
 }
 
 # Import camera control & presets into the zoneminder dB
 sub importsql 
 {
-	my @newcontrols;
-	my @overwritecontrols;
-	my @skippedcontrols;
-	my @newpresets;
-	my @overwritepresets;
-	my @skippedpresets;
-	my %controls;
-	my %monitorpresets;
+    my @newcontrols;
+    my @overwritecontrols;
+    my @skippedcontrols;
+    my @newpresets;
+    my @overwritepresets;
+    my @skippedpresets;
+    my %controls;
+    my %monitorpresets;
 
-	if ($ARGV[0]) {
-		$sqlfile = $ARGV[0];
-	} else {
-		$sqlfile = $Config{ZM_PATH_DATA}.'/db/zm_create.sql';
-	}
+    if ($ARGV[0]) {
+        $sqlfile = $ARGV[0];
+    } else {
+        $sqlfile = $Config{ZM_PATH_DATA}.'/db/zm_create.sql';
+    }
 
-	open(my $SQLFILE,"<",$sqlfile) or die( "Can't Open file: $!\n" );
+    open(my $SQLFILE,"<",$sqlfile)
+        or die( "Can't Open file: $!\n" );
 
-	# Find and extract ptz control and monitor preset records
-	while (<$SQLFILE>) {
-		# Our regex replaces the primary key with NULL
-		if (s/^(INSERT INTO .*?Controls.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {	
-			$controls{$3} = $_;
-		} elsif (s/^(INSERT INTO .*?MonitorPresets.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {
-			$monitorpresets{$3} = $_;
-		}
-	}
-	close $SQLFILE;
+    # Find and extract ptz control and monitor preset records
+    while (<$SQLFILE>) {
+        # Our regex replaces the primary key with NULL
+        if (s/^(INSERT INTO .*?Controls.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {   
+            $controls{$3} = $_;
+        } elsif (s/^(INSERT INTO .*?MonitorPresets.*? VALUES \().*?(,')(.*?)(',.*)/$1NULL$2$3$4/i) {
+            $monitorpresets{$3} = $_;
+        }
+    }
+    close $SQLFILE;
 
-	if ( ! (%controls || %monitorpresets) ) {
-		die( "Error: No relevant data found in $sqlfile.\n" );
-	}
+    if ( ! (%controls || %monitorpresets) ) {
+        die( "Error: No relevant data found in $sqlfile.\n" );
+    }
 
-	# Now that we've got what we were looking for, compare to what is already in the dB
+    # Now that we've got what we were looking for,
+    # compare to what is already in the dB
 
-	my $dbh = zmDbConnect();
-	foreach (keys %controls) {
-		if (!checkExists($dbh,"Controls",$_)) {
-			# No existing Control was found.  Add new control to dB.
-			runQuery($dbh,$controls{$_});
-			push @newcontrols, $_;
-		} elsif ($overwrite) {
-			# An existing Control was found and the overwrite flag is set.  Overwrite the control.
-			deleteQuery($dbh,"Controls",$_);
-			runQuery($dbh,$controls{$_});
-			push @overwritecontrols, $_;
-		} else {
-			# An existing Control was found and the overwrite flag was not set. Do nothing.
-			push @skippedcontrols, $_;
-		}	
-	}
+    my $dbh = zmDbConnect();
+    foreach (keys %controls) {
+        if (!checkExists($dbh,"Controls",$_)) {
+            # No existing Control was found. Add new control to dB.
+            runQuery($dbh,$controls{$_});
+            push @newcontrols, $_;
+        } elsif ($overwrite) {
+            # An existing Control was found and the overwrite flag is set.
+            # Overwrite the control.
+            deleteQuery($dbh,"Controls",$_);
+            runQuery($dbh,$controls{$_});
+            push @overwritecontrols, $_;
+        } else {
+            # An existing Control was found and the overwrite flag was not set.
+            # Do nothing.
+            push @skippedcontrols, $_;
+        }   
+    }
 
-	foreach (keys %monitorpresets) {
-		if (!checkExists($dbh,"MonitorPresets",$_)) {
-			# No existing MonitorPreset was found.  Add new MonitorPreset to dB.
-			runQuery($dbh,$monitorpresets{$_});
-			push @newpresets, $_;
-		} elsif ($overwrite) {
-			# An existing MonitorPreset was found and the overwrite flag is set.  Overwrite the MonitorPreset.
-			deleteQuery($dbh,"MonitorPresets",$_);
-			runQuery($dbh,$monitorpresets{$_});
-			push @overwritepresets, $_;
-		} else {
-			# An existing MonitorPreset was found and the overwrite flag was not set. Do nothing.
-			push @skippedpresets, $_;
-		}
-	}
+    foreach (keys %monitorpresets) {
+        if (!checkExists($dbh,"MonitorPresets",$_)) {
+            # No existing MonitorPreset was found.  Add new MonitorPreset to dB.
+            runQuery($dbh,$monitorpresets{$_});
+            push @newpresets, $_;
+        } elsif ($overwrite) {
+            # An existing MonitorPreset was found and the overwrite flag is set.
+            # Overwrite the MonitorPreset.
+            deleteQuery($dbh,"MonitorPresets",$_);
+            runQuery($dbh,$monitorpresets{$_});
+            push @overwritepresets, $_;
+        } else {
+            # An existing MonitorPreset was found and the overwrite flag was
+            # not set. Do nothing.
+            push @skippedpresets, $_;
+        }
+    }
 
-	if (@newcontrols) {
-		print "Number of ptz camera controls added: ".scalar(@newcontrols)."\n";
-	}
-	if (@overwritecontrols) {
-		print "Number of existing ptz camera controls overwritten: ".scalar(@overwritecontrols)."\n";
-	}
-	if (@skippedcontrols) {
-		print "Number of existing ptz camera controls skipped: ".scalar(@skippedcontrols)."\n";
-	}
+    if (@newcontrols) {
+        print "Number of ptz camera controls added: "
+              .scalar(@newcontrols)."\n";
+    }
+    if (@overwritecontrols) {
+        print "Number of existing ptz camera controls overwritten: "
+              .scalar(@overwritecontrols)."\n";
+    }
+    if (@skippedcontrols) {
+        print "Number of existing ptz camera controls skipped: "
+              .scalar(@skippedcontrols)."\n";
+    }
 
-	if (@newpresets) {
-		print "Number of monitor presets added: ".scalar(@newpresets)."\n";
-	}
-	if (@overwritepresets) {
-		print "Number of existing monitor presets overwritten: ".scalar(@overwritepresets)."\n";
-	}
-	if (@skippedpresets) {
-		print "Number of existing presets skipped: ".scalar(@skippedpresets)."\n";
-	}
+    if (@newpresets) {
+        print "Number of monitor presets added: "
+              .scalar(@newpresets)."\n";
+    }
+    if (@overwritepresets) {
+        print "Number of existing monitor presets overwritten: "
+              .scalar(@overwritepresets)."\n";
+    }
+    if (@skippedpresets) {
+        print "Number of existing presets skipped: "
+              .scalar(@skippedpresets)."\n";
+    }
 }
 
 # Export camera controls & presets from the zoneminder dB to STDOUT
@@ -317,14 +351,14 @@ my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
 my $command = "mysqldump -t --skip-opt --compact -h".$host;
 $command .= " -P".$port if defined($port);
 if ( $dbUser ) {
-	$command .= " -u".$dbUser;
-	if ( $dbPass ) {
-		$command .= " -p".$dbPass;
-		}
-	}
+    $command .= " -u".$dbUser;
+    if ( $dbPass ) {
+        $command .= " -p".$dbPass;
+        }
+    }
 
 if ($ARGV[0]) {
-	$command .= qq( --where="Name = '$ARGV[0]'");
+    $command .= qq( --where="Name = '$ARGV[0]'");
 }
 
 $command .= " zm Controls MonitorPresets";
@@ -332,78 +366,81 @@ $command .= " zm Controls MonitorPresets";
 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" );
 } else {
-	# NULLify the primary keys before printing the output to STDOUT
-	$output =~ s/VALUES \((.*?),'/VALUES \(NULL,'/ig;
-	print $output;
-	}
+    # NULLify the primary keys before printing the output to STDOUT
+    $output =~ s/VALUES \((.*?),'/VALUES \(NULL,'/ig;
+    print $output;
+    }
 }
 
 sub toPreset
 {
-	my $dbh = zmDbConnect();
-	my $monitorid = $ARGV[0];
+    my $dbh = zmDbConnect();
+    my $monitorid = $ARGV[0];
 
-	# Grap the following fields from the Monitors table
-	my $sql = "select 
-			Name, 
-			Type, 
-			Device, 
-			Channel, 
-			Format, 
-			Protocol, 
-			Method, 
-			Host, 
-			Port, 
-			Path, 
-			SubPath, 
-			Width, 
-			Height, 
-			Palette, 
-			MaxFPS, 
-			Controllable, 
-			ControlId, 
-			ControlDevice, 
-			ControlAddress, 
-			DefaultRate, 
-			DefaultScale 
-		from Monitors where Id = ?";
-	my @data = selectQuery($dbh,$sql,$monitorid);
+    # Grap the following fields from the Monitors table
+    my $sql = "SELECT 
+            Name, 
+            Type, 
+            Device, 
+            Channel, 
+            Format, 
+            Protocol, 
+            Method, 
+            Host, 
+            Port, 
+            Path, 
+            SubPath, 
+            Width, 
+            Height, 
+            Palette, 
+            MaxFPS, 
+            Controllable, 
+            ControlId, 
+            ControlDevice, 
+            ControlAddress, 
+            DefaultRate, 
+            DefaultScale 
+        FROM Monitors WHERE Id = ?";
+    my @data = selectQuery($dbh,$sql,$monitorid);
 
-	if (!@data) {
-		die( "Error: Monitor Id $monitorid does not appear to exist in the database.\n" );
-	}
+    if (!@data) {
+        die( "Error: Monitor Id $monitorid does not appear to exist in the database.\n" );
+    }
 
-	# Attempt to search for and replace system specific values such as ip addresses, ports, usernames, etc. with generic placeholders
-	if (!$noregex) {
-		foreach (@data) {
-			s/\b(?:\d{1,3}\.){3}\d{1,3}\b/<ip-address>/; # ip address
-			s/<ip-address>:(6553[0-5]|655[0-2]\d|65[0-4]\d\d|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}|0)$/<ip-address>:<port>/; # tcpip port
-			s/\/\/.*:.*@/\/\/<username>:<pwd>@/; # user & pwd preceeding an ip address
-			s/(&|\?)(user|username)=\w\w*(&|\?)/$1$2=<username>$3/i; # username embeded in url
-			s/(&|\?)(pwd|password)=\w\w*(&|\?)/$1$2=<pwd>$3/i; # password embeded in url
-			s/\w\w*:\w\w*/<username>:<pwd>/; # user & pwd in their own field
-			s/\/dev\/video\d\d*/\/dev\/video<?>/; # local video devices
-		}
-	}
+    # Attempt to search for and replace system specific values such as
+    # ip addresses, ports, usernames, etc. with generic placeholders
+    if (!$noregex) {
+        foreach (@data) {
+            s/\b(?:\d{1,3}\.){3}\d{1,3}\b/<ip-address>/; # ip address
+            s/<ip-address>:(6553[0-5]|655[0-2]\d|65[0-4]\d\d|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}|0)$/<ip-address>:<port>/; # tcpip port
+            s/\/\/.*:.*@/\/\/<username>:<pwd>@/; # user & pwd preceeding an ip address
+            s/(&|\?)(user|username)=\w\w*(&|\?)/$1$2=<username>$3/i; # username embeded in url
+            s/(&|\?)(pwd|password)=\w\w*(&|\?)/$1$2=<pwd>$3/i; # password embeded in url
+            s/\w\w*:\w\w*/<username>:<pwd>/; # user & pwd in their own field
+            s/\/dev\/video\d\d*/\/dev\/video<?>/; # local video devices
+        }
+    }
 
-	if (!checkExists($dbh,"MonitorPresets",$data[0])) {
-		# No existing Preset was found.  Add new Preset to dB.
-		print "Adding new preset: $data[0]\n";
-		insertQuery($dbh,"MonitorPresets",@data);
-	} elsif ($overwrite) {
-		# An existing Control was found and the overwrite flag is set.  Overwrite the control.
-		print "Existing preset $data[0] detected.\nOverwriting...\n";
-		deleteQuery($dbh,"MonitorPresets",$data[0]);
-		insertQuery($dbh,"MonitorPresets",@data);
-	} else {
-		# An existing Control was found and the overwrite flag was not set. Do nothing.
-		print "Existing preset $data[0] detected and overwrite flag not set.\nSkipping...\n";
-	}
+    if (!checkExists($dbh,"MonitorPresets",$data[0])) {
+        # No existing Preset was found.  Add new Preset to dB.
+        print "Adding new preset: $data[0]\n";
+        insertQuery($dbh,"MonitorPresets",@data);
+    } elsif ($overwrite) {
+        # An existing Control was found and the overwrite flag is set.
+        # Overwrite the control.
+        print "Existing preset $data[0] detected.\nOverwriting...\n";
+        deleteQuery($dbh,"MonitorPresets",$data[0]);
+        insertQuery($dbh,"MonitorPresets",@data);
+    } else {
+        # An existing Control was found and the overwrite flag was not set.
+        # Do nothing.
+        print "Existing preset $data[0] detected and overwrite flag not set.\nSkipping...\n";
+    }
 }
 
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index 817b80cf6..ee078f9a0 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -20,16 +20,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script continuously monitors the recorded events for the given
-# monitor and applies any filters which would delete and/or upload 
-# matching events
-#
+
+=head1 NAME
+
+zmcontrol.pl - ZoneMinder control script
+
+=head1 SYNOPSIS
+
+ zmcontrol.pl --id {monitor_id} --command={command} [various options]
+
+=head1 DESCRIPTION
+
+FIXME FIXME
+
+=head1 OPTIONS
+
+ --autostop          -
+ --xcoord [ arg ]    - X-coord
+ --ycoord [ arg ]    - Y-coord
+ --speed [ arg ]     - Speed
+ --step [ arg ]      -
+ --panspeed [ arg ]  -
+ --panstep [ arg ]   -
+ --tiltspeed [ arg ] -
+ --tiltstep [ arg ]  -
+ --preset [ arg ]    -
+
+=cut
 use strict;
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
 use Getopt::Long;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 use POSIX qw/strftime EPIPE/;
 use Socket;
 #use Data::Dumper;
@@ -44,14 +67,6 @@ $ENV{PATH}  = '/bin:/usr/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-sub Usage
-{
-    print( "
-Usage: zmcontrol.pl --id <monitor_id> --command=<command> <various options>
-");
-    exit();
-}
-
 logInit();
 
 my $arg_string = join( " ", @ARGV );
@@ -59,29 +74,25 @@ my $arg_string = join( " ", @ARGV );
 my $id;
 my %options;
 
-if ( !GetOptions(
-    'id=i'=>\$id,
-    'command=s'=>\$options{command},
-    'xcoord=i'=>\$options{xcoord},
-    'ycoord=i'=>\$options{ycoord},
-    'speed=i'=>\$options{speed},
-    'step=i'=>\$options{step},
-    'panspeed=i'=>\$options{panspeed},
-    'tiltspeed=i'=>\$options{tiltspeed},
-    'panstep=i'=>\$options{panstep},
-    'tiltstep=i'=>\$options{tiltstep},
-    'preset=i'=>\$options{preset},
-    'autostop'=>\$options{autostop},
-    )
-)
-{
-    Usage();
-}
+GetOptions(
+    'id=i'          =>\$id,
+    'command=s'     =>\$options{command},
+    'xcoord=i'      =>\$options{xcoord},
+    'ycoord=i'      =>\$options{ycoord},
+    'speed=i'       =>\$options{speed},
+    'step=i'        =>\$options{step},
+    'panspeed=i'    =>\$options{panspeed},
+    'tiltspeed=i'   =>\$options{tiltspeed},
+    'panstep=i'     =>\$options{panstep},
+    'tiltstep=i'    =>\$options{tiltstep},
+    'preset=i'      =>\$options{preset},
+    'autostop'      =>\$options{autostop},
+) or pod2usage(-exitstatus => -1);
 
 if ( !$id || !$options{command} )
 {
     print( STDERR "Please give a valid monitor id and command\n" );
-    Usage();
+    pod2usage(-exitstatus => -1);
 }
 
 ( $id ) = $id =~ /^(\w+)$/;
@@ -90,13 +101,14 @@ Debug( $arg_string );
 
 my $sock_file = $Config{ZM_PATH_SOCKS}.'/zmcontrol-'.$id.'.sock';
 
-socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
+socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
+    or Fatal( "Can't open socket: $!" );
 
 my $saddr = sockaddr_un( $sock_file );
 my $server_up = connect( CLIENT, $saddr );
 if ( !$server_up )
 {
-    # The server isn't there 
+    # The server isn't there
     my $monitor = zmDbGetMonitorAndControl( $id );
     if ( !$monitor )
     {
@@ -129,16 +141,17 @@ if ( !$server_up )
     Info( "Starting control server $id/$protocol" );
     close( CLIENT );
 
-	if ( ! can_load( modules => { "ZoneMinder::Control::$protocol" => undef } ) ) {
-		Fatal("Can't load ZoneMinder::Control::$protocol");
-	}
+    if ( ! can_load( modules => { "ZoneMinder::Control::$protocol" => undef } ) ) {
+        Fatal("Can't load ZoneMinder::Control::$protocol");
+    }
 
     if ( my $cpid = fork() )
     {
         logReinit();
 
         # Parent process just sleep and fall through
-        socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 ) or die( "Can't open socket: $!" );
+        socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
+            or die( "Can't open socket: $!" );
         my $attempts = 0;
         while (!connect( CLIENT, $saddr ))
         {
@@ -156,7 +169,9 @@ if ( !$server_up )
 
         logReinit();
 
-        Info( "Control server $id/$protocol starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() ) );
+        Info( "Control server $id/$protocol starting at "
+              .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        );
 
         $0 = $0." --id $id";
 
@@ -166,7 +181,8 @@ if ( !$server_up )
 
         $control->open();
 
-        socket( SERVER, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
+        socket( SERVER, PF_UNIX, SOCK_STREAM, 0 )
+            or Fatal( "Can't open socket: $!" );
         unlink( $sock_file );
         bind( SERVER, $saddr ) or Fatal( "Can't bind: $!" );
         listen( SERVER, SOMAXCONN ) or Fatal( "Can't listen: $!" );
@@ -193,9 +209,9 @@ if ( !$server_up )
 
                     my $command = $params->{command};
                     close( CLIENT );
-					if ( $command eq 'quit' ) {
-						last;
-					}
+                    if ( $command eq 'quit' ) {
+                        last;
+                    }
                     $control->$command( $params );
                 }
                 else
@@ -220,7 +236,9 @@ if ( !$server_up )
                 last;
             }
         }
-        Info( "Control server $id/$protocol exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() ) );
+        Info( "Control server $id/$protocol exiting at "
+              .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        );
         unlink( $sock_file );
         $control->close();
         exit( 0 );
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index c209ae63f..981f7364e 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -20,13 +20,30 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script is the gateway for controlling the various ZoneMinder
-# daemons. All starting, stopping and restarting goes through here.
-# On the first invocation it starts up a server which subsequently
-# records what's running and what's not. Other invocations just 
-# connect to the server and pass instructions to it.
-#
+
+=head1 NAME
+
+zmdc.pl - ZoneMinder Daemon Control script
+
+=head1 SYNOPSIS
+
+ zmdc.pl {command} [daemon [options]]
+
+=head1 DESCRIPTION
+
+This script is the gateway for controlling the various ZoneMinder
+daemons. All starting, stopping and restarting goes through here.
+On the first invocation it starts up a server which subsequently
+records what's running and what's not. Other invocations just
+connect to the server and pass instructions to it.
+
+=head1 OPTIONS
+
+ {command}           - One of 'startup|shutdown|status|check|logrot' or
+                       'start|stop|restart|reload|version'.
+ [daemon [options]]  - Daemon name and options, required for second group of commands
+
+=cut
 use strict;
 use bytes;
 
@@ -49,6 +66,7 @@ use ZoneMinder;
 use POSIX;
 use Socket;
 use IO::Handle;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 #use Data::Dumper;
 
 use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmdc.sock';
@@ -72,34 +90,22 @@ my @daemons = (
     'zmtrack.pl'
 );
 
-sub Usage
-{   
-    print( "
-Usage: zmdc.pl <command> [daemon [options]]
-Parameters are :-
-<command>           - One of 'startup|shutdown|status|check|logrot' or
-                      'start|stop|restart|reload|version'.
-[daemon [options]]  - Daemon name and options, required for second group of commands
-");     
-    exit( -1 );
-}
-
 my $command = shift @ARGV;
 if( !$command )
 {
     print( STDERR "No command given\n" );
-    Usage();
+    pod2usage(-exitstatus => -1);
 }
 if ( $command eq 'version' ) {
-	print ZoneMinder::Base::ZM_VERSION."\n";
-	exit( 0 );
+    print ZoneMinder::Base::ZM_VERSION."\n";
+    exit( 0 );
 }
 my $needs_daemon = $command !~ /(?:startup|shutdown|status|check|logrot|version)/;
 my $daemon = shift( @ARGV );
 if( $needs_daemon && !$daemon )
 {
     print( STDERR "No daemon given\n" );
-    Usage();
+    pod2usage(-exitstatus => -1);
 }
 my @args;
 
@@ -113,7 +119,7 @@ if ( $needs_daemon )
     else
     {
         print( STDERR "Invalid daemon '$daemon' specified" );
-        Usage();
+        pod2usage(-exitstatus => -1);
     }
 }
 
@@ -152,7 +158,7 @@ if ( !$server_up )
         print( "Unable to connect to server\n" );
         exit( -1 );
     }
-    # The server isn't there 
+    # The server isn't there
     print( "Starting server\n" );
     close( CLIENT );
 
@@ -235,12 +241,15 @@ sub run
 
     logInit();
 
-    dPrint( ZoneMinder::Logger::INFO, "Server starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+    dPrint( ZoneMinder::Logger::INFO, "Server starting at "
+        .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        ."\n"
+    );
 
-    if ( open( PID, ">".ZM_PID ) )
+    if ( open( my $PID, '>', ZM_PID ) )
     {
-        print( PID $$ );
-        close( PID );
+        print( $PID $$ );
+        close( $PID );
     }
 
     killAll( 1 );
@@ -354,7 +363,10 @@ sub run
             restartPending();
         }
     }
-    dPrint( ZoneMinder::Logger::INFO, "Server exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+    dPrint( ZoneMinder::Logger::INFO, "Server exiting at "
+        .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        ."\n"
+    );
     unlink( main::SOCK_FILE );
     unlink( ZM_PID );
     exit();
@@ -413,7 +425,10 @@ sub start
     }
     elsif ( $process->{pid} && $pid_hash{$process->{pid}} )
     {
-        dPrint( ZoneMinder::Logger::INFO, "'$process->{command}' already running at ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) ).", pid = $process->{pid}\n" );
+        dPrint( ZoneMinder::Logger::INFO, "'$process->{command}' already running at "
+            .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) )
+            .", pid = $process->{pid}\n"
+        );
         return();
     }
 
@@ -428,7 +443,10 @@ sub start
         $process->{started} = time();
         delete( $process->{pending} );
 
-        dPrint( ZoneMinder::Logger::INFO, "'$command' starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) ).", pid = $process->{pid}\n" );
+        dPrint( ZoneMinder::Logger::INFO, "'$command' starting at "
+            .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) )
+            .", pid = $process->{pid}\n"
+        );
 
         $cmd_hash{$process->{command}} = $pid_hash{$cpid} = $process;
         sigprocmask( SIG_SETMASK, $sigset ) or Fatal( "Can't restore SIGCHLD: $!" );
@@ -437,7 +455,11 @@ sub start
     {
         logReinit();
 
-        dPrint( ZoneMinder::Logger::INFO, "'".join( ' ', ( $daemon, @args ) )."' started at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+        dPrint( ZoneMinder::Logger::INFO, "'".join( ' ', ( $daemon, @args ) )
+            ."' started at "
+            .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+            ."\n"
+        );
 
         if ( $daemon =~ /^${daemon_patt}$/ )
         {
@@ -501,7 +523,10 @@ sub _stop
     elsif ( $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() )."\n" );
+        dPrint( ZoneMinder::Logger::INFO, "Command '$command' removed from pending list at "
+            .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+            ."\n"
+        );
         return();
     }
 
@@ -512,7 +537,11 @@ sub _stop
         return();
     }
 
-    dPrint( ZoneMinder::Logger::INFO, "'$daemon ".join( ' ', @args )."' stopping at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+    dPrint( ZoneMinder::Logger::INFO, "'$daemon ".join( ' ', @args )
+        ."' stopping at "
+        .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        ."\n"
+    );
     $process->{keepalive} = !$final;
     kill( 'TERM', $cpid );
     delete( $cmd_hash{$command} );
@@ -694,7 +723,10 @@ sub shutdownAll
         stop( $process->{daemon}, @{$process->{args}} );
     }
     killAll( 5 );
-    dPrint( ZoneMinder::Logger::INFO, "Server shutdown at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+    dPrint( ZoneMinder::Logger::INFO, "Server shutdown at "
+        .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+        ."\n"
+    );
     unlink( main::SOCK_FILE );
     unlink( ZM_PID );
     close( CLIENT );
@@ -750,7 +782,10 @@ sub status
 
         if ( $process->{pending} )
         {
-            dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' pending at ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{pending}) )."\n" );
+            dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' pending at "
+                .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{pending}) )
+                ."\n"
+            );
         }
         else
         {
@@ -761,13 +796,19 @@ sub status
                 return();
             }
         }
-        dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' running since ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) ).", pid = $process->{pid}" );
+        dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' running since "
+            .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) )
+            .", pid = $process->{pid}"
+        );
     }
     else
     {
         foreach my $process ( values(%pid_hash) )
         {
-            my $out_str = "'$process->{command}' running since ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) ).", pid = $process->{pid}";
+            my $out_str = "'$process->{command}' running since "
+                .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{started}) )
+                .", pid = $process->{pid}"
+            ;
             $out_str .= ", valid" if ( kill( 0, $process->{pid} ) );
             $out_str .= "\n";
             dPrint( ZoneMinder::Logger::DEBUG, $out_str );
@@ -776,7 +817,10 @@ sub status
         {
             if ( $process->{pending} )
             {
-                dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' pending at ".strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{pending}) )."\n" );
+                dPrint( ZoneMinder::Logger::DEBUG, "'$process->{command}' pending at "
+                    .strftime( '%y/%m/%d %H:%M:%S', localtime( $process->{pending}) )
+                    ."\n"
+                );
             }
         }
     }
@@ -786,19 +830,23 @@ sub killAll
 {
     my $delay = shift;
     sleep( $delay );
-	my $killall;
-	if ( '@HOST_OS@' eq 'BSD' ) {
-		$killall = 'killall -';
-	} else {
-		$killall = 'killall -q -s ';
-	}
-    foreach my $daemon ( @daemons ) {
+        my $killall;
+        if ( '@HOST_OS@' eq 'BSD' )
+        {
+            $killall = 'killall -';
+	} elsif ( '@HOST_OS@' eq 'solaris' ) {
+	    $killall = 'pkill -';
+        } else {
+            $killall = 'killall -q -s ';
+        }
+    foreach my $daemon ( @daemons )
+    {
 
-		my $cmd = $killall ."TERM $daemon";
-		Debug( $cmd );
-		qx( $cmd );
-	}
-	sleep( $delay );
+            my $cmd = $killall ."TERM $daemon";
+            Debug( $cmd );
+            qx( $cmd );
+    }
+    sleep( $delay );
     foreach my $daemon ( @daemons )
     {
         my $cmd = $killall."KILL $daemon";
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index e8f8d998f..54f372262 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -20,11 +20,27 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script continuously monitors the recorded events for the given
-# monitor and applies any filters which would delete and/or upload 
-# matching events
-#
+
+=head1 NAME
+
+zmfilter.pl - ZoneMinder tool to filter events
+
+=head1 SYNOPSIS
+
+ zmfilter.pl [-f <filter name>,--filter=<filter name>] | -v, --version
+
+=head1 DESCRIPTION
+
+This script continuously monitors the recorded events for the given
+monitor and applies any filters which would delete and/or upload
+matching events.
+
+=head1 OPTIONS
+
+ -f{filter name}, --filter={filter name}  - The name of a specific filter to run
+ -v, --version                            - Print ZoneMinder version
+
+=cut
 use strict;
 use bytes;
 
@@ -49,9 +65,13 @@ use POSIX;
 use Time::HiRes qw/gettimeofday/;
 use Date::Manip;
 use Getopt::Long;
-use Data::Dumper;
+use autouse 'Pod::Usage'=>qw(pod2usage);
+use autouse 'Data::Dumper'=>qw(Dumper);
 
-use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)?$Config{ZM_DIR_EVENTS}:($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS});
+use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
+             ? $Config{ZM_DIR_EVENTS}
+             : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
+;
 
 logInit();
 logSetSignal();
@@ -105,7 +125,6 @@ if ( $Config{ZM_OPT_MESSAGE} )
     }
 }
 
-
 $| = 1;
 
 $ENV{PATH}  = '/bin:/usr/bin';
@@ -117,16 +136,6 @@ my $event_id = 0;
 my $filter_parm = "";
 my $version = 0;
 
-sub Usage
-{
-    print( "
-Usage: zmfilter.pl [-f <filter name>,--filter=<filter name>] | -v, --version
-Parameters are :-
--f<filter name>, --filter=<filter name>  - The name of a specific filter to run
-");
-    exit( -1 );
-}
-
 #
 # More or less replicates the equivalent PHP function
 #
@@ -159,13 +168,14 @@ sub DateTimeToSQL
     return( strftime( "%Y-%m-%d %H:%M:%S", localtime( $dt_val ) ) );
 }
 
-if ( !GetOptions( 'filter=s'=>\$filter_parm, version=>\$version ) )
-{
-    Usage();
-}
+GetOptions(
+    'filter=s'      =>\$filter_parm,
+    'version'       =>\$version
+) or pod2usage(-exitstatus => -1);
+
 if ( $version ) {
-	print ZoneMinder::Base::ZM_VERSION . "\n";
-	exit(0);
+    print ZoneMinder::Base::ZM_VERSION . "\n";
+    exit(0);
 }
 
 if ( ! EVENT_PATH ) {
@@ -196,7 +206,7 @@ my $last_action = 0;
 
 while( 1 )
 {
-	my $now = time;
+    my $now = time;
     if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} )
     {
         Debug( "Reloading filters\n" );
@@ -257,7 +267,7 @@ sub getFilters
     my $filter_name = shift;
 
     my @filters;
-    my $sql = "select * from Filters where";
+    my $sql = "SELECT * FROM Filters WHERE";
     if ( $filter_name )
     {
         $sql .= " Name = ? and";
@@ -266,22 +276,56 @@ sub getFilters
     {
         $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) order by Name";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    $sql .= "(  AutoArchive = 1
+                or AutoVideo = 1
+                or AutoUpload = 1
+                or AutoEmail = 1
+                or AutoMessage = 1
+                or AutoExecute = 1
+                or AutoDelete = 1
+             ) ORDER BY Name";
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res;
     if ( $filter_name )
     {
-        $res = $sth->execute( $filter_name ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        $res = $sth->execute( $filter_name )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
     }
     else
     {
-        $res = $sth->execute() or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        $res = $sth->execute()
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
     }
     FILTER: while( my $db_filter = $sth->fetchrow_hashref() )
     {
         Debug( "Found filter '$db_filter->{Name}'\n" );
         my $filter_expr = jsonDecode( $db_filter->{Query} );
-        my $sql = "select E.Id,E.MonitorId,M.Name as MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.Cause,E.Notes,E.StartTime,unix_timestamp(E.StartTime) as Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed from Events as E inner join Monitors as M on M.Id = E.MonitorId";
+        my $sql = "SELECT E.Id,
+                          E.MonitorId,
+                          M.Name as MonitorName,
+                          M.DefaultRate,
+                          M.DefaultScale,
+                          E.Name,
+                          E.Cause,
+                          E.Notes,
+                          E.StartTime,
+                          unix_timestamp(E.StartTime) as Time,
+                          E.Length,
+                          E.Frames,
+                          E.AlarmFrames,
+                          E.TotScore,
+                          E.AvgScore,
+                          E.MaxScore,
+                          E.Archived,
+                          E.Videoed,
+                          E.Uploaded,
+                          E.Emailed,
+                          E.Messaged,
+                          E.Executed
+                   FROM Events as E
+                   INNER JOIN Monitors as M on M.Id = E.MonitorId
+        ";
         $db_filter->{Sql} = '';
 
         if ( $filter_expr->{terms} )
@@ -348,7 +392,10 @@ sub getFilters
                         {
                             $value = "'$temp_value'";
                         }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name' || $filter_expr->{terms}[$i]->{attr} eq 'Cause' || $filter_expr->{terms}[$i]->{attr} eq 'Notes' )
+                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name'
+                                || $filter_expr->{terms}[$i]->{attr} eq 'Cause'
+                                || $filter_expr->{terms}[$i]->{attr} eq 'Notes'
+                        )
                         {
                             $value = "'$temp_value'";
                         }
@@ -357,7 +404,8 @@ sub getFilters
                             $value = DateTimeToSQL( $temp_value );
                             if ( !$value )
                             {
-                                Error( "Error parsing date/time '$temp_value', skipping filter '$db_filter->{Name}'\n" );
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$db_filter->{Name}'\n" );
                                 next FILTER;
                             }
                             $value = "'$value'";
@@ -367,7 +415,8 @@ sub getFilters
                             $value = DateTimeToSQL( $temp_value );
                             if ( !$value )
                             {
-                                Error( "Error parsing date/time '$temp_value', skipping filter '$db_filter->{Name}'\n" );
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$db_filter->{Name}'\n" );
                                 next FILTER;
                             }
                             $value = "to_days( '$value' )";
@@ -377,7 +426,8 @@ sub getFilters
                             $value = DateTimeToSQL( $temp_value );
                             if ( !$value )
                             {
-                                Error( "Error parsing date/time '$temp_value', skipping filter '$db_filter->{Name}'\n" );
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$db_filter->{Name}'\n" );
                                 next FILTER;
                             }
                             $value = "extract( hour_second from '$value' )";
@@ -469,7 +519,7 @@ sub getFilters
         my $sort_column = '';
         if ( $filter_expr->{sort_field} eq 'Id' )
         {
-            $sort_column = "E.Id"; 
+            $sort_column = "E.Id";
         }
         elsif ( $filter_expr->{sort_field} eq 'MonitorName' )
         {
@@ -525,13 +575,15 @@ sub getFilters
             $script =~ s/\s.*$//;
             if ( !-e $script )
             {
-                Error( "Auto execute script '$script' not found, skipping filter '$db_filter->{Name}'\n" );
+                Error( "Auto execute script '$script' not found, "
+                      ."skipping filter '$db_filter->{Name}'\n" );
                 next FILTER;
 
             }
             elsif ( !-x $script )
             {
-                Error( "Auto execute script '$script' not executable, skipping filter '$db_filter->{Name}'\n" );
+                Error( "Auto execute script '$script' not executable, "
+                      ."skipping filter '$db_filter->{Name}'\n" );
                 next FILTER;
             }
         }
@@ -557,7 +609,7 @@ sub checkFilter
         "\n"
     );
     my $sql = $filter->{Sql};
-    
+
     if ( $filter->{HasDiskPercent} )
     {
         my $disk_percent = getDiskPercent();
@@ -574,7 +626,8 @@ sub checkFilter
         $sql =~ s/zmSystemLoad/$load/g;
     }
 
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute();
     if ( !$res )
     {
@@ -591,8 +644,10 @@ sub checkFilter
             Info( "Archiving event $event->{Id}\n" );
             # Do it individually to avoid locking up the table for new events
             my $sql = "update Events set Archived = 1 where Id = ?";
-            my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-            my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+            my $sth = $dbh->prepare_cached( $sql )
+                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+            my $res = $sth->execute( $event->{Id} )
+                or Fatal( "Can't execute '$sql': ".$sth->errstr() );
         }
         if ( $Config{ZM_OPT_FFMPEG} && $filter->{AutoVideo} )
         {
@@ -636,18 +691,24 @@ sub checkFilter
                 Info( "Deleting event $event->{Id} from Monitor $event->{MonitorId}\n" );
                 # Do it individually to avoid locking up the table for new events
                 my $sql = "delete from Events where Id = ?";
-                my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+                my $sth = $dbh->prepare_cached( $sql )
+                    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+                my $res = $sth->execute( $event->{Id} )
+                    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 
                 if ( ! $Config{ZM_OPT_FAST_DELETE} )
                 {
                     my $sql = "delete from Frames where EventId = ?";
-                    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                    my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+                    my $sth = $dbh->prepare_cached( $sql )
+                        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+                    my $res = $sth->execute( $event->{Id} )
+                        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 
                     $sql = "delete from Stats where EventId = ?";
-                    $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                    $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+                    $sth = $dbh->prepare_cached( $sql )
+                        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+                    $res = $sth->execute( $event->{Id} )
+                        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 
                     deleteEventFiles( $event->{Id}, $event->{MonitorId} );
                 }
@@ -699,7 +760,8 @@ sub generateVideo
         $format = $ffmpeg_formats[0];
     }
 
-    my $command = $Config{ZM_PATH_BIN}."/zmvideo.pl -e ".$event->{Id}." -r ".$rate." -s ".$scale." -f ".$format;
+    my $command = $Config{ZM_PATH_BIN}."/zmvideo.pl -e "
+                  .$event->{Id}." -r ".$rate." -s ".$scale." -f ".$format;
     my $output = qx($command);
     chomp( $output );
     my $status = $? >> 8;
@@ -719,11 +781,13 @@ sub generateVideo
     else
     {
         my $sql = "update Events set Videoed = 1 where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{Id} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
         if ( wantarray() )
         {
-            return( $format, sprintf( "%s/%s", getEventPath( $event ), $output ) ); 
+            return( $format, sprintf( "%s/%s", getEventPath( $event ), $output ) );
         }
     }
     return( 1 );
@@ -741,7 +805,15 @@ sub uploadArchFile
     }
 
     my $archFile = $event->{MonitorName}.'-'.$event->{Id};
-    my $archImagePath = getEventPath( $event )."/".(( $Config{ZM_UPLOAD_ARCH_ANALYSE} )?'{*analyse,*capture}':'*capture').".jpg";
+    my $archImagePath = getEventPath( $event )
+                       ."/"
+                       .(
+                            ( $Config{ZM_UPLOAD_ARCH_ANALYSE} )
+                            ? '{*analyse,*capture}'
+                            : '*capture'
+                        )
+                       .".jpg"
+    ;
     my @archImageFiles = glob($archImagePath);
     my $archLocPath;
 
@@ -764,7 +836,10 @@ sub uploadArchFile
                 $archError = 1;
                 last;
             }
-            $member->desiredCompressionMethod( $Config{ZM_UPLOAD_ARCH_COMPRESS} ? &COMPRESSION_DEFLATED : &COMPRESSION_STORED );
+            $member->desiredCompressionMethod( $Config{ZM_UPLOAD_ARCH_COMPRESS}
+                                               ? &COMPRESSION_DEFLATED
+                                               : &COMPRESSION_STORED
+            );
         }
         if ( !$archError )
         {
@@ -793,7 +868,12 @@ sub uploadArchFile
         $archLocPath = $Config{ZM_UPLOAD_LOC_DIR}.'/'.$archFile;
         Info( "Creating upload file '$archLocPath', ".int(@archImageFiles)." files\n" );
 
-        if ( $archError = !Archive::Tar->create_archive( $archLocPath, $Config{ZM_UPLOAD_ARCH_COMPRESS}, @archImageFiles ) )
+        if ( $archError = !Archive::Tar->create_archive(
+                                $archLocPath,
+                                $Config{ZM_UPLOAD_ARCH_COMPRESS},
+                                @archImageFiles
+                          )
+           )
         {
             Error( "Tar error: ".Archive::Tar->error()."\n " );
         }
@@ -808,42 +888,63 @@ sub uploadArchFile
         if ( $Config{ZM_UPLOAD_PROTOCOL} eq "ftp" )
         {
             Info( "Uploading to ".$Config{ZM_UPLOAD_HOST}." using FTP\n" );
-            my $ftp = Net::FTP->new( $Config{ZM_UPLOAD_HOST}, Timeout=>$Config{ZM_UPLOAD_TIMEOUT}, Passive=>$Config{ZM_UPLOAD_FTP_PASSIVE}, Debug=>$Config{ZM_UPLOAD_DEBUG} );
+            my $ftp = Net::FTP->new(
+                $Config{ZM_UPLOAD_HOST},
+                Timeout=>$Config{ZM_UPLOAD_TIMEOUT},
+                Passive=>$Config{ZM_UPLOAD_FTP_PASSIVE},
+                Debug=>$Config{ZM_UPLOAD_DEBUG}
+            );
             if ( !$ftp )
             {
                 Error( "Can't create FTP connection: $@" );
                 return( 0 );
             }
-            $ftp->login( $Config{ZM_UPLOAD_USER}, $Config{ZM_UPLOAD_PASS} ) or Error( "FTP - Can't login" );
-            $ftp->binary() or Error( "FTP - Can't go binary" );
-            $ftp->cwd( $Config{ZM_UPLOAD_REM_DIR} ) or Error( "FTP - Can't cwd" ) if ( $Config{ZM_UPLOAD_REM_DIR} );
-            $ftp->put( $archLocPath ) or Error( "FTP - Can't upload '$archLocPath'" );
-            $ftp->quit() or Error( "FTP - Can't quit" );
+            $ftp->login( $Config{ZM_UPLOAD_USER}, $Config{ZM_UPLOAD_PASS} )
+                or Error( "FTP - Can't login" );
+            $ftp->binary()
+                or Error( "FTP - Can't go binary" );
+            $ftp->cwd( $Config{ZM_UPLOAD_REM_DIR} )
+                or Error( "FTP - Can't cwd" )
+                if ( $Config{ZM_UPLOAD_REM_DIR} );
+            $ftp->put( $archLocPath )
+                or Error( "FTP - Can't upload '$archLocPath'" );
+            $ftp->quit()
+                or Error( "FTP - Can't quit" );
         }
         else
         {
             my $host = $Config{ZM_UPLOAD_HOST};
-            $host .= ":".$Config{ZM_UPLOAD_PORT} if $Config{ZM_UPLOAD_PORT};
+            $host .= ":".$Config{ZM_UPLOAD_PORT}
+                if $Config{ZM_UPLOAD_PORT};
             Info( "Uploading to ".$host." using SFTP\n" );
             my %sftpOptions = ( host=>$Config{ZM_UPLOAD_HOST}, user=>$Config{ZM_UPLOAD_USER} );
-            $sftpOptions{password} = $Config{ZM_UPLOAD_PASS} if $Config{ZM_UPLOAD_PASS};
-            $sftpOptions{port} = $Config{ZM_UPLOAD_PORT} if $Config{ZM_UPLOAD_PORT};
-            $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT} if $Config{ZM_UPLOAD_TIMEOUT};
+            $sftpOptions{password} = $Config{ZM_UPLOAD_PASS}
+                if $Config{ZM_UPLOAD_PASS};
+            $sftpOptions{port} = $Config{ZM_UPLOAD_PORT}
+                if $Config{ZM_UPLOAD_PORT};
+            $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
+                if $Config{ZM_UPLOAD_TIMEOUT};
             $sftpOptions{more} = [ '-o'=>'StrictHostKeyChecking=no' ];
-            $Net::SFTP::Foreign::debug = -1 if $Config{ZM_UPLOAD_DEBUG};
+            $Net::SFTP::Foreign::debug = -1
+                if $Config{ZM_UPLOAD_DEBUG};
             my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );
             if ( $sftp->error )
             {
                 Error( "Can't create SFTP connection: ".$sftp->error );
                 return( 0 );
             }
-            $sftp->setcwd( $Config{ZM_UPLOAD_REM_DIR} ) or Error( "SFTP - Can't setcwd: ".$sftp->error ) if $Config{ZM_UPLOAD_REM_DIR};
-            $sftp->put( $archLocPath, $archFile ) or Error( "SFTP - Can't upload '$archLocPath': ".$sftp->error );
+            $sftp->setcwd( $Config{ZM_UPLOAD_REM_DIR} )
+                or Error( "SFTP - Can't setcwd: ".$sftp->error )
+                if $Config{ZM_UPLOAD_REM_DIR};
+            $sftp->put( $archLocPath, $archFile )
+                or Error( "SFTP - Can't upload '$archLocPath': ".$sftp->error );
         }
         unlink( $archLocPath );
         my $sql = "update Events set Uploaded = 1 where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{Id} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
     }
     return( 1 );
 }
@@ -864,9 +965,28 @@ sub substituteTags
     if ( $need_monitor )
     {
         my $db_now = strftime( "%Y-%m-%d %H:%M:%S", localtime() );
-        my $sql = "select M.Id, count(E.Id) as EventCount, count(if(E.Archived,1,NULL)) as ArchEventCount, count(if(E.StartTime>'$db_now' - INTERVAL 1 HOUR && E.Archived = 0,1,NULL)) as HourEventCount, count(if(E.StartTime>'$db_now' - INTERVAL 1 DAY && E.Archived = 0,1,NULL)) as DayEventCount, count(if(E.StartTime>'$db_now' - INTERVAL 7 DAY && E.Archived = 0,1,NULL)) as WeekEventCount, count(if(E.StartTime>'$db_now' - INTERVAL 1 MONTH && E.Archived = 0,1,NULL)) as MonthEventCount from Monitors as M left join Events as E on E.MonitorId = M.Id where MonitorId = ? group by E.MonitorId order by Id";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{MonitorId} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        my $sql = "SELECT
+            M.Id,
+            count(E.Id) as EventCount,
+            count(if(E.Archived,1,NULL))
+                as ArchEventCount,
+            count(if(E.StartTime>'$db_now' - INTERVAL 1 HOUR && E.Archived = 0,1,NULL))
+                as HourEventCount,
+            count(if(E.StartTime>'$db_now' - INTERVAL 1 DAY && E.Archived = 0,1,NULL))
+                as DayEventCount,
+            count(if(E.StartTime>'$db_now' - INTERVAL 7 DAY && E.Archived = 0,1,NULL))
+                as WeekEventCount,
+            count(if(E.StartTime>'$db_now' - INTERVAL 1 MONTH && E.Archived = 0,1,NULL))
+                as MonthEventCount
+            FROM Monitors as M LEFT JOIN Events as E on E.MonitorId = M.Id
+            WHERE MonitorId = ?
+            GROUP BY E.MonitorId
+            ORDER BY Id"
+        ;
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{MonitorId} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
         $monitor = $sth->fetchrow_hashref();
         $sth->finish();
         return() if ( !$monitor );
@@ -879,9 +999,14 @@ sub substituteTags
     my $max_alarm_score = 0;
     if ( $need_images )
     {
-        my $sql = "select * from Frames where EventId = ? and Type = 'Alarm' order by FrameId";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        my $sql = "SELECT * FROM Frames
+                   WHERE EventId = ? AND Type = 'Alarm'
+                   ORDER BY FrameId"
+        ;
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{Id} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
         while( my $frame = $sth->fetchrow_hashref() )
         {
             if ( !$first_alarm_frame )
@@ -929,14 +1054,34 @@ sub substituteTags
         $text =~ s/%EPIM%/$url?view=frame&mid=$event->{MonitorId}&eid=$event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
         if ( $attachments_ref && $text =~ s/%EI1%//g )
         {
-            push( @$attachments_ref, { type=>"image/jpeg", path=>sprintf( "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg", getEventPath( $event ), $first_alarm_frame->{FrameId} ) } );
+            push( @$attachments_ref,
+                {
+                    type=>"image/jpeg",
+                    path=>sprintf(
+                        "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg",
+                        getEventPath( $event ),
+                        $first_alarm_frame->{FrameId}
+                    )
+                }
+            );
         }
         if ( $attachments_ref && $text =~ s/%EIM%//g )
         {
             # Don't attach the same image twice
-            if ( !@$attachments_ref || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} ) )
+            if ( !@$attachments_ref
+                 || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
+            )
             {
-                push( @$attachments_ref, { type=>"image/jpeg", path=>sprintf( "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg", getEventPath( $event ), $max_alarm_frame->{FrameId} ) } );
+                push( @$attachments_ref,
+                    {
+                        type=>"image/jpeg",
+                        path=>sprintf(
+                            "%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg",
+                            getEventPath( $event ),
+                            $max_alarm_frame->{FrameId}
+                        )
+                    }
+                );
             }
         }
     }
@@ -964,7 +1109,7 @@ sub substituteTags
     $text =~ s/%FN%/$filter->{Name}/g;
     ( my $filter_name = $filter->{Name} ) =~ s/ /+/g;
     $text =~ s/%FP%/$url?view=filter&mid=$event->{MonitorId}&filter_name=$filter_name/g;
-    
+
     return( $text );
 }
 
@@ -1023,7 +1168,7 @@ sub sendEmail
             ### Send the Message
             MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
             $mail->send();
-        } 
+        }
         else
         {
             my $mail = MIME::Entity->build(
@@ -1056,8 +1201,10 @@ sub sendEmail
         Info( "Notification email sent\n" );
     }
     my $sql = "update Events set Emailed = 1 where Id = ?";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $event->{Id} )
+        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 
     return( 1 );
 }
@@ -1117,7 +1264,7 @@ sub sendMessage
             ### Send the Message
             MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
             $mail->send();
-        } 
+        }
         else
         {
             my $mail = MIME::Entity->build(
@@ -1137,7 +1284,9 @@ sub sendMessage
                     Encoding => "base64"
                 );
             }
-            $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST}, MailFrom => $Config{ZM_FROM_EMAIL} );
+            $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST},
+                             MailFrom => $Config{ZM_FROM_EMAIL}
+            );
         }
     };
     if ( $@ )
@@ -1150,8 +1299,10 @@ sub sendMessage
         Info( "Notification message sent\n" );
     }
     my $sql = "update Events set Messaged = 1 where Id = ?";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    my $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $event->{Id} )
+        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 
     return( 1 );
 }
@@ -1182,8 +1333,10 @@ sub executeCommand
     else
     {
         my $sql = "update Events set Executed = 1 where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+        my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $event->{Id} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
     }
     return( 1 );
 }
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 084747bad..362f4f6a6 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -20,10 +20,21 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script is used to start and stop the ZoneMinder package primarily to
-# allow command line control for automatic restart on reboot (see zm script)
-#
+
+=head1 NAME
+
+zmpkg.pl - ZoneMinder Package Control Script
+
+=head1 SYNOPSIS
+
+ zmpkg.pl {start|stop|restart|status|logrot|'state'|version}
+
+=head1 DESCRIPTION
+
+This script is used to start and stop the ZoneMinder package primarily to
+allow command line control for automatic restart on reboot (see zm script)
+
+=cut
 use strict;
 use bytes;
 
@@ -38,6 +49,7 @@ use ZoneMinder;
 use DBI;
 use POSIX;
 use Time::HiRes qw/gettimeofday/;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 
 # Detaint our environment
 $ENV{PATH}  = '/bin:/usr/bin';
@@ -46,10 +58,10 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 
-my $command = $ARGV[0];
+my $command = $ARGV[0]||'';
 if ( $command eq 'version' ) {
-	print ZoneMinder::Base::ZM_VERSION . "\n";
-	exit(0);
+    print ZoneMinder::Base::ZM_VERSION . "\n";
+    exit(0);
 }
 
 my $state;
@@ -58,39 +70,43 @@ my $dbh;
 
 if ( !$command || $command !~ /^(?:start|stop|restart|status|logrot|version)$/ )
 {
-	if ( $command )
-	{
-		$dbh = zmDbConnect();
-		# Check to see if it's a valid run state
-		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 ) or Fatal( "Can't execute: ".$sth->errstr() );
-		if ( $state = $sth->fetchrow_hashref() )
-		{
-			$state->{Name} = $command;
-			$state->{Definitions} = [];
-			foreach( split( /,/, $state->{Definition} ) )
-			{
-				my ( $id, $function, $enabled ) = split( /:/, $_ );
-				push( @{$state->{Definitions}}, { Id=>$id, Function=>$function, Enabled=>$enabled } );
-			}
-			$command = 'state';
-		}
-		else
-		{
-			$command = undef;
-		}
-	}
-	if ( !$command )
-	{
-		print( "Usage: zmpkg.pl <start|stop|restart|status|logrot|'state'|version>\n" );
-		exit( -1 );
-	}
+    if ( $command )
+    {
+        $dbh = zmDbConnect();
+        # Check to see if it's a valid run state
+        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 )
+            or Fatal( "Can't execute: ".$sth->errstr() );
+        if ( $state = $sth->fetchrow_hashref() )
+        {
+            $state->{Name} = $command;
+            $state->{Definitions} = [];
+            foreach( split( /,/, $state->{Definition} ) )
+            {
+                my ( $id, $function, $enabled ) = split( /:/, $_ );
+                push( @{$state->{Definitions}},
+                      { Id=>$id, Function=>$function, Enabled=>$enabled }
+                );
+            }
+            $command = 'state';
+        }
+        else
+        {
+            $command = undef;
+        }
+    }
+    if ( !$command )
+    {
+        pod2usage(-exitstatus => -1);
+    }
 }
 $dbh = zmDbConnect() if ! $dbh;
 
 # Move to the right place
-chdir( $Config{ZM_PATH_WEB} ) or Fatal( "Can't chdir to '".$Config{ZM_PATH_WEB}."': $!" );
+chdir( $Config{ZM_PATH_WEB} )
+    or Fatal( "Can't chdir to '".$Config{ZM_PATH_WEB}."': $!" );
 
 my $dbg_id = "";
 
@@ -100,209 +116,232 @@ my $retval = 0;
 
 if ( $command eq "state" )
 {
-	Info( "Updating DB: $state->{Name}\n" );
-	my $sql = "select * from Monitors order by Id asc";
-	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() )
-	{
-		foreach my $definition ( @{$state->{Definitions}} )
-		{
-			if ( $monitor->{Id} =~ /^$definition->{Id}$/ )
-			{
-				$monitor->{NewFunction} = $definition->{Function};
-				$monitor->{NewEnabled} = $definition->{Enabled};
-			}
-		}
-		#next if ( !$monitor->{NewFunction} );
-		$monitor->{NewFunction} = 'None' if ( !$monitor->{NewFunction} );
-		$monitor->{NewEnabled} = 0 if ( !$monitor->{NewEnabled} );
-		if ( $monitor->{Function} ne $monitor->{NewFunction} || $monitor->{Enabled} ne $monitor->{NewEnabled} )
-		{
-			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} ) or Fatal( "Can't execute: ".$sth->errstr() );
-		}
-	}
-	$sth->finish();
+    Info( "Updating DB: $state->{Name}\n" );
+    my $sql = "select * from Monitors order by Id asc";
+    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() )
+    {
+        foreach my $definition ( @{$state->{Definitions}} )
+        {
+            if ( $monitor->{Id} =~ /^$definition->{Id}$/ )
+            {
+                $monitor->{NewFunction} = $definition->{Function};
+                $monitor->{NewEnabled} = $definition->{Enabled};
+            }
+        }
+        #next if ( !$monitor->{NewFunction} );
+        $monitor->{NewFunction} = 'None'
+            if ( !$monitor->{NewFunction} );
+        $monitor->{NewEnabled} = 0
+            if ( !$monitor->{NewEnabled} );
+        if ( $monitor->{Function} ne $monitor->{NewFunction}
+             || $monitor->{Enabled} ne $monitor->{NewEnabled}
+        )
+        {
+            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} )
+                or Fatal( "Can't execute: ".$sth->errstr() );
+        }
+    }
+    $sth->finish();
 
-	$command = "restart";
+    $command = "restart";
 }
 
 # Check if we are running systemd and if we have been called by the system
 if ( $command =~ /^(start|stop|restart)$/ )
 {
-	# We have to detaint to keep perl from complaining
-	$command = $1;
+    # We have to detaint to keep perl from complaining
+    $command = $1;
 
-	if ( systemdRunning() && !calledBysystem() ) {
-		qx(@BINDIR@/zmsystemctl.pl $command);
-		$command = "";
-	}
+    if ( systemdRunning() && !calledBysystem() ) {
+        qx(@BINDIR@/zmsystemctl.pl $command);
+        $command = "";
+    }
 }
 
 if ( $command =~ /^(?:stop|restart)$/ )
 {
-	my $status = runCommand( "zmdc.pl check" );
+    my $status = runCommand( "zmdc.pl check" );
 
-	if ( $status eq "running" )
-	{
-		runCommand( "zmdc.pl shutdown" );
-		zmMemTidy();
-	}
-	else
-	{
-		$retval = 1;
-	}
+    if ( $status eq "running" )
+    {
+        runCommand( "zmdc.pl shutdown" );
+        zmMemTidy();
+    }
+    else
+    {
+        $retval = 1;
+    }
 }
 
 #runCommand( "zmupdate.pl -f" );
 
 if ( $command =~ /^(?:start|restart)$/ )
 {
-	my $status = runCommand( "zmdc.pl check" );
+    my $status = runCommand( "zmdc.pl check" );
 
-	if ( $status eq "stopped" )
-	{
-        if ( $Config{ZM_DYN_DB_VERSION} and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION ) )
+    if ( $status eq "stopped" )
+    {
+        if ( $Config{ZM_DYN_DB_VERSION}
+             and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
+        )
         {
-            Fatal( "Version mismatch, system is version ".ZM_VERSION.", database is ".$Config{ZM_DYN_DB_VERSION}.", please run zmupdate.pl to update." );
+            Fatal( "Version mismatch, system is version ".ZM_VERSION
+                   .", database is ".$Config{ZM_DYN_DB_VERSION}
+                   .", please run zmupdate.pl to update."
+            );
             exit( -1 );
         }
 
         # Recreate the temporary directory if it's been wiped
-	verifyFolder("@ZM_TMPDIR@");
+        verifyFolder("@ZM_TMPDIR@");
 
         # Recreate the run directory if it's been wiped
-	verifyFolder("@ZM_RUNDIR@");
+        verifyFolder("@ZM_RUNDIR@");
 
         # Recreate the sock directory if it's been wiped
-	verifyFolder("@ZM_SOCKDIR@");
+        verifyFolder("@ZM_SOCKDIR@");
 
-		zmMemTidy();
-		runCommand( "zmdc.pl startup" );
+        zmMemTidy();
+        runCommand( "zmdc.pl startup" );
 
-		my $sql = "select * from Monitors";
-		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 ( $monitor->{Function} ne 'None' )
-			{
-				if ( $monitor->{Type} eq 'Local' )
-				{
-					runCommand( "zmdc.pl start zmc -d $monitor->{Device}" );
-				}
-				else
-				{
-					runCommand( "zmdc.pl start zmc -m $monitor->{Id}" );
-				}
-				if ( $monitor->{Function} ne 'Monitor' )
-				{
-					if ( $Config{ZM_OPT_FRAME_SERVER} )
-					{
-						runCommand( "zmdc.pl start zmf -m $monitor->{Id}" );
-					}
-					runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
-				}
-				if ( $Config{ZM_OPT_CONTROL} )
-				{
-					if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' )
-					{
-						if ( $monitor->{Controllable} && $monitor->{TrackMotion} )
-						{
-							runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
-						}
-					}
-				}
-			}
-		}
-		$sth->finish();
+        my $sql = "select * from Monitors";
+        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 ( $monitor->{Function} ne 'None' )
+            {
+                if ( $monitor->{Type} eq 'Local' )
+                {
+                    runCommand( "zmdc.pl start zmc -d $monitor->{Device}" );
+                }
+                else
+                {
+                    runCommand( "zmdc.pl start zmc -m $monitor->{Id}" );
+                }
+                if ( $monitor->{Function} ne 'Monitor' )
+                {
+                    if ( $Config{ZM_OPT_FRAME_SERVER} )
+                    {
+                        runCommand( "zmdc.pl start zmf -m $monitor->{Id}" );
+                    }
+                    runCommand( "zmdc.pl start zma -m $monitor->{Id}" );
+                }
+                if ( $Config{ZM_OPT_CONTROL} )
+                {
+                    if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' )
+                    {
+                        if ( $monitor->{Controllable} && $monitor->{TrackMotion} )
+                        {
+                            runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
+                        }
+                    }
+                }
+            }
+        }
+        $sth->finish();
 
-		# This is now started unconditionally
-		runCommand( "zmdc.pl start zmfilter.pl" );
-		if ( $Config{ZM_RUN_AUDIT} )
-		{
-			runCommand( "zmdc.pl start zmaudit.pl -c" );
-		}
-		if ( $Config{ZM_OPT_TRIGGERS} )
-		{
-			runCommand( "zmdc.pl start zmtrigger.pl" );
-		}
-		if ( $Config{ZM_OPT_X10} )
-		{
-			runCommand( "zmdc.pl start zmx10.pl -c start" );
-		}
-		runCommand( "zmdc.pl start zmwatch.pl" );
-		if ( $Config{ZM_CHECK_FOR_UPDATES} )
-		{
-			runCommand( "zmdc.pl start zmupdate.pl -c" );
-		}
-	}
-	else
-	{
-		$retval = 1;
-	}
+        # This is now started unconditionally
+        runCommand( "zmdc.pl start zmfilter.pl" );
+        if ( $Config{ZM_RUN_AUDIT} )
+        {
+            runCommand( "zmdc.pl start zmaudit.pl -c" );
+        }
+        if ( $Config{ZM_OPT_TRIGGERS} )
+        {
+            runCommand( "zmdc.pl start zmtrigger.pl" );
+        }
+        if ( $Config{ZM_OPT_X10} )
+        {
+            runCommand( "zmdc.pl start zmx10.pl -c start" );
+        }
+        runCommand( "zmdc.pl start zmwatch.pl" );
+        if ( $Config{ZM_CHECK_FOR_UPDATES} )
+        {
+            runCommand( "zmdc.pl start zmupdate.pl -c" );
+        }
+    }
+    else
+    {
+        $retval = 1;
+    }
 }
 
 if ( $command eq "status" )
 {
-	my $status = runCommand( "zmdc.pl check" );
+    my $status = runCommand( "zmdc.pl check" );
 
-	print( STDOUT $status."\n" );
+    print( STDOUT $status."\n" );
 }
 
 if ( $command eq "logrot" )
 {
-	runCommand( "zmdc.pl logrot" );
+    runCommand( "zmdc.pl logrot" );
 }
 
 exit( $retval );
 
 sub systemdRunning
 {
-	my $result = 0;
+    my $result = 0;
 
-	my $output = qx(ps -o comm="" 1);
-	chomp( $output );
+    my $output = qx(ps -o comm="" -p 1);
+    chomp( $output );
 
-	if ($output =~ /systemd/) {
-		$result = 1;
-	}
+    if ($output =~ /systemd/) {
+        $result = 1;
+    }
 
-	return $result;
+    return $result;
 }
 
 sub calledBysystem
 {
-	my $result = 0;
-	my $ppid = getppid();
+    my $result = 0;
+    my $ppid = getppid();
 
-	my $output = qx(ps -o comm="" $ppid);
-	chomp( $output );
+    my $output = qx(ps -o comm="" -p $ppid);
+    chomp( $output );
 
-	if ($output =~ /^(?:systemd|init)$/) {
-		$result = 1;
-	}
+    if ($output =~ /^(?:systemd|init)$/) {
+        $result = 1;
+    }
 
-	return $result;
+    return $result;
 }
 
 sub verifyFolder
 {
-	my $folder = shift;
+    my $folder = shift;
 
         # Recreate the temporary directory if it's been wiped
         if ( !-e $folder )
         {
             Debug( "Recreating directory '$folder'" );
-            mkdir( "$folder", 0774 ) or Fatal( "Can't create missing temporary directory '$folder': $!" );
+            mkdir( "$folder", 0774 )
+                or Fatal( "Can't create missing temporary directory '$folder': $!" );
             my ( $runName ) = getpwuid( $> );
             if ( $runName ne $Config{ZM_WEB_USER} )
             {
-                # Not running as web user, so should be root in which case chown the directory
-                my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} ) or Fatal( "Can't get user details for web user '".$Config{ZM_WEB_USER}."': $!" );
-                chown( $webUid, $webGid, "$folder" ) or Fatal( "Can't change ownership of directory '$folder' to '".$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!" );
+                # Not running as web user, so should be root in which case
+                # chown the directory
+                my ( $webName, $webPass, $webUid, $webGid ) = getpwnam( $Config{ZM_WEB_USER} )
+                    or Fatal( "Can't get user details for web user '"
+                              .$Config{ZM_WEB_USER}."': $!"
+                       );
+                chown( $webUid, $webGid, "$folder" )
+                    or Fatal( "Can't change ownership of directory '$folder' to '"
+                              .$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!"
+                       );
             }
         }
 }
diff --git a/scripts/zmsystemctl.pl.in b/scripts/zmsystemctl.pl.in
index 450fc2189..c825d891b 100644
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@@ -2,7 +2,7 @@
 #
 # ==========================================================================
 #
-# ZoneMinder Update Script, $Date$, $Revision$
+# ZoneMinder systemctl wrapper, $Date$, $Revision$
 # Copyright (C) 2001-2008 Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -20,25 +20,39 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This is a wrapper script that allows zoneminder to start and stop itself
-# in a manner that keeps it in-sync with systemd.  This script is intended
-# to be called internally by zoneminder and may not give the desired results
-# if run from the command line.
-#
+
+=head1 NAME
+
+zmsystemctl.pl - ZoneMinder systemctl wrapper
+
+=head1 SYNOPSIS
+
+ zmsystemctl.pl {start|stop|restart|version}
+
+=head1 DESCRIPTION
+
+This is a wrapper script that allows zoneminder to start and stop itself
+in a manner that keeps it in-sync with systemd.  This script is intended
+to be called internally by zoneminder and may not give the desired results
+if run from the command line.
+
+=cut
 use warnings;
 use strict;
 use bytes;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 
 @EXTRA_PERL_LIB@
 use ZoneMinder::Logger qw(:all);
 
 my $command = $ARGV[0];
 
-if ( (scalar(@ARGV) == 1) && ($command =~ /^(start|stop|restart|version)$/ )) {
-	$command = $1;
+if ( (scalar(@ARGV) == 1)
+     && ($command =~ /^(start|stop|restart|version)$/ )
+){
+    $command = $1;
 } else {
-	die(" USAGE: zmsystemctl.pl <start|stop|restart|version>\n");
+    pod2usage(-exitstatus => -1);
 }
 
 my $path = qx(which systemctl);
@@ -46,7 +60,7 @@ chomp($path);
 
 my $status = $? >> 8;
 if ( !$path || $status ) {
-	Fatal( "Unable to determine systemctl executable. Is systemd in use?" );
+    Fatal( "Unable to determine systemctl executable. Is systemd in use?" );
 }
 
 Info( "Redirecting command through systemctl\n" );
diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in
index f3a5a0e15..b1eec2d7e 100644
--- a/scripts/zmtrack.pl.in
+++ b/scripts/zmtrack.pl.in
@@ -20,10 +20,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script is used to trigger and cancel alarms from external sources
-# using an arbitrary text based format
-#
+
+=head1 NAME
+
+zmtrack.pl - ZoneMinder Experimental PTZ Tracking Script
+
+=head1 SYNOPSIS
+
+ zmtrack.pl -m <monitor>
+ zmtrack.pl --monitor=<monitor>
+
+=head1 OPTIONS
+
+ -m<monitor>, --monitor=<monitor>   - Id of the monitor to track
+
+=head1 DESCRIPTION
+
+This script is used to trigger and cancel alarms from external sources
+using an arbitrary text based format.
+
+=cut
 use strict;
 use bytes;
 
@@ -45,8 +61,9 @@ use constant SLEEP_TIME => 10000; # In microseconds
 use ZoneMinder;
 use DBI;
 use POSIX;
-use Data::Dumper;
+use autouse 'Data::Dumper'=>qw(Dumper);
 use Getopt::Long;
+use autouse 'Pod::Usage'=>qw(pod2usage);
 use Time::HiRes qw( usleep );
 
 $| = 1;
@@ -57,20 +74,8 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my $mid = 0;
 
-sub Usage
-{
-	print( "
-		Usage: zmtrack.pl -m <monitor>,--monitor=<monitor>]
-		Parameters are :-
-		-m<monitor>, --monitor=<monitor>   - Id of the monitor to track
-		");
-	exit( -1 );
-}   
-
-if ( !GetOptions( 'monitor=s'=>\$mid ) )
-{
-	Usage();
-}
+GetOptions( 'monitor=s'=>\$mid )
+    or pod2usage(-exitstatus => -1);
 
 logInit();
 logSetSignal();
@@ -78,44 +83,52 @@ logSetSignal();
 my ( $detaint_mid ) = $mid =~ /^(\d+)$/;
 $mid = $detaint_mid;
 
-print( "Tracker daemon $mid (experimental) starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
+print( "Tracker daemon $mid (experimental) starting at "
+       .strftime( '%y/%m/%d %H:%M:%S', localtime() )
+       ."\n"
+);
 
 my $dbh = zmDbConnect();
 
-my $sql = "select C.*,M.* from Monitors as M left join Controls as C on M.ControlId = C.Id where M.Id = ?";
-my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+my $sql = "SELECT C.*,M.* FROM Monitors as M
+           LEFT JOIN Controls as C on M.ControlId = C.Id
+           WHERE M.Id = ?"
+;
+my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
 
-my $res = $sth->execute( $mid ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+my $res = $sth->execute( $mid )
+    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
 my $monitor = $sth->fetchrow_hashref();
 
 if ( !$monitor )
 {
-	print( "Can't find monitor '$mid'\n" );
-	exit( -1 );
+    print( "Can't find monitor '$mid'\n" );
+    exit( -1 );
 }
 if ( !$monitor->{Controllable} )
 {
-	print( "Monitor '$mid' is not controllable\n" );
-	exit( -1 );
+    print( "Monitor '$mid' is not controllable\n" );
+    exit( -1 );
 }
 if ( !$monitor->{TrackMotion} )
 {
-	print( "Monitor '$mid' is not configured to track motion\n" );
-	exit( -1 );
+    print( "Monitor '$mid' is not configured to track motion\n" );
+    exit( -1 );
 }
 
 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 );
-	}
+    print( "Monitor '$mid' cannot move in map mode" );
+    if ( $monitor->{CanMoveRel} )
+    {
+        print( ", falling back to pseudo map mode\n" );
+    }
+    else
+    {
+        print( "\n" );
+        exit( -1 );
+    }
 }
 
 Debug( "Found monitor for id '$monitor'\n" );
@@ -123,84 +136,100 @@ exit( -1 ) if ( !zmMemVerify( $monitor ) );
 
 sub Suspend
 {
-	my $monitor = shift;
-	zmMonitorSuspend( $monitor );
+    my $monitor = shift;
+    zmMonitorSuspend( $monitor );
 }
 
 sub Resume
 {
-	my $monitor = shift;
-	sleep( $monitor->{TrackDelay} );
-	zmMonitorResume( $monitor );
+    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;
+    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};
-	$ctrlCommand .= " --command=".($monitor->{CanMoveMap}?"moveMap":"movePseudoMap")." --xcoord=$x --ycoord=$y";
-	executeShellCommand( $ctrlCommand );
+    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 $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 );
+    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 );
 }
 
 my $last_alarm = 0;
 if ( ($monitor->{ReturnLocation} >= 0) )
 {
-	Suspend( $monitor );
-	Return( $monitor );
-	Resume( $monitor );
+    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;
-		}
-	}
-	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;
-		}
-	}
-	usleep( SLEEP_TIME );
+    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;
+        }
+    }
+    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;
+        }
+    }
+    usleep( SLEEP_TIME );
 }
diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 7dbca9898..e43b00bbb 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -20,11 +20,17 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script is used to trigger and cancel alarms from external connections
-# using an arbitrary text based format
-#
-# ==========================================================================
+
+=head1 NAME
+
+zmtrigger.pl - ZoneMinder External Trigger Script
+
+=head1 DESCRIPTION
+
+This script is used to trigger and cancel alarms from external connections
+using an arbitrary text based format
+
+=cut
 use strict;
 use bytes;
 
@@ -52,8 +58,22 @@ use ZoneMinder::Trigger::Channel::Serial;
 use ZoneMinder::Trigger::Connection;
 
 my @connections;
-push( @connections, ZoneMinder::Trigger::Connection->new( name=>"Chan1", channel=>ZoneMinder::Trigger::Channel::Inet->new( port=>6802 ), mode=>"rw" ) );
-push( @connections, ZoneMinder::Trigger::Connection->new( name=>"Chan2", channel=>ZoneMinder::Trigger::Channel::Unix->new( path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock' ), mode=>"rw" ) );
+push( @connections,
+      ZoneMinder::Trigger::Connection->new(
+        name=>"Chan1",
+        channel=>ZoneMinder::Trigger::Channel::Inet->new( port=>6802 ),
+        mode=>"rw"
+      )
+);
+push( @connections,
+      ZoneMinder::Trigger::Connection->new(
+        name=>"Chan2",
+        channel=>ZoneMinder::Trigger::Channel::Unix->new(
+                    path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock'
+                 ),
+        mode=>"rw"
+      )
+);
 #push( @connections, ZoneMinder::Trigger::Connection->new( name=>"Chan3", channel=>ZoneMinder::Trigger::Channel::File->new( path=>'/tmp/zmtrigger.out' ), mode=>"w" ) );
 #push( @connections, ZoneMinder::Trigger::Connection->new( name=>"Chan4", channel=>ZoneMinder::Trigger::Channel::Serial->new( path=>'/dev/ttyS0' ), mode=>"rw" ) );
 
@@ -65,7 +85,7 @@ push( @connections, ZoneMinder::Trigger::Connection->new( name=>"Chan2", channel
 
 use DBI;
 #use Socket;
-use Data::Dumper;
+use autouse 'Data::Dumper'=>qw(Dumper);
 use POSIX qw( EINTR );
 use Time::HiRes qw( usleep );
 
@@ -85,8 +105,8 @@ my $dbh = zmDbConnect();
 my $base_rin = '';
 foreach my $connection ( @connections )
 {
-	Info( "Opening connection '$connection->{name}'\n" );
-	$connection->open();
+    Info( "Opening connection '$connection->{name}'\n" );
+    $connection->open();
 }
 
 my @in_select_connections = grep { $_->input() && $_->selectable() } @connections;
@@ -95,7 +115,7 @@ my @out_connections = grep { $_->output() } @connections;
 
 foreach my $connection ( @in_select_connections )
 {
-	vec( $base_rin, $connection->fileno(), 1 ) = 1;
+    vec( $base_rin, $connection->fileno(), 1 ) = 1;
 }
 
 my %spawned_connections;
@@ -111,332 +131,387 @@ my $timeout = SELECT_TIMEOUT;
 my %actions;
 while( 1 )
 {
-	$rin = $base_rin;
-	# Add the file descriptors of any spawned connections
-	foreach my $fileno ( keys(%spawned_connections) )
-	{
-		vec( $rin, $fileno, 1 ) = 1;
-	}
+    $rin = $base_rin;
+    # Add the file descriptors of any spawned connections
+    foreach my $fileno ( keys(%spawned_connections) )
+    {
+        vec( $rin, $fileno, 1 ) = 1;
+    }
 
-	my $nfound = select( my $rout = $rin, undef, my $eout = $ein, $timeout );
-	if ( $nfound > 0 )
-	{
-		Debug( "Got input from $nfound connections\n" );
-		foreach my $connection ( @in_select_connections )
-		{
-			if ( vec( $rout, $connection->fileno(), 1 ) )
-			{
-				Debug( "Got input from connection ".$connection->name()." (".$connection->fileno().")\n" );
-				if ( $connection->spawns() )
-				{
-					my $new_connection = $connection->accept();
-					$spawned_connections{$new_connection->fileno()} = $new_connection;
-					Debug( "Added new spawned connection (".$new_connection->fileno()."), ".int(keys(%spawned_connections))." spawned connections\n" );
-				}
-				else
-				{
-					my $messages = $connection->getMessages();
-					if ( defined($messages) )
-					{
-						foreach my $message ( @$messages )
-						{
-							handleMessage( $connection, $message );
-						}
-					}
-				}
-			}
-		}
-		foreach my $connection ( values(%spawned_connections) )
-		{
-			if ( vec( $rout, $connection->fileno(), 1 ) )
-			{
-				Debug( "Got input from spawned connection ".$connection->name()." (".$connection->fileno().")\n" );
-				my $messages = $connection->getMessages();
-				if ( defined($messages) )
-				{
-					foreach my $message ( @$messages )
-					{
-						handleMessage( $connection, $message );
-					}
-				}
-				else
-				{
-					delete( $spawned_connections{$connection->fileno()} );
-					Debug( "Removed spawned connection (".$connection->fileno()."), ".int(keys(%spawned_connections))." spawned connections\n" );
-					$connection->close();
-				}
-			}
-		}
-	}
-	elsif ( $nfound < 0 )
-	{
-		if ( $! == EINTR )
-		{
-			# Do nothing
-		}
-		else
-		{
-			Fatal( "Can't select: $!" );
-		}
-	}
+    my $nfound = select( my $rout = $rin, undef, my $eout = $ein, $timeout );
+    if ( $nfound > 0 )
+    {
+        Debug( "Got input from $nfound connections\n" );
+        foreach my $connection ( @in_select_connections )
+        {
+            if ( vec( $rout, $connection->fileno(), 1 ) )
+            {
+                Debug( "Got input from connection "
+                       .$connection->name()
+                       ." ("
+                       .$connection->fileno()
+                       .")\n"
+                );
+                if ( $connection->spawns() )
+                {
+                    my $new_connection = $connection->accept();
+                    $spawned_connections{$new_connection->fileno()} = $new_connection;
+                    Debug( "Added new spawned connection ("
+                           .$new_connection->fileno()
+                           ."), "
+                           .int(keys(%spawned_connections))
+                           ." spawned connections\n"
+                    );
+                }
+                else
+                {
+                    my $messages = $connection->getMessages();
+                    if ( defined($messages) )
+                    {
+                        foreach my $message ( @$messages )
+                        {
+                            handleMessage( $connection, $message );
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $connection ( values(%spawned_connections) )
+        {
+            if ( vec( $rout, $connection->fileno(), 1 ) )
+            {
+                Debug( "Got input from spawned connection "
+                       .$connection->name()
+                       ." ("
+                       .$connection->fileno()
+                       .")\n"
+                );
+                my $messages = $connection->getMessages();
+                if ( defined($messages) )
+                {
+                    foreach my $message ( @$messages )
+                    {
+                        handleMessage( $connection, $message );
+                    }
+                }
+                else
+                {
+                    delete( $spawned_connections{$connection->fileno()} );
+                    Debug( "Removed spawned connection ("
+                           .$connection->fileno()
+                           ."), "
+                           .int(keys(%spawned_connections))
+                           ." spawned connections\n"
+                    );
+                    $connection->close();
+                }
+            }
+        }
+    }
+    elsif ( $nfound < 0 )
+    {
+        if ( $! == EINTR )
+        {
+            # Do nothing
+        }
+        else
+        {
+            Fatal( "Can't select: $!" );
+        }
+    }
 
-	# Check polled connections
-	foreach my $connection ( @in_poll_connections )
-	{
-		my $messages = $connection->getMessages();
-		if ( defined($messages) )
-		{
-			foreach my $message ( @$messages )
-			{
-				handleMessage( $connection, $message );
-			}
-		}
-	}
+    # Check polled connections
+    foreach my $connection ( @in_poll_connections )
+    {
+        my $messages = $connection->getMessages();
+        if ( defined($messages) )
+        {
+            foreach my $message ( @$messages )
+            {
+                handleMessage( $connection, $message );
+            }
+        }
+    }
 
-	# Check for alarms that might have happened
-	my @out_messages;
-	foreach my $monitor ( values(%monitors) )
-	{
-		my ( $state, $last_event ) = zmMemRead( $monitor, [ "shared_data:state", "shared_data:last_event" ] );
+    # Check for alarms that might have happened
+    my @out_messages;
+    foreach my $monitor ( values(%monitors) )
+    {
+        my ( $state, $last_event )
+            = zmMemRead( $monitor,
+                         [ "shared_data:state",
+                           "shared_data:last_event"
+                         ]
+        );
 
-		#print( "$monitor->{Id}: S:$state, LE:$last_event\n" );
-		#print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}\n" );
-		if ( $state == STATE_ALARM || $state == STATE_ALERT ) # In alarm state
-		{
-			if ( !defined($monitor->{LastEvent}) || ($last_event != $monitor->{LastEvent}) ) # A new event
-			{
-				push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
-			}
-			else # The same one as last time, so ignore it
-			{
-				# Do nothing
-			}
-		}
-		elsif ( ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE) || ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE) ) # Out of alarm state
-		{
-			push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
-		}
-		elsif ( defined($monitor->{LastEvent}) && ($last_event != $monitor->{LastEvent}) ) # We've missed a whole event
-		{
-			push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
-			push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
-		}
-		$monitor->{LastState} = $state;
-		$monitor->{LastEvent} = $last_event;
-	}
-	foreach my $connection ( @out_connections )
-	{
-		if ( $connection->canWrite() )
-		{
-			$connection->putMessages( \@out_messages );
-		}
-	}
-	foreach my $connection ( values(%spawned_connections) )
-	{
-		if ( $connection->canWrite() )
-		{
-			$connection->putMessages( \@out_messages );
-		}
-	}
+        #print( "$monitor->{Id}: S:$state, LE:$last_event\n" );
+        #print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}\n" );
+        if ( $state == STATE_ALARM
+             || $state == STATE_ALERT
+        ) # In alarm state
+        {
+            if ( !defined($monitor->{LastEvent})
+                 || ($last_event != $monitor->{LastEvent})
+            ) # A new event
+            {
+                push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
+            }
+            else # The same one as last time, so ignore it
+            {
+                # Do nothing
+            }
+        }
+        elsif ( ($state == STATE_IDLE
+                 && $monitor->{LastState} != STATE_IDLE
+                )
+                || ($state == STATE_TAPE
+                    && $monitor->{LastState} != STATE_TAPE
+                   )
+        ) # Out of alarm state
+        {
+            push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
+        }
+        elsif ( defined($monitor->{LastEvent})
+                && ($last_event != $monitor->{LastEvent})
+        ) # We've missed a whole event
+        {
+            push( @out_messages, $monitor->{Id}."|on|".time()."|".$last_event );
+            push( @out_messages, $monitor->{Id}."|off|".time()."|".$last_event );
+        }
+        $monitor->{LastState} = $state;
+        $monitor->{LastEvent} = $last_event;
+    }
+    foreach my $connection ( @out_connections )
+    {
+        if ( $connection->canWrite() )
+        {
+            $connection->putMessages( \@out_messages );
+        }
+    }
+    foreach my $connection ( values(%spawned_connections) )
+    {
+        if ( $connection->canWrite() )
+        {
+            $connection->putMessages( \@out_messages );
+        }
+    }
 
-	Debug( "Checking for timed actions\n" ) if ( int(keys(%actions)) );
-	my $now = time();
-	foreach my $action_time ( sort( grep { $_ < $now } keys( %actions ) ) )
-	{
-		Info( "Found actions expiring at $action_time\n" );
-		foreach my $action ( @{$actions{$action_time}} )
-		{
-			my $connection = $action->{connection};
-			my $message = $action->{message};
-			Info( "Found action '$message'\n" );
-			handleMessage( $connection, $message );
-		}
-		delete( $actions{$action_time} );
-	}
+    Debug( "Checking for timed actions\n" )
+        if ( int(keys(%actions)) );
+    my $now = time();
+    foreach my $action_time ( sort( grep { $_ < $now } keys( %actions ) ) )
+    {
+        Info( "Found actions expiring at $action_time\n" );
+        foreach my $action ( @{$actions{$action_time}} )
+        {
+            my $connection = $action->{connection};
+            my $message = $action->{message};
+            Info( "Found action '$message'\n" );
+            handleMessage( $connection, $message );
+        }
+        delete( $actions{$action_time} );
+    }
 
     # Allow connections to do their own timed actions
-	foreach my $connection ( @connections )
-	{
-		my $messages = $connection->timedActions();
-		if ( defined($messages) )
-		{
-			foreach my $message ( @$messages )
-			{
-				handleMessage( $connection, $message );
-			}
-		}
-	}
-	foreach my $connection ( values(%spawned_connections) )
-	{
-		my $messages = $connection->timedActions();
-		if ( defined($messages) )
-		{
-			foreach my $message ( @$messages )
-			{
-				handleMessage( $connection, $message );
-			}
-		}
-	}
+    foreach my $connection ( @connections )
+    {
+        my $messages = $connection->timedActions();
+        if ( defined($messages) )
+        {
+            foreach my $message ( @$messages )
+            {
+                handleMessage( $connection, $message );
+            }
+        }
+    }
+    foreach my $connection ( values(%spawned_connections) )
+    {
+        my $messages = $connection->timedActions();
+        if ( defined($messages) )
+        {
+            foreach my $message ( @$messages )
+            {
+                handleMessage( $connection, $message );
+            }
+        }
+    }
 
-	# If necessary reload monitors
-	if ( (time() - $monitor_reload_time) > MONITOR_RELOAD_INTERVAL )
-	{
-	    foreach my $monitor ( values(%monitors) )
+    # If necessary reload monitors
+    if ( (time() - $monitor_reload_time) > MONITOR_RELOAD_INTERVAL )
+    {
+        foreach my $monitor ( values(%monitors) )
         {
             # Free up any used memory handle
             zmMemInvalidate( $monitor );
         }
-		loadMonitors();
-	}
+        loadMonitors();
+    }
 }
 Info( "Trigger daemon exiting\n" );
 exit;
 
 sub loadMonitors
 {
-	Debug( "Loading monitors\n" );
-	$monitor_reload_time = time();
+    Debug( "Loading monitors\n" );
+    $monitor_reload_time = time();
 
-	my %new_monitors = ();
+    my %new_monitors = ();
 
-	my $sql = "select * from Monitors where find_in_set( Function, 'Modect,Mocord,Nodect' )";
-	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() )
-	{
-		next if ( !zmMemVerify( $monitor ) ); # Check shared memory ok
+    my $sql = "SELECT * FROM Monitors
+               WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )"
+    ;
+    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() )
+    {
+        next if ( !zmMemVerify( $monitor ) ); # Check shared memory ok
 
-		if ( defined($monitors{$monitor->{Id}}->{LastState}) )
-		{
-			$monitor->{LastState} = $monitors{$monitor->{Id}}->{LastState};
-		}
-		else
-		{
-			$monitor->{LastState} = zmGetMonitorState( $monitor );
-		}
-		if ( defined($monitors{$monitor->{Id}}->{LastEvent}) )
-		{
-			$monitor->{LastEvent} = $monitors{$monitor->{Id}}->{LastEvent};
-		}
-		else
-		{
-			$monitor->{LastEvent} = zmGetLastEvent( $monitor );
-		}
-		$new_monitors{$monitor->{Id}} = $monitor;
-	}
-	%monitors = %new_monitors;
+        if ( defined($monitors{$monitor->{Id}}->{LastState}) )
+        {
+            $monitor->{LastState} = $monitors{$monitor->{Id}}->{LastState};
+        }
+        else
+        {
+            $monitor->{LastState} = zmGetMonitorState( $monitor );
+        }
+        if ( defined($monitors{$monitor->{Id}}->{LastEvent}) )
+        {
+            $monitor->{LastEvent} = $monitors{$monitor->{Id}}->{LastEvent};
+        }
+        else
+        {
+            $monitor->{LastEvent} = zmGetLastEvent( $monitor );
+        }
+        $new_monitors{$monitor->{Id}} = $monitor;
+    }
+    %monitors = %new_monitors;
 }
 
 sub handleMessage
 {
-	my $connection = shift;
-	my $message = shift;
+    my $connection = shift;
+    my $message = shift;
 
-	my ( $id, $action, $score, $cause, $text, $showtext ) = split( /\|/, $message );
-	$score = 0 if ( !defined($score) );
-	$cause = "" if ( !defined($cause) );
-	$text = "" if ( !defined($text) );
+    my ( $id, $action, $score, $cause, $text, $showtext )
+       = split( /\|/, $message );
+    $score = 0 if ( !defined($score) );
+    $cause = "" if ( !defined($cause) );
+    $text = "" if ( !defined($text) );
 
-	my $monitor = $monitors{$id};
-	if ( !$monitor )
-	{
-		Warning( "Can't find monitor '$id' for message '$message'\n" );
-		return;
-	}
-	Debug( "Found monitor for id '$id'\n" );
+    my $monitor = $monitors{$id};
+    if ( !$monitor )
+    {
+        Warning( "Can't find monitor '$id' for message '$message'\n" );
+        return;
+    }
+    Debug( "Found monitor for id '$id'\n" );
 
-	next if ( !zmMemVerify( $monitor ) );
+    next if ( !zmMemVerify( $monitor ) );
 
-	Debug( "Handling action '$action'\n" );
-	if ( $action =~ /^(enable|disable)(?:\+(\d+))?$/ )
-	{
-		my $state = $1;
-		my $delay = $2;
-		if ( $state eq "enable" )
-		{
-			zmMonitorEnable( $monitor );
-		}
-		else
-		{
-			zmMonitorDisable( $monitor );
-		}
-		# Force a reload
-		$monitor_reload_time = 0;
-		Info( "Set monitor to $state\n" );
-		if ( $delay )
-		{
-			my $action_time = time()+$delay;
-			my $action_text = $id."|".(($state eq "enable")?"disable":"enable");
-			my $action_array = $actions{$action_time};
-			if ( !$action_array )
-			{
-				$action_array = $actions{$action_time} = [];
-			}
-			push( @$action_array, { connection=>$connection, message=>$action_text } );
-			Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
-		}
-	}
-	elsif ( $action =~ /^(on|off)(?:\+(\d+))?$/ )
-	{
-		next if ( !$monitor->{Enabled} );
+    Debug( "Handling action '$action'\n" );
+    if ( $action =~ /^(enable|disable)(?:\+(\d+))?$/ )
+    {
+        my $state = $1;
+        my $delay = $2;
+        if ( $state eq "enable" )
+        {
+            zmMonitorEnable( $monitor );
+        }
+        else
+        {
+            zmMonitorDisable( $monitor );
+        }
+        # Force a reload
+        $monitor_reload_time = 0;
+        Info( "Set monitor to $state\n" );
+        if ( $delay )
+        {
+            my $action_time = time()+$delay;
+            my $action_text = $id."|".( ($state eq "enable")
+                                        ? "disable"
+                                        : "enable"
+                                      )
+            ;
+            my $action_array = $actions{$action_time};
+            if ( !$action_array )
+            {
+                $action_array = $actions{$action_time} = [];
+            }
+            push( @$action_array, { connection=>$connection,
+                                    message=>$action_text
+                                  }
+            );
+            Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
+        }
+    }
+    elsif ( $action =~ /^(on|off)(?:\+(\d+))?$/ )
+    {
+        next if ( !$monitor->{Enabled} );
 
-		my $trigger = $1;
-		my $delay = $2;
-		my $trigger_data;
-		if ( $trigger eq "on" )
-		{
-			zmTriggerEventOn( $monitor, $score, $cause, $text );
-		    zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
-		    Info( "Trigger '$trigger' '$cause'\n" );
-		}
-		elsif ( $trigger eq "off" )
-		{
+        my $trigger = $1;
+        my $delay = $2;
+        my $trigger_data;
+        if ( $trigger eq "on" )
+        {
+            zmTriggerEventOn( $monitor, $score, $cause, $text );
+            zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
+            Info( "Trigger '$trigger' '$cause'\n" );
+        }
+        elsif ( $trigger eq "off" )
+        {
             my $last_event = zmGetLastEvent( $monitor );
-			zmTriggerEventOff( $monitor );
-		    zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
-		    Info( "Trigger '$trigger'\n" );
+            zmTriggerEventOff( $monitor );
+            zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
+            Info( "Trigger '$trigger'\n" );
             # Wait til it's finished
-            while( zmInAlarm( $monitor ) && ($last_event == zmGetLastEvent( $monitor )) )
+            while( zmInAlarm( $monitor )
+                   && ($last_event == zmGetLastEvent( $monitor ))
+            )
             {
                 # Tenth of a second
                 usleep( 100000 );
             }
-			zmTriggerEventCancel( $monitor );
-		}
-		else
-		{
-		    Info( "Trigger '$trigger'\n" );
-			zmTriggerEventCancel( $monitor );
-		}
-		if ( $delay )
-		{
-			my $action_time = time()+$delay;
-			#my $action_text = $id."|cancel|0|".$cause."|".$text;
-			my $action_text = $id."|cancel";
-			my $action_array = $actions{$action_time};
-			if ( !$action_array )
-			{
-				$action_array = $actions{$action_time} = [];
-			}
-			push( @$action_array, { connection=>$connection, message=>$action_text } );
-			Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
-		}
-	}
-	elsif( $action eq "cancel" )
-	{
-		zmTriggerEventCancel( $monitor );
-		zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
-		Info( "Cancelled event\n" );
-	}
-	elsif( $action eq "show" )
-	{
-		zmTriggerShowtext( $monitor, $showtext );
-		Info( "Updated show text to '$showtext'\n" );
-	}
-	else
-	{
-		Error( "Unrecognised action '$action' in message '$message'\n" );
-	}
+            zmTriggerEventCancel( $monitor );
+        }
+        else
+        {
+            Info( "Trigger '$trigger'\n" );
+            zmTriggerEventCancel( $monitor );
+        }
+        if ( $delay )
+        {
+            my $action_time = time()+$delay;
+            #my $action_text = $id."|cancel|0|".$cause."|".$text;
+            my $action_text = $id."|cancel";
+            my $action_array = $actions{$action_time};
+            if ( !$action_array )
+            {
+                $action_array = $actions{$action_time} = [];
+            }
+            push( @$action_array, { connection=>$connection,
+                                    message=>$action_text
+                                  }
+            );
+            Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" );
+        }
+    }
+    elsif( $action eq "cancel" )
+    {
+        zmTriggerEventCancel( $monitor );
+        zmTriggerShowtext( $monitor, $showtext ) if defined($showtext);
+        Info( "Cancelled event\n" );
+    }
+    elsif( $action eq "show" )
+    {
+        zmTriggerShowtext( $monitor, $showtext );
+        Info( "Updated show text to '$showtext'\n" );
+    }
+    else
+    {
+        Error( "Unrecognised action '$action' in message '$message'\n" );
+    }
 } # end sub handleMessage
 
 1;
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 41a081fc1..75ac52fa0 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -20,11 +20,34 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script just checks what the most recent release of ZoneMinder is
-# at the the moment. It will eventually be responsible for applying and
-# configuring upgrades etc, including on the fly upgrades.
-#
+
+=head1 NAME
+
+zmupdate.pl - check and upgrade Zoneminer database
+
+=head1 SYNOPSIS
+
+ zmupdate.pl -c,--check | -f,--freshen | -v<version>,--version=<version> [-u<dbuser> -p<dbpass>]
+
+=head1 DESCRIPTION
+
+This script just checks what the most recent release of ZoneMinder is
+at the the moment. It will eventually be responsible for applying and
+configuring upgrades etc, including on the fly upgrades.
+
+=head1 OPTIONS
+
+ -c, --check                      - Check for updated versions of ZoneMinder
+ -f, --freshen                    - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
+ --migrate-events                 - Update database structures as per USE_DEEP_STORAGE setting.
+ -v<version>, --version=<version> - Force upgrade to the current version from <version>
+ -u<dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
+ -p<dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
+ -d<dir>,--dir=<dir>              - Directory containing update files if not in default build location
+ -interactive                     - interact with the user
+ -nointeractive                   - do not interact with the user
+
+=cut
 use strict;
 use bytes;
 
@@ -52,7 +75,8 @@ use ZoneMinder::ConfigAdmin qw( :functions );
 use POSIX;
 use DBI;
 use Getopt::Long;
-use Data::Dumper;
+use autouse 'Pod::Usage'=>qw(pod2usage);
+use autouse 'Data::Dumper'=>qw(Dumper);
 
 use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)?$Config{ZM_DIR_EVENTS}:($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS});
 
@@ -78,27 +102,19 @@ my $version = '';
 my $dbUser = $Config{ZM_DB_USER};
 my $dbPass = $Config{ZM_DB_PASS};
 my $updateDir = '';
-sub Usage
-{
-    print( "
-Usage: zmupdate.pl <-c,--check|-f,--freshen|-v<version>,--version=<version>> [-u<dbuser> -p<dbpass>]>
-Parameters are :-
--c, --check                      - Check for updated versions of ZoneMinder
--f, --freshen                    - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
--v<version>, --version=<version> - Force upgrade to the current version from <version>
--u<dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
--p<dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
--d<dir>,--dir=<dir>              - Directory containing update files if not in default build location
--interactive					 - interact with the user
--nointeractive                   - do not interact with the user
-");
-    exit( -1 );
-}
 
-if ( !GetOptions( 'check'=>\$check, 'freshen'=>\$freshen, 'rename'=>\$rename, 'zone-fix'=>\$zoneFix, 'migrate-events'=>\$migrateEvents, 'version=s'=>\$version, 'interactive!'=>\$interactive, 'user:s'=>\$dbUser, 'pass:s'=>\$dbPass, 'dir:s'=>\$updateDir ) )
-{
-    Usage();
-}
+GetOptions(
+    'check'          =>\$check,
+    'freshen'        =>\$freshen,
+    'rename'         =>\$rename,
+    'zone-fix'       =>\$zoneFix,
+    'migrate-events' =>\$migrateEvents,
+    'version=s'      =>\$version,
+    'interactive!'   =>\$interactive,
+    'user:s'         =>\$dbUser,
+    'pass:s'         =>\$dbPass,
+    'dir:s'          =>\$updateDir
+) or pod2usage(-exitstatus => -1);
 
 my $dbh = zmDbConnect();
 $Config{ZM_DB_USER} = $dbUser;
@@ -113,14 +129,14 @@ if ( ! ($check || $freshen || $rename || $zoneFix || $migrateEvents || $version)
     else
     {
         print( STDERR "Please give a valid option\n" );
-        Usage();
+        pod2usage(-exitstatus => -1);
     }
 }
 
 if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0)) > 1 )
 {
     print( STDERR "Please give only one option\n" );
-    Usage();
+    pod2usage(-exitstatus => -1);
 }
 
 if ( $check && $Config{ZM_CHECK_FOR_UPDATES} )
diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in
index 916b1c0ab..725477c15 100644
--- a/scripts/zmvideo.pl.in
+++ b/scripts/zmvideo.pl.in
@@ -20,10 +20,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script is used to create MPEG videos of events for the web pages
-# or as email attachments.
-#
+
+=head1 NAME
+
+zmvideo.pl - ZoneMinder Video Creation Script
+
+=head1 SYNOPSIS
+
+ zmvideo.pl -e <event_id>,--event=<event_id> [--format <format>]
+                                             [--rate=<rate>]
+                                             [--scale=<scale>]
+                                             [--fps=<fps>]
+                                             [--size=<size>]
+                                             [--overwrite]
+
+=head1 DESCRIPTION
+
+This script is used to create MPEG videos of events for the web pages
+or as email attachments.
+
+=head1 OPTIONS
+
+ -e<event_id>, --event=<event_id>  - What event to create the video for
+ -f<format>, --format=<format>     - What format to create the video in, default is mpg. For ffmpeg only.
+ -r<rate>, --rate=<rate>           - Relative rate, 1 = realtime, 2 = double speed, 0.5 = half speed etc.
+ -s<scale>, --scale=<scale>        - Scale, 1 = normal, 2 = double size, 0.5 = half size etc.
+ -F<fps>, --fps=<fps>              - Absolute frame rate, in frames per second
+ -S<size>, --size=<size>           - Absolute video size, WxH or other specification supported by ffmpeg
+ -o, --overwrite                   - Whether to overwrite an existing file, off by default.
+ -v, --version                     - Outputs the currently installed version of ZoneMinder
+
+=cut
 use strict;
 use bytes;
 
@@ -36,9 +63,10 @@ use bytes;
 @EXTRA_PERL_LIB@
 use ZoneMinder;
 use DBI;
-use Data::Dumper;
+use autouse 'Data::Dumper'=>qw(Dumper);
 use POSIX qw(strftime);
 use Getopt::Long qw(:config no_ignore_case );
+use autouse 'Pod::Usage'=>qw(pod2usage);
 
 $| = 1;
 
@@ -60,77 +88,66 @@ my $version = 0;
 my @formats = split( /\s+/, $Config{ZM_FFMPEG_FORMATS} );
 for ( my $i = 0; $i < @formats; $i++ )
 {
-	if ( $i =~ /^(.+)\*$/ )
-	{
-		$format = $formats[$i] = $1;
-	}
+    if ( $i =~ /^(.+)\*$/ )
+    {
+        $format = $formats[$i] = $1;
+    }
 }
 
-sub Usage
-{
-	print( "
-Usage: zmvideo.pl -e <event_id>,--event=<event_id> [--format <format>] [--rate=<rate>] [--scale=<scale>] [--fps=<fps>] [--size=<size>] [--overwrite]
-Parameters are :-
--e<event_id>, --event=<event_id>  - What event to create the video for
--f<format>, --format=<format>     - What format to create the video in, default is mpg. For ffmpeg only.
--r<rate>, --rate=<rate>           - Relative rate , 1 = realtime, 2 = double speed , 0.5 = half speed etc
--s<scale>, --scale=<scale>        - Scale, 1 = normal, 2 = double size, 0.5 = half size etc
--F<fps>, --fps=<fps>              - Absolute frame rate, in frames per second
--S<size>, --size=<size>           - Absolute video size, WxH or other specification supported by ffmpeg
--o, --overwrite                   - Whether to overwrite an existing file, off by default.
--v, --version                     - Outputs the currently installed version of ZoneMinder
-");
-	exit( -1 );
-}
-
-if ( !GetOptions( 'event=i'=>\$event_id, 'format|f=s'=>\$format, 'rate|r=f'=>\$rate, 'scale|s=f'=>\$scale, 'fps|F=f'=>\$fps, 'size|S=s'=>\$size, 'overwrite'=>\$overwrite, version=>\$version ) )
-{
-	Usage();
-}
+GetOptions(
+    'event=i'       =>\$event_id,
+    'format|f=s'    =>\$format,
+    'rate|r=f'      =>\$rate,
+    'scale|s=f'     =>\$scale,
+    'fps|F=f'       =>\$fps,
+    'size|S=s'      =>\$size,
+    'overwrite'     =>\$overwrite,
+    'version'       =>\$version
+) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
-	print ZoneMinder::Base::ZM_VERSION . "\n";
-	exit(0);
+    print ZoneMinder::Base::ZM_VERSION . "\n";
+    exit(0);
 }
 
 if ( !$event_id || $event_id < 0 )
 {
-	print( STDERR "Please give a valid event id\n" );
-	Usage();
+    print( STDERR "Please give a valid event id\n" );
+    pod2usage(-exitstatus => -1);
 }
 
 if ( ! $Config{ZM_OPT_FFMPEG} )
 {
-	print( STDERR "Mpeg encoding is not currently enabled\n" );
-	exit(-1);
+    print( STDERR "Mpeg encoding is not currently enabled\n" );
+    exit(-1);
 }
 
 if ( !$rate && !$fps )
 {
-	$rate = 1;
+    $rate = 1;
 }
 
 if ( !$scale && !$size )
 {
-	$scale = 1;
+    $scale = 1;
 }
 
 if ( $rate && ($rate < 0.25 || $rate > 100) )
 {
-	print( STDERR "Rate is out of range, 0.25 >= rate <= 100\n" );
-	Usage();
+    print( STDERR "Rate is out of range, 0.25 >= rate <= 100\n" );
+    pod2usage(-exitstatus => -1);
 }
 
 if ( $scale && ($scale < 0.25 || $scale > 4) )
 {
-	print( STDERR "Scale is out of range, 0.25 >= scale <= 4\n" );
-	Usage();
+    print( STDERR "Scale is out of range, 0.25 >= scale <= 4\n" );
+    pod2usage(-exitstatus => -1);
 }
 
 if ( $fps && ($fps > 30) )
 {
-	print( STDERR "FPS is out of range, <= 30\n" );
-	Usage();
+    print( STDERR "FPS is out of range, <= 30\n" );
+    pod2usage(-exitstatus => -1);
 }
 
 my ( $detaint_format ) = $format =~ /^(\w+)$/;
@@ -148,9 +165,23 @@ $size = $detaint_size;
 my $dbh = zmDbConnect();
 
 my @filters;
-my $sql = "select max(F.Delta)-min(F.Delta) as FullLength, E.*, unix_timestamp(E.StartTime) as Time, M.Name as MonitorName, M.Width as MonitorWidth, M.Height as MonitorHeight, M.Palette from Frames as F inner join Events as E on F.EventId = E.Id inner join Monitors as M on E.MonitorId = M.Id where EventId = '$event_id' group by F.EventId";
-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() );
+my $sql = " SELECT max(F.Delta)-min(F.Delta) as FullLength,
+                   E.*,
+                   unix_timestamp(E.StartTime) as Time,
+                   M.Name as MonitorName,
+                   M.Width as MonitorWidth,
+                   M.Height as MonitorHeight,
+                   M.Palette
+            FROM Frames as F
+            INNER JOIN Events as E on F.EventId = E.Id
+            INNER JOIN Monitors as M on E.MonitorId = M.Id
+            WHERE EventId = '$event_id'
+            GROUP BY F.EventId"
+;
+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() );
 my $event = $sth->fetchrow_hashref();
 $sth->finish();
 my $event_path = getEventPath( $event );
@@ -160,42 +191,42 @@ chdir( $event_path );
 my @file_parts;
 if ( $rate )
 {
-	my $file_rate = $rate;
-	$file_rate =~ s/\./_/;
-	$file_rate =~ s/_00//;
-	$file_rate =~ s/(_\d+)0+$/$1/;
-	$file_rate = 'r'.$file_rate;
-	push( @file_parts, $file_rate );
+    my $file_rate = $rate;
+    $file_rate =~ s/\./_/;
+    $file_rate =~ s/_00//;
+    $file_rate =~ s/(_\d+)0+$/$1/;
+    $file_rate = 'r'.$file_rate;
+    push( @file_parts, $file_rate );
 }
 elsif ( $fps )
 {
-	my $file_fps = $fps;
-	$file_fps =~ s/\./_/;
-	$file_fps =~ s/_00//;
-	$file_fps =~ s/(_\d+)0+$/$1/;
-	$file_fps = 'R'.$file_fps;
-	push( @file_parts, $file_fps );
+    my $file_fps = $fps;
+    $file_fps =~ s/\./_/;
+    $file_fps =~ s/_00//;
+    $file_fps =~ s/(_\d+)0+$/$1/;
+    $file_fps = 'R'.$file_fps;
+    push( @file_parts, $file_fps );
 }
 
 if ( $scale )
 {
-	my $file_scale = $scale;
-	$file_scale =~ s/\./_/;
-	$file_scale =~ s/_00//;
-	$file_scale =~ s/(_\d+)0+$/$1/;
-	$file_scale = 's'.$file_scale;
-	push( @file_parts, $file_scale );
+    my $file_scale = $scale;
+    $file_scale =~ s/\./_/;
+    $file_scale =~ s/_00//;
+    $file_scale =~ s/(_\d+)0+$/$1/;
+    $file_scale = 's'.$file_scale;
+    push( @file_parts, $file_scale );
 }
 elsif ( $size )
 {
-	my $file_size = 'S'.$size;
-	push( @file_parts, $file_size );
+    my $file_size = 'S'.$size;
+    push( @file_parts, $file_size );
 }
 my $video_file = "$video_name-".$file_parts[0]."-".$file_parts[1].".$format";
 
 if ( $overwrite || !-s $video_file )
 {
-	Info( "Creating video file $video_file for event $event->{Id}\n" );
+    Info( "Creating video file $video_file for event $event->{Id}\n" );
 
     my $frame_rate = sprintf( "%.2f", $event->{Frames}/$event->{FullLength} );
     if ( $rate )
@@ -228,22 +259,32 @@ if ( $overwrite || !-s $video_file )
         $video_size = $size;
     }
 
-    my $command = $Config{ZM_PATH_FFMPEG}." -y -r $frame_rate ".$Config{ZM_FFMPEG_INPUT_OPTIONS}." -i %0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg -s $video_size ".$Config{ZM_FFMPEG_OUTPUT_OPTIONS}." '$video_file' > ffmpeg.log 2>&1";
+    my $command = $Config{ZM_PATH_FFMPEG}
+                 ." -y -r $frame_rate "
+                 .$Config{ZM_FFMPEG_INPUT_OPTIONS}
+                 ." -i %0"
+                 .$Config{ZM_EVENT_IMAGE_DIGITS}
+                 ."d-capture.jpg -s $video_size "
+                 .$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
+                 ." '$video_file' > ffmpeg.log 2>&1"
+    ;
     Debug( $command."\n" );
     my $output = qx($command);
 
     my $status = $? >> 8;
     if ( $status )
     {
-        Error( "Unable to generate video, check ".$event_path."/ffmpeg.log for details" );
+        Error( "Unable to generate video, check "
+               .$event_path."/ffmpeg.log for details"
+        );
         exit( -1 );
     }
-	
-	Info( "Finished $video_file\n" );
+    
+    Info( "Finished $video_file\n" );
 }
 else
 {
-	Info( "Video file $video_file already exists for event $event->{Id}\n" );
+    Info( "Video file $video_file already exists for event $event->{Id}\n" );
 }
 #print( STDOUT $event->{MonitorId}.'/'.$event->{Id}.'/'.$video_file."\n" );
 print( STDOUT $event_path . '/' . $video_file ."\n" );
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index bfa8b54bd..7d5193439 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -20,11 +20,22 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This does some basic setup for ZoneMinder to run and then periodically
-# checks the fps output of the active daemons to check they haven't 
-# locked up. If they have then they are killed and restarted
-#
+
+=head1 NAME
+
+zmwatch.pl - ZoneMinder WatchDog Script
+
+=head1 SYNOPSIS
+
+zmwatch.pl
+
+=head1 DESCRIPTION
+
+This does some basic setup for ZoneMinder to run and then periodically
+checks the fps output of the active daemons to check they haven't 
+locked up. If they have then they are killed and restarted
+
+=cut
 use strict;
 use bytes;
 
@@ -46,7 +57,7 @@ use constant START_DELAY => 30; # To give everything else time to start
 use ZoneMinder;
 use POSIX;
 use DBI;
-use Data::Dumper;
+use autouse 'Data::Dumper'=>qw(Dumper);
 
 $| = 1;
 
@@ -54,14 +65,6 @@ $ENV{PATH}  = '/bin:/usr/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-sub Usage
-{
-    print( "
-Usage: zmwatch.pl
-");
-	exit( -1 );
-}
-
 logInit();
 logSetSignal();
 
@@ -72,38 +75,49 @@ sleep( START_DELAY );
 my $dbh = zmDbConnect();
 
 my $sql = "select * from Monitors";
-my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
 
 while( 1 )
 {
-	my $now = time();
-	my $res = $sth->execute() or Fatal( "Can't execute: ".$sth->errstr() );
-	while( my $monitor = $sth->fetchrow_hashref() )
-	{
-		if ( $monitor->{Function} ne 'None' )
-		{
+    my $now = time();
+    my $res = $sth->execute()
+        or Fatal( "Can't execute: ".$sth->errstr() );
+    while( my $monitor = $sth->fetchrow_hashref() )
+    {
+        if ( $monitor->{Function} ne 'None' )
+        {
             my $restart = 0;
-			if ( zmMemVerify( $monitor ) && zmMemRead( $monitor, "shared_data:valid" ) )
-			{
-				# Check we have got an image recently
-				my $image_time = zmGetLastWriteTime( $monitor );
-				next if ( !defined($image_time) ); # Can't read from shared data
-				next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
+            if ( zmMemVerify( $monitor )
+                 && zmMemRead( $monitor, "shared_data:valid" )
+            )
+            {
+                # Check we have got an image recently
+                my $image_time = zmGetLastWriteTime( $monitor );
+                next if ( !defined($image_time) ); # Can't read from shared data
+                next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
 
-				my $max_image_delay = ($monitor->{MaxFPS}&&($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):$Config{ZM_WATCH_MAX_DELAY};
-				my $image_delay = $now-$image_time;
-				Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
-				if ( $image_delay > $max_image_delay )
-				{
-				    Info( "Restarting capture daemon for ".$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n" );
+                my $max_image_delay = ( $monitor->{MaxFPS}
+                                        &&($monitor->{MaxFPS}>0)
+                                        &&($monitor->{MaxFPS}<1)
+                                      ) ? (3/$monitor->{MaxFPS})
+                                        : $Config{ZM_WATCH_MAX_DELAY}
+                ;
+                my $image_delay = $now-$image_time;
+                Debug( "Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay\n" );
+                if ( $image_delay > $max_image_delay )
+                {
+                    Info( "Restarting capture daemon for "
+                          .$monitor->{Name}.", time since last capture $image_delay seconds ($now-$image_time)\n"
+                    );
                     $restart = 1;
                 }
-			}
-			else
-			{
-				#Info( "Restarting capture daemon for ".$monitor->{Name}.", shared data not valid\n" );
+            }
+            else
+            {
+                #Info( "Restarting capture daemon for ".$monitor->{Name}.", shared data not valid\n" );
                 #$restart = 1;
-			}
+            }
 
             if ( $restart )
             {
@@ -120,19 +134,28 @@ while( 1 )
             }
             elsif ( $monitor->{Function} ne 'Monitor' )
             {
-                if ( zmMemVerify( $monitor ) && zmMemRead( $monitor, "shared_data:valid" ) )
+                if ( zmMemVerify( $monitor )
+                     && zmMemRead( $monitor, "shared_data:valid" )
+                )
                 {
                     # Check we have got an image recently
                     my $image_time = zmGetLastReadTime( $monitor );
                     next if ( !defined($image_time) ); # Can't read from shared data
                     next if ( !$image_time ); # We can't get the last capture time so can't be sure it's died.
 
-                    my $max_image_delay = ($monitor->{MaxFPS}&&($monitor->{MaxFPS}>0)&&($monitor->{MaxFPS}<1))?(3/$monitor->{MaxFPS}):$Config{ZM_WATCH_MAX_DELAY};
+                    my $max_image_delay = ( $monitor->{MaxFPS}
+                                            &&($monitor->{MaxFPS}>0)
+                                            &&($monitor->{MaxFPS}<1)
+                                          ) ? (3/$monitor->{MaxFPS})
+                                            : $Config{ZM_WATCH_MAX_DELAY}
+                    ;
                     my $image_delay = $now-$image_time;
                     Debug( "Monitor $monitor->{Id} last analysed $image_delay seconds ago, max is $max_image_delay\n" );
                     if ( $image_delay > $max_image_delay )
                     {
-                        Info( "Restarting analysis daemon for ".$monitor->{Name}.", time since last analysis $image_delay seconds ($now-$image_time)\n" );
+                        Info( "Restarting analysis daemon for "
+                              .$monitor->{Name}.", time since last analysis $image_delay seconds ($now-$image_time)\n"
+                        );
                         my $command = "zmdc.pl restart zma -m ".$monitor->{Id};
                         runCommand( $command );
                     }
@@ -141,8 +164,8 @@ while( 1 )
         }
         # Prevent open handles building up if we have connect to shared memory
         zmMemInvalidate( $monitor );
-	}
-	sleep( $Config{ZM_WATCH_CHECK_INTERVAL} );
+    }
+    sleep( $Config{ZM_WATCH_CHECK_INTERVAL} );
 }
 Info( "Watchdog exiting\n" );
 exit();
diff --git a/scripts/zmx10.pl.in b/scripts/zmx10.pl.in
index add59034d..d25e74c8a 100644
--- a/scripts/zmx10.pl.in
+++ b/scripts/zmx10.pl.in
@@ -20,10 +20,28 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ==========================================================================
-#
-# This script controls the monitoring of the X10 interface and the consequent
-# management of the ZM daemons based on the receipt of X10 signals.
-#
+
+=head1 NAME
+
+zmx10.pl - ZoneMinder X10 Control Script
+
+=head1 SYNOPSIS
+
+ zmx10.pl -c <command>,--command=<command> [-u <unit code>,--unit-code=<unit code>]
+
+=head1 DESCRIPTION
+
+This script controls the monitoring of the X10 interface and the consequent
+management of the ZM daemons based on the receipt of X10 signals.
+
+=head1 OPTIONS
+
+ -c <command>, --command=<command>       - Command to issue, one of 'on','off','dim','bright','status','shutdown'
+ -u <unit code>, --unit-code=<unit code> - Unit code to act on required for all commands
+                                           except 'status' (optional) and 'shutdown'
+ -v, --verison                           - Pirnts the currently installed version of ZoneMinder
+
+=cut
 use strict;
 use bytes;
 
@@ -46,7 +64,8 @@ use ZoneMinder;
 use POSIX;
 use Socket;
 use Getopt::Long;
-use Data::Dumper;
+use autouse 'Pod::Usage'=>qw(pod2usage);
+use autouse 'Data::Dumper'=>qw(Dumper);
 
 use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmx10.sock';
 
@@ -56,18 +75,6 @@ $ENV{PATH}  = '/bin:/usr/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
-sub Usage
-{
-    print( "
-Usage: zmx10.pl -c <command>,--command=<command> [-u <unit code>,--unit-code=<unit code>]
-Parameters are :-
--c <command>, --command=<command>       - Command to issue, one of 'on','off','dim','bright','status','shutdown'
--u <unit code>, --unit-code=<unit code> - Unit code to act on required for all commands except 'status' (optional) and 'shutdown'
--v, --verison                           - Pirnts the currently installed version of ZoneMinder
-");
-	exit( -1 );
-}
-
 logInit();
 logSetSignal();
 
@@ -75,53 +82,59 @@ my $command;
 my $unit_code;
 my $version;
 
-if ( !GetOptions( 'command=s'=>\$command, 'unit-code=i'=>\$unit_code, version=>\$version ) )
-{
-    Usage();
-}
+GetOptions(
+    '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 unit code given" )
+    unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );
 
 if ( $command eq "start" )
 {
-	X10Server::runServer();
-	exit();
+    X10Server::runServer();
+    exit();
 }
 
-socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 ) or Fatal( "Can't open socket: $!" );
+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 );
+    # 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 );
+    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();
+        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: $!" );
-	}
+        X10Server::runServer();
+    }
+    else
+    {
+        Fatal( "Can't fork: $!" );
+    }
 }
 # The server is there, connect to it
 #print( "Writing commands\n" );
@@ -132,8 +145,8 @@ print( CLIENT $message );
 shutdown( CLIENT, 1 );
 while ( my $line = <CLIENT> )
 {
-	chomp( $line );
-	print( "$line\n" );
+    chomp( $line );
+    print( "$line\n" );
 }
 close( CLIENT );
 #print( "Finished writing, bye\n" );
@@ -156,7 +169,7 @@ use POSIX;
 use DBI;
 use Socket;
 use X10::ActiveHome;
-use Data::Dumper;
+use autouse 'Data::Dumper'=>qw(Dumper);
 
 our $dbh;
 our $x10;
@@ -167,515 +180,599 @@ our %pending_tasks;
 
 sub runServer
 {
-	Info( "X10 server starting\n" );
+    Info( "X10 server starting\n" );
 
-	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=>ZM_X10_DEVICE, house_code=>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 = &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'
+                                                             };
+                    }
+                }
 
-				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" );
-			}
-		}
-		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 ( 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;
-			}
+                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" );
+            }
+        }
+        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 ( 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();
+            # 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;
+    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' };
-	}
+    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 = { 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 );
+    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;
+    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' };
-	}
+    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 = { 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 );
+    my $task_list = $monitor->{$event."_list"};
+    if ( !$task_list )
+    {
+        $task_list = $monitor->{$event."_list"} = [];
+    }
+    push( @$task_list, $task );
 }
 
 sub loadTasks
 {
-	%monitor_hash = ();
+    %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} = [];
-	}
+    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() )
-	{
-		next if ( !zmMemVerify( $monitor ) ); # Check shared memory ok
+    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() )
+    {
+        next if ( !zmMemVerify( $monitor ) ); # Check shared memory ok
 
-		$monitor_hash{$monitor->{Id}} = $monitor;
+        $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 );
-					}
-				}
-			}
-		}
-		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 ( $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 );
-					}
-				}
-			}
-		}
+        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
+                        );
+                    }
+                }
+            }
+        }
+        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 ( $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 );
-	}
+    }
 }
 
 sub addPendingTask
 {
-	my $task = shift;
+    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 )
-				}
-			}
-		}
-		if ( @$new_pending_list )
-		{
-			$pending_tasks{$activation_time} = $new_pending_list;
-		}
-		else
-		{
-			delete( $pending_tasks{$activation_time} );
-		}
-	}
+    # 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 )
+                }
+            }
+        }
+        if ( @$new_pending_list )
+        {
+            $pending_tasks{$activation_time} = $new_pending_list;
+        }
+        else
+        {
+            delete( $pending_tasks{$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 );
+    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 );
 }
 
 sub processTask
 {
-	my $task = shift;
+    my $task = shift;
 
-	if ( $task->{type} eq "device" )
-	{
-		my ( $instruction, $class ) = ( $task->{function} =~ /^(.+)_(.+)$/ );
+    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} );
-			}
-		}
-	}
-	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();
-		}
-	}
+        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} );
+            }
+        }
+    }
+    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( @_ );
-	}
+    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 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" );
-	}
+    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" );
+    }
 }
 
 1;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b768d56fe..85f15dbe5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ add_executable(zma zma.cpp)
 add_executable(zmu zmu.cpp)
 add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
-add_executable(nph-zms zms.cpp)
 add_executable(zmstreamer zmstreamer.cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
@@ -22,10 +21,9 @@ target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(nph-zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmstreamer zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
 install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(TARGETS zms nph-zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
+install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY \"\$ENV{DESTDIR}${ZM_CGIDIR}\")")
 
diff --git a/src/zm.h b/src/zm.h
index 9e4f47b5d..a60ab655d 100644
--- a/src/zm.h
+++ b/src/zm.h
@@ -17,14 +17,24 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 
 
+#if !defined(PATH_MAX)
+#define PATH_MAX 1024
+#endif
+
 #ifndef ZM_H
 #define ZM_H
 
 #include "zm_config.h"
+#ifdef SOLARIS
+#undef DEFAULT_TYPE    // pthread defines this which breaks StreamType DEFAULT_TYPE
+#include <string.h>    // define strerror() and friends
+#endif
 #include "zm_logger.h"
 
 #include <stdint.h>
 
+#include <iostream>
+
 extern const char* self;
 
 #endif // ZM_H
diff --git a/src/zm_box.h b/src/zm_box.h
index 8a18b8847..8aa341d73 100644
--- a/src/zm_box.h
+++ b/src/zm_box.h
@@ -23,7 +23,11 @@
 #include "zm.h"
 #include "zm_coord.h"
 
+#ifndef SOLARIS
 #include <math.h>
+#else
+#include <cmath>
+#endif
 
 //
 // Class used for storing a box, which is defined as a region
diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index c42b7bd17..a109019bd 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -36,6 +36,10 @@
 #include <sys/param.h>
 #include <netinet/tcp.h>
 
+#ifdef SOLARIS
+#include <sys/filio.h> // define FIONREAD
+#endif
+
 int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )
 {
 	va_list arg_ptr;
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3908e43f8..8ea8f4a75 100755
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -36,6 +36,12 @@
 #include "zm_event.h"
 #include "zm_monitor.h"
 
+// sendfile tricks
+extern "C"
+{
+#include "zm_sendfile.h"
+}
+
 #include "zmf.h"
 
 #if HAVE_SYS_SENDFILE_H
@@ -1431,7 +1437,7 @@ bool EventStream::sendFrame( int delta_us )
 	if(send_raw) {
 #if HAVE_SENDFILE  
 		fprintf( stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size );
-		if(sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (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 ) {
@@ -1544,8 +1550,10 @@ void EventStream::runStream()
             if ( ((curr_frame_id-1)%frame_mod) == 0 )
             {
                 delta_us = (unsigned int)(frame_data->delta * 1000000);
-                if ( effective_fps < base_fps )
-                    delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
+                // if effective > base we should speed up frame delivery
+                delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
+                // but must not exceed maxfps
+                delta_us = max(delta_us, 1000000 / maxfps); 
                 send_frame = true;
             }
         }
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index be1fac8f1..f1498d4a9 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -86,13 +86,21 @@ SWScale::SWScale() : gotdefaults(false), swscale_ctx(NULL), input_avframe(NULL),
 	Debug(4,"SWScale object created");
 
 	/* Allocate AVFrame for the input */
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+	input_avframe = av_frame_alloc();
+#else
 	input_avframe = avcodec_alloc_frame();
+#endif
 	if(input_avframe == NULL) {
 		Fatal("Failed allocating AVFrame for the input");
 	}
 
 	/* Allocate AVFrame for the output */
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+	output_avframe = av_frame_alloc();
+#else
 	output_avframe = avcodec_alloc_frame();
+#endif
 	if(output_avframe == NULL) {
 		Fatal("Failed allocating AVFrame for the output");
 	}
@@ -140,7 +148,7 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
 		return -3;
 	}
 
-#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 8, 0)
+#if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
 	/* Warn if the input or output pixelformat is not supported */
 	if(!sws_isSupportedInput(in_pf)) {
 		Warning("swscale does not support the input format: %c%c%c%c",(in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index cee7187a9..33f9c7faf 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -32,7 +32,17 @@ extern "C" {
 #include <libavutil/avutil.h>
 #include <libavutil/base64.h>
 #include <libavutil/mathematics.h>
-#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(50, 28, 0)
+
+/* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg
+ * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)
+ * a is the major version
+ * b and c the minor and micro versions of libav
+ * d and e the minor and micro versions of FFmpeg */
+#define LIBAVUTIL_VERSION_CHECK(a, b, c, d, e) \
+    ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+      (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+
+#if LIBAVUTIL_VERSION_CHECK(50, 29, 0, 29, 0)
 #include <libavutil/opt.h>
 #else
 #include <libavcodec/opt.h>
@@ -42,43 +52,82 @@ extern "C" {
 #include <ffmpeg/base64.h>
 #include <ffmpeg/mathematics.h>
 #include <ffmpeg/opt.h>
-#endif
+#endif /* HAVE_LIBAVUTIL_AVUTIL_H */
 
 // AVCODEC
 #if HAVE_LIBAVCODEC_AVCODEC_H
 #include <libavcodec/avcodec.h>
+
+/*
+ * LIBAVCODEC_VERSION_CHECK checks for the right version of libav and FFmpeg
+ * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)
+ * a is the major version
+ * b and c the minor and micro versions of libav
+ * d and e the minor and micro versions of FFmpeg */
+#define LIBAVCODEC_VERSION_CHECK(a, b, c, d, e) \
+    ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+      (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+
 #elif HAVE_FFMPEG_AVCODEC_H
 #include <ffmpeg/avcodec.h>
-#endif
-	
+#endif /* HAVE_LIBAVCODEC_AVCODEC_H */
+
 #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
+#if LIBAVCODEC_VERSION_CHECK(54, 25, 0, 51, 100)
     #define _AVCODECID AVCodecID
 #else
     #define _AVCODECID CodecID
 #endif
-#endif
+#endif /* HAVE_LIBAVCODEC_AVCODEC_H */
 
 // AVFORMAT
 #if HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
+
+/* LIBAVFORMAT_VERSION_CHECK checks for the right version of libav and FFmpeg
+ * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)
+ * a is the major version
+ * b and c the minor and micro versions of libav
+ * d and e the minor and micro versions of FFmpeg */
+#define LIBAVFORMAT_VERSION_CHECK(a, b, c, d, e) \
+    ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+      (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+
 #elif HAVE_FFMPEG_AVFORMAT_H
 #include <ffmpeg/avformat.h>
-#endif
+#endif /* HAVE_LIBAVFORMAT_AVFORMAT_H */
 
 // AVDEVICE
 #if HAVE_LIBAVDEVICE_AVDEVICE_H
 #include <libavdevice/avdevice.h>
+
+/* LIBAVDEVICE_VERSION_CHECK checks for the right version of libav and FFmpeg
+ * a is the major version
+ * b and c the minor and micro versions of libav
+ * d and e the minor and micro versions of FFmpeg */
+#define LIBAVDEVICE_VERSION_CHECK(a, b, c, d, e) \
+    ( (LIBAVDEVICE_VERSION_MICRO <  100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+      (LIBAVDEVICE_VERSION_MICRO >= 100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+
 #elif HAVE_FFMPEG_AVDEVICE_H
 #include <ffmpeg/avdevice.h>
-#endif
+#endif /* HAVE_LIBAVDEVICE_AVDEVICE_H */
 
 // SWSCALE
 #if HAVE_LIBSWSCALE_SWSCALE_H
 #include <libswscale/swscale.h>
+
+/* LIBSWSCALE_VERSION_CHECK checks for the right version of libav and FFmpeg
+ * a is the major version
+ * b and c the minor and micro versions of libav
+ * d and e the minor and micro versions of FFmpeg */
+#define LIBSWSCALE_VERSION_CHECK(a, b, c, d, e) \
+    ( (LIBSWSCALE_VERSION_MICRO <  100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+      (LIBSWSCALE_VERSION_MICRO >= 100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+
 #elif HAVE_FFMPEG_SWSCALE_H
 #include <ffmpeg/swscale.h>
-#endif
+#endif /* HAVE_LIBSWSCALE_SWSCALE_H */
 
 #ifdef __cplusplus
 }
@@ -86,7 +135,7 @@ extern "C" {
 
 #if ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
 
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(52, 107, 0, 107, 0)
  #if defined(AVIO_WRONLY)
    #define AVIO_FLAG_WRITE AVIO_WRONLY
  #else
@@ -131,7 +180,7 @@ protected:
 };
 #endif // HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
+#if !LIBAVCODEC_VERSION_CHECK(54, 25, 0, 51, 100)
 #define AV_CODEC_ID_NONE CODEC_ID_NONE
 #define AV_CODEC_ID_PCM_MULAW CODEC_ID_PCM_MULAW
 #define AV_CODEC_ID_PCM_ALAW CODEC_ID_PCM_ALAW
@@ -167,18 +216,18 @@ protected:
     inline static const std::string av_make_error_string(int errnum)
     {
         char errbuf[AV_ERROR_MAX_STRING_SIZE];
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 12, 13)
+#if LIBAVUTIL_VERSION_CHECK(50, 13, 0, 13, 0)
         av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
 #else
 		snprintf(errbuf, AV_ERROR_MAX_STRING_SIZE, "libav error %d", errnum);
 #endif
         return (std::string)errbuf;
     }
-	
+
     #undef av_err2str
     #define av_err2str(errnum) av_make_error_string(errnum).c_str()
 
-    #endif // __cplusplus 
+    #endif // __cplusplus
 
 
 #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 70869475d..b342d0ea8 100755
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -30,6 +30,12 @@ extern "C"{
 #define AV_ERROR_MAX_STRING_SIZE 64
 #endif
 
+#ifdef SOLARIS
+#include <sys/errno.h>	// for ESRCH
+#include <signal.h>
+#include <pthread.h>
+#endif
+
 FfmpegCamera::FfmpegCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
     Camera( p_id, FFMPEG_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 ),
     mPath( p_path ),
@@ -128,7 +134,7 @@ int FfmpegCamera::Capture( Image &image )
         void *retval = 0;
         int ret;
         
-        ret = pthread_tryjoin_np(mReopenThread, &retval);
+        ret = pthread_join(mReopenThread, &retval);
         if (ret != 0){
             Error("Could not join reopen thread.");
         }
@@ -172,7 +178,7 @@ int FfmpegCamera::Capture( Image &image )
         Debug( 5, "Got packet from stream %d", packet.stream_index );
         if ( packet.stream_index == mVideoStreamId )
         {
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
+#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
 			if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
 #else
 			if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
@@ -226,7 +232,7 @@ int FfmpegCamera::OpenFfmpeg() {
     mIsOpening = true;
 
     // Open the input, not necessarily a file
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
     Debug ( 1, "Calling av_open_input_file" );
     if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
 #else
@@ -283,7 +289,7 @@ int FfmpegCamera::OpenFfmpeg() {
     //mFormatContext->probesize = 32;
     //mFormatContext->max_analyze_duration = 32;
     // Locate stream info from avformat_open_input
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 6, 0, 6, 0)
     Debug ( 1, "Calling av_find_stream_info" );
     if ( av_find_stream_info( mFormatContext ) < 0 )
 #else
@@ -291,15 +297,14 @@ int FfmpegCamera::OpenFfmpeg() {
     if ( avformat_find_stream_info( mFormatContext, 0 ) < 0 )
 #endif
         Fatal( "Unable to find stream info from %s due to: %s", mPath.c_str(), strerror(errno) );
-    
-    Info( "Find stream info complete %s", mPath.c_str() );
+
     Debug ( 1, "Got stream info" );
 
     // Find first video stream present
     mVideoStreamId = -1;
     for (unsigned int i=0; i < mFormatContext->nb_streams; i++ )
     {
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
         if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
         if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
@@ -310,7 +315,7 @@ int FfmpegCamera::OpenFfmpeg() {
 		}
         if(mAudioStreamId == -1) //FIXME best way to copy all other streams?
         {
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
 		    if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
 #else
 		    if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
@@ -334,7 +339,7 @@ int FfmpegCamera::OpenFfmpeg() {
     Debug ( 1, "Found decoder" );
 
     // Open the codec
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 7, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
     Debug ( 1, "Calling avcodec_open" );
     if ( avcodec_open( mCodecContext, mCodec ) < 0 )
 #else
@@ -346,11 +351,19 @@ int FfmpegCamera::OpenFfmpeg() {
     Debug ( 1, "Opened 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
 
     // 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
+
     if(mRawFrame == NULL || mFrame == NULL)
         Fatal( "Unable to allocate frame for %s", mPath.c_str() );
 
@@ -377,11 +390,9 @@ int FfmpegCamera::OpenFfmpeg() {
     Fatal( "You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras" );
 #endif // HAVE_LIBSWSCALE
 
-    Info( "Primed capture from %s, video=%d, audio=%d", mPath.c_str(), mVideoStreamId, mAudioStreamId);
+    mCanCapture = true;
 
-	mCanCapture = true;
-
-    return( 0 );
+    return 0;
 }
 
 int FfmpegCamera::ReopenFfmpeg() {
@@ -421,7 +432,7 @@ int FfmpegCamera::CloseFfmpeg(){
     }
     if ( mFormatContext )
     {
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
         av_close_input_file( mFormatContext );
 #else
         avformat_close_input( &mFormatContext );
@@ -455,7 +466,7 @@ void *FfmpegCamera::ReopenFfmpegThreadCallback(void *ctx){
         // Close current stream.
         camera->CloseFfmpeg();
 
-        // Sleep if neccessary to not reconnect too fast.
+        // Sleep if necessary to not reconnect too fast.
         int wait = config.ffmpeg_open_timeout - (time(NULL) - camera->mOpenStart);
         wait = wait < 0 ? 0 : wait;
         if (wait > 0){
@@ -481,7 +492,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
         void *retval = 0;
         int ret;
         
-        ret = pthread_tryjoin_np(mReopenThread, &retval);
+        ret = pthread_join(mReopenThread, &retval);
         if (ret != 0){
             Error("Could not join reopen thread.");
         }
@@ -525,7 +536,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
         Debug( 5, "Got packet from stream %d", packet.stream_index );
         if ( packet.stream_index == mVideoStreamId )
         {
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
+#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
 			if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
 #else
 			if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index be5a50ce3..21e190ffb 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -104,13 +104,13 @@ Image::Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uin
     pixels = width*height;
     colours = p_colours;
     subpixelorder = p_subpixelorder;
-    size = (width*height)*colours;
+    size = pixels*colours;
     buffer = 0;
     holdbuffer = 0;
     if ( p_buffer )
     {
-	allocation = size;
-	buffertype = ZM_BUFTYPE_DONTFREE;
+		allocation = size;
+		buffertype = ZM_BUFTYPE_DONTFREE;
         buffer = p_buffer;
     }
     else
@@ -129,10 +129,10 @@ Image::Image( const Image &p_image )
     pixels = p_image.pixels;
     colours = p_image.colours;
     subpixelorder = p_image.subpixelorder;
-    size = allocation = p_image.size;
+    size = p_image.size; // allocation is set in AllocImgBuffer
     buffer = 0;
     holdbuffer = 0;
-    AllocImgBuffer(allocation);
+    AllocImgBuffer(size);
     (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
     strncpy( text, p_image.text, sizeof(text) );
 }
@@ -305,7 +305,7 @@ void Image::Initialise()
 	initialised = true;
 }
 
-/* Requests a writeable buffer to the image. This is safer than buffer() because this way we can gurantee that a buffer of required size exists */
+/* 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) {
 	unsigned int newsize;
   
@@ -331,7 +331,7 @@ uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_hei
 					return NULL;
 				} else {
 					/* Replace buffer with a bigger one */
-					DumpImgBuffer();
+					//DumpImgBuffer(); // Done in AllocImgBuffer too
 					AllocImgBuffer(newsize);
 				}
 			}
@@ -369,12 +369,12 @@ 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 );
+		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;
 	}
 	
 	if(holdbuffer && buffer) {
-		if((unsigned int)((p_height*p_width)*p_colours) > allocation) {
+		if(new_buffer_size > allocation) {
 			Error("Held buffer is undersized for assigned buffer");
 			return;
 		} else {
@@ -482,7 +482,7 @@ void Image::Assign( const Image &image ) {
 			}
 		} else {
 			if(new_size > allocation || !buffer) { 
-				DumpImgBuffer();
+				// DumpImgBuffer(); This is also done in AllocImgBuffer
 				AllocImgBuffer(new_size);
 			}
 		}
@@ -1580,7 +1580,11 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
 			{
 				uint8_t *psrc = images[j]->buffer+c;
 
+#ifndef SOLARIS
 				if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+#else
+				if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+#endif
 				{
 					count++;
 				}
@@ -1593,7 +1597,7 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
 	return( result );
 }
 
-/* New function to allow buffer re-using instead of allocationg memory for the delta image everytime */
+/* New function to allow buffer re-using instead of allocationg memory for the delta image every time */
 void Image::Delta( const Image &image, Image* targetimage) const
 {
 #ifdef ZM_IMAGE_PROFILING
diff --git a/src/zm_image_analyser.h b/src/zm_image_analyser.h
index d1d0c1da0..74cc7a73a 100644
--- a/src/zm_image_analyser.h
+++ b/src/zm_image_analyser.h
@@ -6,7 +6,6 @@
 #include <list>
 #include <string>
 #include <stdexcept>
-#include <iostream>
 #include <memory>
 
 #include "zm.h"
diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index 7b6add421..e2efa3dfb 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -32,6 +32,13 @@
 #include <stdlib.h>
 #include <limits.h>
 
+/* Workaround for GNU/kFreeBSD */
+#if defined(__FreeBSD_kernel__)
+#ifndef ENODATA
+#define ENODATA ENOATTR
+#endif
+#endif
+
 static unsigned int BigEndian;
 
 static int vidioctl( int fd, int request, void *arg )
@@ -255,7 +262,7 @@ static PixelFormat getFfPixFormatFromV4lPalette( int v4l_version, int palette )
 
 #if ZM_HAS_V4L2
 static char palette_desc[32];
-/* Automatic format selection prefered formats */
+/* Automatic format selection preferred formats */
 static const uint32_t prefered_rgb32_formats[] = {V4L2_PIX_FMT_BGR32, V4L2_PIX_FMT_RGB32, V4L2_PIX_FMT_BGR24, V4L2_PIX_FMT_RGB24, V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_YUV422P, V4L2_PIX_FMT_YUV420};
 static const uint32_t prefered_rgb24_formats[] = {V4L2_PIX_FMT_BGR24, V4L2_PIX_FMT_RGB24, V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_YUV422P, V4L2_PIX_FMT_YUV420};
 static const uint32_t prefered_gray8_formats[] = {V4L2_PIX_FMT_GREY, V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_YUV422P, V4L2_PIX_FMT_YUV420};
@@ -427,7 +434,7 @@ LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel,
 				Panic("Unexpected colours: %d",colours);
 			}
 			if( capture ) {
-#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(0, 8, 0)
+#if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
 				if(!sws_isSupportedInput(capturePixFormat)) {
 					Error("swscale does not support the used capture format: %c%c%c%c",(capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff));
 					conversion_type = 2; /* Try ZM format conversions */
@@ -615,7 +622,11 @@ LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel,
 #if HAVE_LIBSWSCALE
 	/* Initialize swscale stuff */
 	if(capture && conversion_type == 1) {
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+		tmpPicture = av_frame_alloc();
+#else
 		tmpPicture = avcodec_alloc_frame();
+#endif
 		if ( !tmpPicture )
 			Fatal( "Could not allocate temporary picture" );
 		
@@ -845,7 +856,11 @@ void LocalCamera::Initialise()
                 Fatal( "Can't map video buffer %d (%d bytes) to memory: %s(%d)", i, vid_buf.length, strerror(errno), errno );
 
 #if HAVE_LIBSWSCALE
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+		capturePictures[i] = av_frame_alloc();
+#else
 		capturePictures[i] = avcodec_alloc_frame();
+#endif
 		if ( !capturePictures[i] )
 			Fatal( "Could not allocate picture" );
 		avpicture_fill( (AVPicture *)capturePictures[i], (uint8_t*)v4l2_data.buffers[i].start, capturePixFormat, v4l2_data.fmt.fmt.pix.width, v4l2_data.fmt.fmt.pix.height );
@@ -999,7 +1014,11 @@ void LocalCamera::Initialise()
             v4l1_data.buffers[i].height = height;
             v4l1_data.buffers[i].format = palette;
 
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+            capturePictures[i] = av_frame_alloc();
+#else
             capturePictures[i] = avcodec_alloc_frame();
+#endif
             if ( !capturePictures[i] )
                 Fatal( "Could not allocate picture" );
             avpicture_fill( (AVPicture *)capturePictures[i], (unsigned char *)v4l1_data.bufptr+v4l1_data.frames.offsets[i], capturePixFormat, width, height );
diff --git a/src/zm_local_camera.h b/src/zm_local_camera.h
index 5e9d4352a..c20118115 100644
--- a/src/zm_local_camera.h
+++ b/src/zm_local_camera.h
@@ -29,6 +29,9 @@
 #ifdef HAVE_LINUX_VIDEODEV_H
 #include <linux/videodev.h>
 #endif // HAVE_LINUX_VIDEODEV_H
+#ifdef HAVE_LIBV4L1_VIDEODEV_H
+#include <libv4l1-videodev.h>
+#endif // HAVE_LIB4VL1_VIDEODEV_H
 #ifdef HAVE_LINUX_VIDEODEV2_H
 #include <linux/videodev2.h>
 #endif // HAVE_LINUX_VIDEODEV2_H
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index c64f6e7c0..f6cc9523b 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -31,6 +31,9 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <errno.h>
+#ifdef __FreeBSD__
+#include <sys/thr.h>
+#endif
 
 bool Logger::smInitialised = false;
 Logger *Logger::smInstance = 0;
@@ -527,9 +530,25 @@ void Logger::logPrint( bool hex, const char * const file, const int line, const
     #endif
 
         pid_t tid;
+#ifdef __FreeBSD__
+       long lwpid;
+       thr_self(&lwpid);
+       tid = lwpid;
+
+        if (tid < 0 ) // Thread/Process id
+#else
 #ifdef HAVE_SYSCALL
+	#ifdef __FreeBSD_kernel__
+        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+
+	# 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
+	#endif
 #endif // HAVE_SYSCALL
+#endif
         tid = getpid(); // Process id
 
         char *logPtr = logString;
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 5291e3b72..7fce3b642 100755
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -56,6 +56,11 @@
 #include <sys/shm.h>
 #endif // ZM_MEM_MAPPED
 
+// SOLARIS - we don't have MAP_LOCKED on openSolaris/illumos
+#ifndef MAP_LOCKED
+#define MAP_LOCKED 0
+#endif
+
 //=============================================================================
 std::vector<std::string> split(const std::string &s, char delim) {
     std::vector<std::string> elems;
@@ -252,7 +257,6 @@ bool Monitor::MonitorLink::hasAlarmed()
     else if( shared_data->last_event != (unsigned int)last_event )
     {
         last_event = shared_data->last_event;
-        return( true );
     }
     return( false );
 }
@@ -442,7 +446,7 @@ Monitor::Monitor(
         }
     }
 
-	// Will this not happen everytime a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
+	// Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
     if ( !n_zones ) {
 		Debug( 1, "Monitor %s has no zones, adding one.", name );
         n_zones = 1;
@@ -531,14 +535,18 @@ bool Monitor::connect() {
         Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
 		return false;
 	} else {
+#ifdef MAP_LOCKED
 		mem_ptr = (unsigned char *)mmap( NULL, 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 );
 				Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
+#ifdef MAP_LOCKED
 			}
 		}
+#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 );
     }
@@ -3101,7 +3109,7 @@ bool Monitor::closeEvent()
  * comparing it with ZM_COLOUR_RGB24 or ZM_COLOUR_RGB32 is the way ), and then
  * manage che check using RGB_VAL_RED() and so on macros instead of just RED().
  *
- * Be carefull that in 32 bit images we need to check also where the alpha channel is, so,
+ * Be careful that in 32 bit images we need to check also where the alpha channel is, so,
  * (RGBA and BGRA) or (ABGR and ARGB) aren't the same!
  *
  * To check black pixels in 32 bit images i can do a more efficient way using 
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index 2e29880ca..eaf0952af 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -43,12 +43,12 @@ VideoStream::MimeData VideoStream::mime_data[] = {
 void VideoStream::Initialise( )
 {
 	if ( logDebugging() )
-        av_log_set_level( AV_LOG_DEBUG ); 
+        av_log_set_level( AV_LOG_DEBUG );
     else
-        av_log_set_level( AV_LOG_QUIET ); 
-	
+        av_log_set_level( AV_LOG_QUIET );
+
 	av_register_all( );
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 13, 0)
+#if LIBAVFORMAT_VERSION_CHECK(53, 13, 0, 19, 0)
 	avformat_network_init();
 #endif
 	initialised = true;
@@ -58,18 +58,18 @@ void VideoStream::SetupFormat( )
 {
 	/* allocate the output media context */
 	ofc = NULL;
-#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 5, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+#if (LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 2, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
 	avformat_alloc_output_context2( &ofc, NULL, format, filename );
 #else
 	AVFormatContext *s= avformat_alloc_context();
-	if(!s) 
+	if(!s)
 	{
 		Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
 	}
-	
+
 	AVOutputFormat *oformat;
 	if (format) {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 45, 0)
+#if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
 		oformat = av_guess_format(format, NULL, NULL);
 #else
 		oformat = guess_format(format, NULL, NULL);
@@ -78,7 +78,7 @@ void VideoStream::SetupFormat( )
 			Fatal( "Requested output format '%s' is not a suitable output format", format );
 		}
 	} else {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 45, 0)
+#if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
 		oformat = av_guess_format(NULL, filename, NULL);
 #else
 		oformat = guess_format(NULL, filename, NULL);
@@ -95,7 +95,7 @@ void VideoStream::SetupFormat( )
 		{
 			Fatal( "Could not allocate private data for output format." );
 		}
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 92, 0)
+#if LIBAVFORMAT_VERSION_CHECK(52, 92, 0, 92, 0)
 		if (s->oformat->priv_class) {
 			*(const AVClass**)s->priv_data = s->oformat->priv_class;
 			av_opt_set_defaults(s->priv_data);
@@ -109,7 +109,7 @@ void VideoStream::SetupFormat( )
 	
 	if(filename)
 	{
-		snprintf( s->filename, sizeof(s->filename), filename );
+		snprintf( s->filename, sizeof(s->filename), "%s", filename );
 	}
 	
 	ofc = s;
@@ -186,7 +186,7 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
             }
             else
             {
-#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+#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 ) );
 #else
                     Debug( 1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id );
@@ -202,20 +202,20 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 		codec = avcodec_find_encoder( codec_id );
 		if ( !codec )
 		{
-#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+#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 ) );
 #else
 			Fatal( "Could not find encoder for '%d'", codec_id );
 #endif
 		}
 
-#if ((LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 11, 0)) && (LIBAVFORMAT_VERSION_MICRO >= 100))
+#if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
 		Debug( 1, "Found encoder for '%s'", avcodec_get_name( codec_id ) );
 #else
 		Debug( 1, "Found encoder for '%d'", codec_id );
 #endif
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 10, 0)		
+#if LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
 		ost = avformat_new_stream( ofc, codec );
 #else
 		ost = av_new_stream( ofc, 0 );
@@ -262,7 +262,7 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 		/* emit one intra frame every second */
 		c->gop_size = frame_rate;
 
-		// some formats want stream headers to be seperate
+		// some formats want stream headers to be separate
 		if ( of->flags & AVFMT_GLOBALHEADER )
 			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
 	}
@@ -311,7 +311,7 @@ void VideoStream::OpenStream( )
 		AVCodecContext *c = ost->codec;
 		
 		/* open the codec */
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 7, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
 		if ( (avRet = avcodec_open( c, codec )) < 0 )
 #else
 		if ( (avRet = avcodec_open2( c, codec, 0 )) < 0 )
@@ -323,7 +323,11 @@ void VideoStream::OpenStream( )
 		Debug( 1, "Opened codec" );
 
 		/* allocate the encoded raw picture */
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+		opicture = av_frame_alloc( );
+#else
 		opicture = avcodec_alloc_frame( );
+#endif
 		if ( !opicture )
 		{
 			Panic( "Could not allocate opicture" );
@@ -344,7 +348,11 @@ void VideoStream::OpenStream( )
 		tmp_opicture = NULL;
 		if ( c->pix_fmt != pf )
 		{
+#if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
+			tmp_opicture = av_frame_alloc( );
+#else
 			tmp_opicture = avcodec_alloc_frame( );
+#endif
 			if ( !tmp_opicture )
 			{
 				Panic( "Could not allocate tmp_opicture" );
@@ -364,9 +372,9 @@ void VideoStream::OpenStream( )
 	if ( !(of->flags & AVFMT_NOFILE) )
 	{
 		int ret;
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 14, 0)
+#if LIBAVFORMAT_VERSION_CHECK(53, 15, 0, 21, 0)
 		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
-#elif LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 102, 0)
+#elif LIBAVFORMAT_VERSION_CHECK(52, 102, 0, 102, 0)
 		ret = avio_open( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #else
 		ret = url_fopen( &ofc->pb, filename, AVIO_FLAG_WRITE );
@@ -395,19 +403,19 @@ void VideoStream::OpenStream( )
 			Fatal("Unable to malloc memory for outbuf");
 		}
 	}
-	
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 100, 1)
+
+#if LIBAVFORMAT_VERSION_CHECK(52, 101, 0, 101, 0)
 	av_dump_format(ofc, 0, filename, 1);
 #else
 	dump_format(ofc, 0, filename, 1);
 #endif
-    
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0)
+
+#if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
     int ret = av_write_header( ofc );
 #else
     int ret = avformat_write_header( ofc, NULL );
 #endif
-    
+
     if ( ret < 0 )
     {
         Fatal( "?_write_header failed with error %d \"%s\"", ret, av_err2str( ret ) );
@@ -525,7 +533,7 @@ VideoStream::~VideoStream( )
 	if ( !(of->flags & AVFMT_NOFILE) )
 	{
 		/* close the output file */
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if LIBAVFORMAT_VERSION_CHECK(52, 105, 0, 105, 0)
 		avio_close( ofc->pb );
 #else
 		url_fclose( ofc->pb );
@@ -625,7 +633,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
     int got_packet = 0;
 	if ( of->flags & AVFMT_RAWPICTURE )
 	{
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 2, 1)
+#if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
 		pkt->flags |= AV_PKT_FLAG_KEY;
 #else
 		pkt->flags |= PKT_FLAG_KEY;
@@ -640,7 +648,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 		opicture_ptr->pts = c->frame_number;
 		opicture_ptr->quality = c->global_quality;
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 0, 0)
+#if LIBAVFORMAT_VERSION_CHECK(54, 1, 0, 2, 100)
 		int ret = avcodec_encode_video2( c, pkt, opicture_ptr, &got_packet );
 		if ( ret != 0 )
 		{
@@ -656,7 +664,7 @@ double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size,
 		{
 			if ( c->coded_frame->key_frame )
 			{
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
 				pkt->flags |= AV_PKT_FLAG_KEY;
 #else
 				pkt->flags |= PKT_FLAG_KEY;
diff --git a/src/zm_poly.cpp b/src/zm_poly.cpp
index eef5dd56a..4eee73f46 100644
--- a/src/zm_poly.cpp
+++ b/src/zm_poly.cpp
@@ -20,7 +20,11 @@
 #include "zm.h"
 #include "zm_poly.h"
 
+#ifndef SOLARIS
 #include <math.h>
+#else
+#include <cmath>
+#endif
 
 void Polygon::calcArea()
 {
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index fdbfd69a6..c6de64aed 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -26,6 +26,10 @@
 #include <errno.h>
 #include <netdb.h>
 
+#ifdef SOLARIS
+#include <sys/filio.h> // FIONREAD and friends
+#endif
+
 RemoteCameraHttp::RemoteCameraHttp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
     RemoteCamera( p_id, "http", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture )
 {
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 910b2ac42..9f7b39227 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -162,7 +162,7 @@ int RemoteCameraRtsp::PrimeCapture()
     mVideoStreamId = -1;
     
     for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
 	if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
 	if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
@@ -183,7 +183,7 @@ int RemoteCameraRtsp::PrimeCapture()
         Panic( "Unable to locate codec %d decoder", mCodecContext->codec_id );
 
     // Open codec
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 7, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
     if ( avcodec_open( mCodecContext, mCodec ) < 0 )
 #else
     if ( avcodec_open2( mCodecContext, mCodec, 0 ) < 0 )
@@ -191,11 +191,19 @@ int RemoteCameraRtsp::PrimeCapture()
         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
 
     // 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
+
 	if(mRawFrame == NULL || mFrame == NULL)
 		Fatal( "Unable to allocate frame(s)");
 	
@@ -292,7 +300,7 @@ int RemoteCameraRtsp::Capture( Image &image )
 	    {
 		packet.data = buffer.head();
 		packet.size = buffer.size();
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 25, 0)
+#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 );
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index 76b000c9d..02fdc4e22 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -211,7 +211,7 @@ RtspThread::~RtspThread()
 {
     if ( mFormatContext )
     {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 96, 0)
+#if LIBAVFORMAT_VERSION_CHECK(52, 96, 0, 96, 0)
         avformat_free_context( mFormatContext );
 #else
         av_free_format_context( mFormatContext );
@@ -392,7 +392,7 @@ int RtspThread::run()
     		if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) )
     			{
     				mUrl = trimSpaces( lines[i].substr( 13 ) );
-    				Info("Recieved new Content-Base in DESCRIBE reponse header. Updated device Url to: '%s'", mUrl.c_str() );
+    				Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() );
     				break;
     			}
     	}
@@ -437,7 +437,7 @@ int RtspThread::run()
         for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
         {
             SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream( i );
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
             if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
             if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index 361b58850..dbc63a82f 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -23,7 +23,7 @@
 
 #include "zm_sdp.h"
 
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
 SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = {
     { 0, "PCMU",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_MULAW,  8000,  1 },
     { 3, "GSM",    AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
@@ -372,7 +372,7 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
     for ( unsigned int i = 0; i < mMediaList.size(); i++ )
     {
         const MediaDescriptor *mediaDesc = mMediaList[i];
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 8, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
         AVStream *stream = av_new_stream( formatContext, i );
 #else
         AVStream *stream = avformat_new_stream( formatContext, NULL );
@@ -380,7 +380,7 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
 #endif
 
         Debug( 1, "Looking for codec for %s payload type %d / %s",  mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
         if ( mediaDesc->getType() == "video" )
             stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         else if ( mediaDesc->getType() == "audio" )
@@ -396,6 +396,9 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
             stream->codec->codec_type = CODEC_TYPE_DATA;
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
+        std::string codec_name;
+#endif
         if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC )
         {
             // Look in static table
@@ -404,7 +407,11 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
                 if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() )
                 {
                     Debug( 1, "Got static payload type %d, %s", smStaticPayloads[i].payloadType, smStaticPayloads[i].payloadName );
+#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
+                    codec_name = std::string( smStaticPayloads[i].payloadName );
+#else
                     strncpy( stream->codec->codec_name, smStaticPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+#endif
                     stream->codec->codec_type = smStaticPayloads[i].codecType;
                     stream->codec->codec_id = smStaticPayloads[i].codecId;
                     stream->codec->sample_rate = smStaticPayloads[i].clockRate;
@@ -420,7 +427,11 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
                 if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() )
                 {
                     Debug( 1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[i].payloadName );
+#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
+                    codec_name = std::string( smStaticPayloads[i].payloadName );
+#else
                     strncpy( stream->codec->codec_name, smDynamicPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+#endif
                     stream->codec->codec_type = smDynamicPayloads[i].codecType;
                     stream->codec->codec_id = smDynamicPayloads[i].codecId;
                     stream->codec->sample_rate = mediaDesc->getClock();
@@ -428,7 +439,12 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
                 }
             }
         }
+
+#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
+        if ( codec_name.empty() )
+#else
         if ( !stream->codec->codec_name[0] )
+#endif
         {
             Warning( "Can't find payload details for %s payload type %d, name %s", mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
             //return( 0 );
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index fb56a2886..21eb227c1 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -40,7 +40,7 @@ protected:
     {
         int payloadType;
         const char payloadName[6];
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
         AVMediaType codecType;
 #else
 		enum CodecType codecType;
@@ -53,7 +53,7 @@ protected:
     struct DynamicPayloadDesc
     {
         const char payloadName[32];
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
         AVMediaType codecType;
 #else
 		enum CodecType codecType;
diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
new file mode 100644
index 000000000..ce3405d66
--- /dev/null
+++ b/src/zm_sendfile.h
@@ -0,0 +1,31 @@
+#ifdef HAVE_SENDFILE4_SUPPORT
+#include <sys/sendfile.h>
+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)
+                return -errno;
+
+        return err;
+}
+#elif HAVE_SENDFILE7_SUPPORT
+#include <sys/types.h>
+#include <sys/socket.h>
+#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);
+        if (err && errno != EAGAIN)
+                return -errno;
+
+        if (size) {
+                *offset += size;
+                return size;
+        }
+
+        return -EAGAIN;
+}
+#else
+#error "Your platform does not support sendfile. Sorry."
+#endif
diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
index 6db4697ed..91e1bc4ba 100644
--- a/src/zm_signal.cpp
+++ b/src/zm_signal.cpp
@@ -64,12 +64,19 @@ RETSIGTYPE zm_die_handler(int signal)
 		      info->si_uid, info->si_status);
 
 		ucontext_t *uc = (ucontext_t *) context;
+		cr2 = info->si_addr;
 #if defined(__x86_64__)
-		cr2 = info->si_addr;
+	#ifdef __FreeBSD_kernel__
+		ip = (void *)(uc->uc_mcontext.mc_rip);
+	#else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
+	#endif
 #else
-		cr2 = info->si_addr;
+	#ifdef __FreeBSD_kernel__
+		ip = (void *)(uc->uc_mcontext.mc_eip);
+	#else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
+	#endif
 #endif				// defined(__x86_64__)
 
 		// Print the signal address and instruction pointer if available
diff --git a/src/zm_thread.h b/src/zm_thread.h
index 6a0d169f0..615bec6aa 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -28,12 +28,34 @@
 #endif // HAVE_SYS_SYSCALL_H
 #include "zm_exception.h"
 #include "zm_utils.h"
+#ifdef __FreeBSD__
+#include <sys/thr.h>
+#endif
 
 class ThreadException : public Exception
 {
+private:
+#ifndef SOLARIS
+pid_t pid() {
+    pid_t tid; 
+#ifdef __FreeBSD__ 
+    long lwpid; 
+    thr_self(&lwpid); 
+    tid = lwpid; 
+#else 
+    #ifdef __FreeBSD_kernel__
+        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+    # else
+        tid=syscall(SYS_gettid); 
+    #endif
+#endif
+    return tid;
+}	
+#else
+pthread_t pid() { return( pthread_self() ); }
+#endif
 public:
-    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
-    {
+    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
     }
 };
 
@@ -195,7 +217,11 @@ protected:
 
     Mutex mThreadMutex;
     Condition mThreadCondition;
+#ifndef SOLARIS
     pid_t mPid;
+#else
+    pthread_t mPid;
+#endif
     bool  mStarted;
     bool  mRunning;
 
@@ -203,10 +229,30 @@ protected:
     Thread();
     virtual ~Thread();
 
+#ifndef SOLARIS
     pid_t id() const
     {
-        return( (pid_t)syscall(SYS_gettid) );
+        pid_t tid; 
+#ifdef __FreeBSD__ 
+        long lwpid; 
+        thr_self(&lwpid); 
+        tid = lwpid; 
+#else 
+    #ifdef __FreeBSD_kernel__
+        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+
+    #else
+        tid=syscall(SYS_gettid); 
+    #endif
+#endif
+return tid;
     }
+#else
+    pthread_t id() const
+    {
+        return( pthread_self() );
+    }
+#endif
     void exit( int status = 0 )
     {
         //INFO( "Exiting" );
diff --git a/src/zm_timer.h b/src/zm_timer.h
index 6c7663b87..7afe0a647 100644
--- a/src/zm_timer.h
+++ b/src/zm_timer.h
@@ -32,8 +32,28 @@ class Timer
 private:
     class TimerException : public Exception
     {
+    private:
+#ifndef SOLARIS
+        pid_t pid() {
+		pid_t tid;
+#ifdef __FreeBSD__
+		long lwpid;
+		thr_self(&lwpid);
+		tid = lwpid;
+#else
+    #ifdef __FreeBSD_kernel__
+                if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+    #else
+		tid=syscall(SYS_gettid);
+    #endif
+#endif
+		return tid;
+        }
+#else
+	pthread_t pid() { return( pthread_self() ); }
+#endif
     public:
-        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
+        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) )
         {
         }
     };
diff --git a/src/zma.cpp b/src/zma.cpp
index cb6ddb4e8..e45327cc1 100644
--- a/src/zma.cpp
+++ b/src/zma.cpp
@@ -70,7 +70,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 397468140..5be5ed8af 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -19,12 +19,16 @@
 
 #include <getopt.h>
 #include <signal.h>
-#if defined(BSD)
+#if defined(__FreeBSD__)
 #include <limits.h>
 #else
 #include <values.h>
 #endif
 
+#if !defined(MAXINT)
+#define MAXINT INT_MAX
+#endif
+
 #include "zm.h"
 #include "zm_db.h"
 #include "zm_time.h"
@@ -111,7 +115,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
@@ -270,21 +274,21 @@ int main( int argc, char *argv[] )
 			{
 				if ( monitors[i]->PreCapture() < 0 )
 				{
-                    Error( "Failed to pre-capture monitor %d (%d/%d)", monitors[i]->Id(), i, n_monitors );
+                    Error( "Failed to pre-capture monitor %d %d (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
                     zm_terminate = true;
                     result = -1;
                     break;
 				}
 				if ( monitors[i]->Capture() < 0 )
 				{
-                    Error( "Failed to capture image from monitor %d (%d/%d)", monitors[i]->Id(), i, n_monitors );
+                    Error( "Failed to capture image from monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
                     zm_terminate = true;
                     result = -1;
                     break;
 				}
 				if ( monitors[i]->PostCapture() < 0 )
 				{
-                    Error( "Failed to post-capture monitor %d (%d/%d)", monitors[i]->Id(), i, n_monitors );
+                    Error( "Failed to post-capture monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
                     zm_terminate = true;
                     result = -1;
                     break;
diff --git a/src/zmf.cpp b/src/zmf.cpp
index d97a9e5d5..94bd0bdb5 100644
--- a/src/zmf.cpp
+++ b/src/zmf.cpp
@@ -138,7 +138,7 @@ int main( int argc, char *argv[] )
 				Usage();
 				break;
 			case 'v':
-				cout << ZM_VERSION << "\n";
+				std::cout << ZM_VERSION << "\n";
 				exit(0);
 			default:
 				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
diff --git a/src/zmstreamer.cpp b/src/zmstreamer.cpp
index 5c11cfbea..7385accca 100644
--- a/src/zmstreamer.cpp
+++ b/src/zmstreamer.cpp
@@ -102,7 +102,7 @@ int main(int argc, char** argv) {
                 printf("-v : This installed version of ZoneMinder\n");
                 return EXIT_SUCCESS;
             case 'v':
-                cout << ZM_VERSION << "\n";
+                std::cout << ZM_VERSION << "\n";
                 exit(0);
         }
     }
diff --git a/web/ajax/event.php b/web/ajax/event.php
index d5cc2b09d..1953acab0 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -1,4 +1,6 @@
 <?php
+# We use session vars in here, so we need to restart the session because we stopped it in index.php to improve concurrency.
+session_start();
 
 if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
     ajaxError( "No event id(s) supplied" );
diff --git a/web/ajax/log.php b/web/ajax/log.php
index 3dc3072ea..3decbd124 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -212,7 +212,7 @@ switch ( $_REQUEST['task'] )
             }
             case 'tsv' :
             {
-                fprintf( $exportFP, $SLANG['DateTime']."\t".$SLANG['Component']."\t".$SLANG['Pid']."\t".$SLANG['Level']."\t".$SLANG['Message']."\t".$SLANG['File']."\t".$SLANG['Line']."\n" );
+                fprintf( $exportFP, translate('DateTime')."\t".translate('Component')."\t".translate('Pid')."\t".translate('Level')."\t".translate('Message')."\t".translate('File')."\t".translate('Line')."\n" );
                 foreach ( $logs as $log )
                 {
                     fprintf( $exportFP, "%s\t%s\t%d\t%s\t%s\t%s\t%s\n", $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
@@ -225,7 +225,7 @@ switch ( $_REQUEST['task'] )
 '<!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>'.$SLANG['ZoneMinderLog'].'</title>
+    <title>'.translate('ZoneMinderLog').'</title>
     <style type="text/css">
 body, h3, p, table, td {
     font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -260,12 +260,12 @@ tr.log-dbg td {
     </style>
   </head>
   <body>
-    <h3>'.$SLANG['ZoneMinderLog'].'</h3>
+    <h3>'.translate('ZoneMinderLog').'</h3>
     <p>'.htmlspecialchars(preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG )).'</p>
-    <p>'.count($logs).' '.$SLANG['Logs'].'</p>
+    <p>'.count($logs).' '.translate('Logs').'</p>
     <table>
       <tbody>
-        <tr><th>'.$SLANG['DateTime'].'</th><th>'.$SLANG['Component'].'</th><th>'.$SLANG['Pid'].'</th><th>'.$SLANG['Level'].'</th><th>'.$SLANG['Message'].'</th><th>'.$SLANG['File'].'</th><th>'.$SLANG['Line'].'</th></tr>
+        <tr><th>'.translate('DateTime').'</th><th>'.translate('Component').'</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 )
                 {
@@ -288,7 +288,7 @@ tr.log-dbg td {
             {
                 fwrite( $exportFP,
 '<?xml version="1.0" encoding="utf-8"?>
-<logexport title="'.$SLANG['ZoneMinderLog'].'" date="'.htmlspecialchars(preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG )).'">
+<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 != '' )
@@ -298,7 +298,7 @@ tr.log-dbg td {
   </filter>' );
                 fwrite( $exportFP, 
 '  <columns>
-    <column field="datetime">'.$SLANG['DateTime'].'</column><column field="component">'.$SLANG['Component'].'</column><column field="pid">'.$SLANG['Pid'].'</column><column field="level">'.$SLANG['Level'].'</column><column field="message">'.$SLANG['Message'].'</column><column field="file">'.$SLANG['File'].'</column><column field="line">'.$SLANG['Line'].'</column>
+    <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</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).'">
 ' );
diff --git a/web/ajax/status.php b/web/ajax/status.php
index bd334ead0..4d4ad8345 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -8,7 +8,7 @@ $statusData = array(
         "elements" => array(
             "MonitorCount" => array( "sql" => "count(*)" ),
             "ActiveMonitorCount" => array( "sql" => "count(if(Function != 'None',1,NULL))" ),
-            "State" => array( "func" => "daemonCheck()?".$SLANG['Running'].":".$SLANG['Stopped'] ),
+            "State" => array( "func" => "daemonCheck()?".translate('Running').":".translate('Stopped') ),
             "Load" => array( "func" => "getLoad()" ),
             "Disk" => array( "func" => "getDiskPercent()" ),
         ),
diff --git a/web/includes/lang.php b/web/includes/lang.php
index 94ebba530..30af6f4c0 100644
--- a/web/includes/lang.php
+++ b/web/includes/lang.php
@@ -18,6 +18,15 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
+function translate( $name )
+{
+    global $SLANG;
+    if ( array_key_exists( $name, $SLANG ) )
+        return $SLANG[$name];
+    else
+        return $name;
+}
+
 function loadLanguage( $prefix="" )
 {
     global $user;
diff --git a/web/index.php b/web/index.php
index 9303a26c8..6167dc4dc 100644
--- a/web/index.php
+++ b/web/index.php
@@ -63,30 +63,30 @@ if ( isset($_GET['skin']) )
     $skin = $_GET['skin'];
 elseif ( isset($_COOKIE['zmSkin']) )
     $skin = $_COOKIE['zmSkin'];
-elseif ( defined(ZM_SKIN_DEFAULT) )
+elseif ( defined('ZM_SKIN_DEFAULT') )
 	$skin = ZM_SKIN_DEFAULT;
 else
     $skin = "classic";
 
 $skins = array_map( 'basename', glob('skins/*',GLOB_ONLYDIR) );
 if ( ! in_array( $skin, $skins ) ) {
-	Error( "Invalid skin '$skin'" );
-	$skin = 'classic';
+	Error( "Invalid skin '$skin' setting to " . $skins[0] );
+	$skin = $skins[0];
 }
 
 if ( isset($_GET['css']) )
 	$css = $_GET['css'];
 elseif ( isset($_COOKIE['zmCSS']) )
 	$css = $_COOKIE['zmCSS'];
-elseif (defined(ZM_CSS_DEFAULT))
+elseif (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 ) ) {
-	Error( "Invalid skin css '$css'" );
-	$css = 'classic';
+	Error( "Invalid skin css '$css' setting to " . $css_skins[0] );
+	$css = $css_skins[0];
 }
 
 define( "ZM_BASE_PATH", dirname( $_SERVER['REQUEST_URI'] ) );
@@ -102,13 +102,13 @@ ini_set( "session.name", "ZMSESSID" );
 
 session_start();
 
-if ( !isset($_SESSION['skin']) || isset($_REQUEST['skin']) )
+if ( !isset($_SESSION['skin']) || isset($_REQUEST['skin']) || !isset($_COOKIE['zmSkin']) || $_COOKIE['zmSkin'] != $skin )
 {
     $_SESSION['skin'] = $skin;
     setcookie( "zmSkin", $skin, time()+3600*24*30*12*10 );
 }
 
-if ( !isset($_SESSION['css']) || isset($_REQUEST['css']) ) {
+if ( !isset($_SESSION['css']) || isset($_REQUEST['css']) || !isset($_COOKIE['zmCSS']) || $_COOKIE['zmCSS'] != $css ) {
 	$_SESSION['css'] = $css;
 	setcookie( "zmCSS", $css, time()+3600*24*30*12*10 );
 }
@@ -143,6 +143,10 @@ if ( ZM_OPT_USE_AUTH && ! isset($user) && $view != 'login' ) {
     $view = 'login';
 }
 
+# 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 uses the session must re-open it.
+session_write_close();
+
 if ( isset( $_REQUEST['request'] ) )
 {
     foreach ( getSkinIncludes( 'ajax/'.$request.'.php', true, true ) as $includeFile )
diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index f218109c1..84da0f622 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -92,6 +92,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => '警告',
     'All'                  => '全部',
     'Apply'                => '確定',
@@ -136,13 +137,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -162,7 +163,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob Sizes',
     'Blobs'                => 'Blobs',
     'Brightness'           => '亮度',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => '緩衝',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -206,6 +209,7 @@ $SLANG = array(
     'CaptureHeight'        => '捕捉高度',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => '捕捉格式',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => '捕捉寬度',
     'Cause'                => '因素',
     'CheckMethod'          => 'Alarm Check Method',
@@ -236,6 +240,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => '分區輪流檢視',
     'CycleWatch'           => '分區輪流檢視',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -244,12 +249,15 @@ $SLANG = array(
     'DefaultRate'          => '預設速率',
     'DefaultScale'         => '預設尺寸',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => '刪除',
     'DeleteAndNext'        => '刪除 &amp; 下一事件',
     'DeleteAndPrev'        => '刪除 &amp; 上一事件',
     'DeleteSavedFilter'    => '刪除儲存過濾',
     'Description'          => '描述',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => '裝置通道',
     'DeviceFormat'         => '裝置格式',
@@ -261,6 +269,7 @@ $SLANG = array(
     'Disk'                 => '磁碟',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -270,7 +279,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => '下載',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => '歷時',
@@ -313,10 +321,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => '自動儲存符合項目',
     'FilterDeleteEvents'   => '自動刪除符合項目',
     'FilterEmailEvents'    => '自動寄出詳細符合項目',
     'FilterExecuteEvents'  => '自動執行符合指令',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => '自動發出符合訊息',
     'FilterPx'             => 'Filter Px',
     'FilterUnset'          => '您必需設定濾鏡的寬度和高度',
@@ -326,12 +336,12 @@ $SLANG = array(
     'First'                => 'First',
     'FlippedHori'          => '水平反轉',
     'FlippedVert'          => '垂直反轉',
-    'FnNone'               => 'None',            // Added 2013.08.16.
-    'FnMonitor'            => 'Monitor',            // Added 2013.08.16.
-    'FnModect'             => 'Modect',            // Added 2013.08.16.
-    'FnRecord'             => 'Record',            // Added 2013.08.16.
     'FnMocord'             => 'Mocord',            // Added 2013.08.16.
+    'FnModect'             => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'            => 'Monitor',            // Added 2013.08.16.
     'FnNodect'             => 'Nodect',            // Added 2013.08.16.
+    'FnNone'               => 'None',            // Added 2013.08.16.
+    'FnRecord'             => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'Force Alarm',
     'Format'               => '格式',
@@ -339,7 +349,6 @@ $SLANG = array(
     'FrameId'              => '框架 Id',
     'FrameRate'            => '框架速率',
     'FrameSkip'            => '框架忽略',
-    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Frames'               => '框架',
     'Func'                 => 'Func',
     'Function'             => '功能',
@@ -466,6 +475,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => '細項',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => '監視',
     'MonitorIds'           => 'Monitor&nbsp;Ids',
     'MonitorPreset'        => 'Monitor Preset',
@@ -476,12 +486,13 @@ $SLANG = array(
     'Montage'              => '全部顯示',
     'Month'                => '月',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Move'                 => '移動',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => '需大於或等於',
     'MustBeLe'             => '需小於或等於',
     'MustConfirmPassword'  => '您必需確認密碼',
@@ -510,6 +521,9 @@ $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
+    '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'                 => 'equal to',
     'OpGt'                 => 'greater than',
     'OpGtEq'               => 'greater than or equal to',
@@ -556,6 +570,9 @@ $SLANG = array(
     'Presets'              => '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Rate',
     'Real'                 => 'Real',
@@ -643,6 +660,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => '小圖檢視',
     'Tilt'                 => 'Tilt',
@@ -677,13 +695,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'No update is necessary.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Use Filter',
     'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'User',
     'Username'             => '使用者名稱',
     'Users'                => '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'        => 'Ignore this version',
@@ -723,6 +744,7 @@ $SLANG = array(
     'Zone'                 => 'Zone',
     'ZoneAlarmColour'      => 'Alarm Colour (RGB)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -731,7 +753,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => '監視區',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',                // Added - 2009-02-08
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index b0b76ba93..21bd2f269 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'       => '报警最大帧率FPS',
     'AlarmPx'               => '报警像素',
     'AlarmRGBUnset'         => '你必须设置一个报警颜色(RGB)',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                 => '警报',
     'All'                   => '全部',
     'Apply'                 => '应用',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval'  => 'FPS帧数报告间隔缓冲数必须是0以上整数',
     'BadFormat'             => '格式必须设为大于零的整数',
     'BadFrameSkip'          => '跳帧数必须设为大于零的整数',
-    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'             => '高度必须设为有效值',
     'BadHost'               => '主机必须设为有效IP地址或主机名，不要包含 http://',
     'BadImageBufferCount'   => '图像缓冲器大小必须设为大于10的整数',
     'BadLabelX'             => '标签 X 坐标必须设为大于零的整数',
     'BadLabelY'             => '标签 Y 坐标必须设为大于零的整数',
     'BadMaxFPS'             => '最大帧数FPS必须设为正整数或着浮点数',
+    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'          => '名称只可以包含字母，数字，波折号和下划线',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'               => '路径必须设为有效值',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'             => 'Blob大小',
     'Blobs'                 => 'Blobs',
     'Brightness'            => '亮度',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'               => '缓冲器',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'          => '可以自动对焦',
     'CanAutoGain'           => '可以自动增益控制',
     'CanAutoIris'           => '可以自动光圈',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'         => '捕获高度',
     'CaptureMethod'         => '捕获方式',
     'CapturePalette'        => '捕获调色板',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'          => '捕获宽度',
     'Cause'                 => '原因',
     'CheckMethod'           => '报警检查方式',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'         => '控制设备',
     'ControlType'           => '控制类型',
     'Controllable'          => '可控',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                 => '循环',
     'CycleWatch'            => '循环监视',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     'DefaultRate'           => '缺省速率',
     'DefaultScale'          => '缺省缩放',
     'DefaultView'           => '缺省视角',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'                => '删除',
     'DeleteAndNext'         => '删除并下一个',
     'DeleteAndPrev'         => '删除并前一个',
     'DeleteSavedFilter'     => '删除存储过滤器',
     'Description'           => '描述',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'                => '设备',
     'DeviceChannel'         => '设备通道',
     'DeviceFormat'          => '设备格式',
@@ -257,6 +265,7 @@ $SLANG = array(
     'Disk'                  => '磁碟',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'                => '请捐款',
     'DonateAlready'         => '不，我已经捐赠过了',
     'DonateEnticement'      => '迄今，您已经运行ZoneMinder有一阵子了，希望它能够有助于增强您家或者办公区域的安全。尽管ZoneMinder是，并将保持免费和开源，该项目依然在研发和支持中投入了资金和精力。如果您愿意支持今后的开发和新功能，那么请考虑为该项目捐款。捐款不是必须的，任何数量的捐赠，我们都很感谢。<br/><br/>如果您愿意捐款，请选择下列选项，或者访问 http://www.zoneminder.com/donate.html 捐赠主页。<br/><br/>感谢您使用ZoneMinder，并且不要忘记访问访问ZoneMinder.com的论坛以获得支持或建议，这可以提升您的ZoneMinder的体验。',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'     => '不，我不打算捐款',
     'DonateRemindWeek'      => '现在不，1星期内再次提醒我',
     'DonateYes'             => '好，我现在就捐款',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'              => '下载',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'              => 'Duration',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                  => '转送源',
     'Ffmpeg'                => 'Ffmpeg',
     'File'                  => '文件',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'   => '将全部匹配项存档',
     'FilterDeleteEvents'    => '将全部匹配项删除',
     'FilterEmailEvents'     => '将全部匹配项详情电邮出去',
     'FilterExecuteEvents'   => '执行全部匹配项命令',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'   => '全部匹配项的信息详情',
     'FilterPx'              => '过滤器像素',
     'FilterUnset'           => '您必须指定过滤器宽度和高度',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                 => '首先',
     'FlippedHori'           => '水平翻转',
     'FlippedVert'           => '垂直翻转',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                 => '聚焦',
     'ForceAlarm'            => '强制报警',
     'Format'                => '格式',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'               => '帧 Id',
     'FrameRate'             => '帧率',
     'FrameSkip'             => '跳帧',
-    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Frames'                => '帧',
     'Func'                  => '功能',
     'Function'              => '功能',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'          => '最小缩放速度',
     'MinZoomStep'           => '最小缩放步进',
     'Misc'                  => '杂项',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'               => '监视器',
     'MonitorIds'            => '监视器&nbsp;Ids',
     'MonitorPreset'         => '监视器预设值',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'               => '镜头组接',
     'Month'                 => '月',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Move'                  => '移动',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-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.
     'MustBeGe'              => '必须大于等于',
     'MustBeLe'              => '必须小于等于',
     'MustConfirmPassword'   => '您必须确认密码',
@@ -506,6 +517,9 @@ $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
+    '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'                  => '大于',
     'OpGtEq'                => '大于等于',
@@ -552,6 +566,9 @@ $SLANG = array(
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'              => '协议',
     'Rate'                  => '速率',
     'Real'                  => '实际',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'                => '发送',
     'System'                => '系统',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                  => 'Tele',
     'Thumbnail'             => '缩略图',
     'Tilt'                  => '倾斜',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'    => '无须更新',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     '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',
     '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'         => '忽略该版本',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                  => '区域',
     'ZoneAlarmColour'       => '报警色彩 (红/绿/蓝)',
     'ZoneArea'              => '区域',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'        => '过滤宽度/高度 (像素)',
     'ZoneMinMaxAlarmArea'   => '最小/最大报警区域',
     'ZoneMinMaxBlobArea'    => '最小/最大污渍区 Blob',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres'  => '最小/最大像素阈值(0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'    => '忽略过载帪数',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                 => '区域',
     'Zoom'                  => '缩放',
     'ZoomIn'                => '放大',
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index 3d996b003..ff0f6f260 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Pozor',
     'All'                  => 'V�echny',
     'Apply'                => 'Pou��t',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Jm�na moho obsahovat pouze alfanumerick� znaky a podtr��tko �i poml�ku',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'            => 'Velikost zna�ky',
     'Blobs'                => 'Zna�ky',
     'Brightness'           => 'Sv�tlost',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Bufery',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Um� automaticky zaost�it',
     'CanAutoGain'          => 'Um� automatick� zisk',
     'CanAutoIris'          => 'Um� auto iris',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'        => 'V��ka zdrojov�ho sn�mku',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Paleta zdrojov�ho sn�mku',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => '���ka zdrojov�ho sn�mku',
     'Cause'                => 'P���ina',
     'CheckMethod'          => 'Metoda zna�kov�n� alarmem',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'        => 'Za��zen� ��zen�',
     'ControlType'          => 'Typ ��zen�',
     'Controllable'         => '��diteln�',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cyklus',
     'CycleWatch'           => 'Cyklick� prohl��en�',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'P�ednastaven� velikost',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Smazat',
     'DeleteAndNext'        => 'Smazat &amp; Dal��',
     'DeleteAndPrev'        => 'Smazat &amp; P�edchoz�',
     'DeleteSavedFilter'    => 'Smazat filtr',
     'Description'          => 'Popis',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Kan�l za��zen�',
     'DeviceFormat'         => 'Form�t za��zen�',
@@ -257,6 +265,7 @@ $SLANG = array(
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Pros�m podpo�te',
     'DonateAlready'        => 'Ne, u� jsem podpo�il',
     'DonateEnticement'     => 'Ji� n�jakou dobu pou��v�te software ZoneMinder k ochran� sv�ho majetku a p�edpokl�d�m, �e jej shled�v�te u�ite�n�m. P�esto�e je ZoneMinder, znovu p�ipom�n�m, zdarma a voln� ���en� software, stoj� jeho v�voj a podpora n�jak� pen�ze. Pokud byste cht�l/a podpo�it budouc� v�voj a nov� mo�nosti softwaru, pros�m zva�te darov�n� finan�n� pomoci. Darov�n� je, samoz�ejm�, dobrovoln�, ale zato velmi cen�n� m��ete p�isp�t jakou ��stkou chcete.<br><br>Pokud m�te z�jem podpo�it n� t�m, pros�m, vyberte n��e uvedenou mo�nost, nebo nav�tivte http://www.zoneminder.com/donate.html.<br><br>D�kuji V�m �e jste si vybral/a software ZoneMinder a nezapome�te nav�t�vit f�rum na ZoneMinder.com pro podporu a n�vrhy jak ud�lat ZoneMinder je�t� lep��m ne� je dnes.',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'Ne, nechci podpo�it ZoneMinder, nep�ipom�nat',
     'DonateRemindWeek'     => 'Nyn� ne, p�ipomenout za t�den',
     'DonateYes'            => 'Ano, chcit podpo�it ZoneMinder nyn�',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'St�hnout',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Pr�b�h',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                 => 'Nasytit',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'Soubor',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archivovat v�echny nalezen�',
     'FilterDeleteEvents'   => 'Smazat v�echny nalezen�',
     'FilterEmailEvents'    => 'Poslat email s detaily nalezen�ch',
     'FilterExecuteEvents'  => 'Spustit p��kaz na v�ech nalezen�ch',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Podat zpr�vu o v�ech nalezen�ch',
     'FilterPx'             => 'Filtr Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                => 'Prvn�',
     'FlippedHori'          => 'P�eklopen� vodorovn�',
     'FlippedVert'          => 'P�eklopen� svisle',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Zaost�en�',
     'ForceAlarm'           => 'Spustit alarm',
     'Format'               => 'Form�t',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'              => 'Sn�mek Id',
     'FrameRate'            => 'Rychlost sn�mk�',
     'FrameSkip'            => 'Vynechat sn�mek',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Sn�mky',
     'Func'                 => 'Funkce',
     'Function'             => 'Funkce',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min rychlost zoomu',
     'MinZoomStep'          => 'Min krok zoomu',
     'Misc'                 => 'Ostatn�',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Kamera',
     'MonitorIds'           => 'Id&nbsp;kamer',
     'MonitorPreset'        => 'Monitor Preset',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'              => 'Sest�ih',
     'Month'                => 'M�s�c',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Pohyb',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'mus� b�t v�t�� nebo rovno ne�',
     'MustBeLe'             => 'mus� b�t men�� nebo rovno ne�',
     'MustConfirmPassword'  => 'Mus�te potvrdit heslo',
@@ -506,6 +517,9 @@ $SLANG = array(
     'NumPresets'           => 'Po�et p�edvoleb',
     '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
+    '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'                 => 'rovno',
     'OpGt'                 => 'v�t��',
     'OpGtEq'               => 'v�t�� nebo rovno',
@@ -552,6 +566,9 @@ $SLANG = array(
     'Presets'              => 'P�edvolby',
     'Prev'                 => 'Zp�t',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Rychlost',
     'Real'                 => 'Skute�n�',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'               => 'Potvrdit',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'P�ibl��it',
     'Thumbnail'            => 'Miniatura',
     'Tilt'                 => 'N�klon',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Update nen� pot�eba.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Pou��t filtr',
     'UseFilterExprsPost'   => '&nbsp;v�raz�', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Pou��t&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'U�ivatel',
     'Username'             => 'U�ivatelsk� jm�no',
     'Users'                => 'U�ivatel�',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Hodnota',
     'Version'              => 'Verze',
     'VersionIgnore'        => 'Ignorovat tuto verzi',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                 => 'Z�na',
     'ZoneAlarmColour'      => 'Barva alarmu (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Z�ny',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zv�t�it',
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index 28002aec8..9ad642173 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -19,6 +19,7 @@
 //
 
 // ZoneMinder german Translation by Robert Schumann (rs at core82 dot de)
+// ZoneMinder german Translation by Sebastian Kaminski (github @seeebek)
 
 // Notes for Translators
 // 0. Get some credit, put your name in the line above (optional)
@@ -50,7 +51,7 @@
 // do this by default, uncomment this if required.
 //
 // Example
-// header( "Content-Type: text/html; charset=iso-8859-1" );
+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.
@@ -76,7 +77,7 @@ $SLANG = array(
     '8BitGrey'             => '8-Bit-Grau',
     'Action'               => 'Aktion',
     'Actual'               => 'Original',
-    'AddNewControl'        => 'Neues Kontrollelement hinzuf&uuml;gen',
+    'AddNewControl'        => 'Neues Kontrollelement hinzufügen',
     'AddNewMonitor'        => 'Neuer Monitor',
     'AddNewUser'           => 'Neuer Benutzer',
     'AddNewZone'           => 'Neue Zone',
@@ -87,10 +88,11 @@ $SLANG = array(
     'AlarmLimits'          => 'Alarm-Limits',
     'AlarmMaximumFPS'      => 'Alarm-Maximum-FPS',
     'AlarmPx'              => 'Alarm-Pixel',
-    'AlarmRGBUnset'        => 'Sie m&uuml;ssen eine RGB-Alarmfarbe setzen',
+    'AlarmRGBUnset'        => 'Sie müssen eine RGB-Alarmfarbe setzen',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Alarm',
     'All'                  => 'Alle',
-    'Apply'                => 'OK',
+    'Apply'                => 'Anwenden',
     'ApplyingStateChange'  => 'Aktiviere neuen Status',
     'ArchArchived'         => 'Nur Archivierte',
     'ArchUnarchived'       => 'Nur Nichtarchivierte',
@@ -119,156 +121,163 @@ $SLANG = array(
     'AttrTotalScore'       => 'Totale Punktzahl',
     'AttrWeekday'          => 'Wochentag',
     'Auto'                 => 'Auto',
-    'AutoStopTimeout'      => 'Auto-Stopp-Zeit&uuml;berschreitung',
-    'Available'            => 'Available',              // Added - 2009-03-31
+    'AutoStopTimeout'      => 'Auto-Stopp-Zeitüberschreitung',
+    'Available'            => 'Vorhanden',              // Added - 2009-03-31
     'AvgBrScore'           => 'Mittlere<br/>Punktzahl',
     'Background'           => 'Hintergrund',
     'BackgroundFilter'     => 'Filter im Hintergrund laufen lassen',
-    'BadAlarmFrameCount'   => 'Die Bildanzahl muss ganzzahlig 1 oder gr&ouml;&szlig;er sein',
+    'BadAlarmFrameCount'   => 'Die Bildanzahl muss ganzzahlig 1 oder größer sein',
     'BadAlarmMaxFPS'       => 'Alarm-Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
-    'BadChannel'           => 'Der Kanal muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2011-06-15
-    'BadDevice'            => 'Das Ger&auml;t muss eine g&uuml;ltige Systemresource sein',
-    'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Z&auml;hler muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadFormat'            => 'Das Format muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadFrameSkip'         => 'Der Auslassz&auml;hler f&uuml;r Frames muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadHeight'            => 'Die H&ouml;he muss auf einen g&uuml;ltigen Wert eingestellt sein',
-    'BadHost'              => 'Der Host muss auf eine g&uuml;ltige IP-Adresse oder einen Hostnamen (ohne http://) eingestellt sein',
-    'BadImageBufferCount'  => 'Die Gr&ouml;&szlig;e des Bildpuffers muss ganzzahlig 10 oder gr&ouml;&szlig;er sein',
-    'BadLabelX'            => 'Die x-Koordinate der Bezeichnung muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadLabelY'            => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
+    'BadChannel'           => 'Der Kanal muss ganzzahlig 0 oder größer sein',
+    'BadColours'           => 'Die Zielfarbe muss eine gültige Farbe sein.', // Added - 2011-06-15
+    'BadDevice'            => 'Das Gerät muss eine gültige Systemresource sein',
+    'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Zähler muss ganzzahlig 0 oder größer sein',
+    'BadFormat'            => 'Das Format muss ganzzahlig 0 oder größer sein',
+    'BadFrameSkip'         => 'Der Auslasszähler für Frames muss ganzzahlig 0 oder größer sein',
+    'BadHeight'            => 'Die Höhe muss auf einen gültigen Wert eingestellt sein',
+    'BadHost'              => 'Der Host muss auf eine gültige IP-Adresse oder einen Hostnamen (ohne http://) eingestellt sein',
+    'BadImageBufferCount'  => 'Die Größe des Bildpuffers muss ganzzahlig 10 oder größer sein',
+    'BadLabelX'            => 'Die x-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
+    'BadLabelY'            => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
     'BadMaxFPS'            => 'Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
-    'BadNameChars'         => 'Namen d&uuml;rfen nur aus Buchstaben, Zahlen und Trenn- oder Unterstrichen bestehen',
-    'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
-    'BadPath'              => 'Der Pfad muss auf einen g&uuml;ltigen Wert eingestellt sein',
-    'BadPort'              => 'Der Port muss auf eine g&uuml;ltige Zahl eingestellt sein',
-    'BadPostEventCount'    => 'Der Z&auml;hler f&uuml;r die Ereignisfolgebilder muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadPreEventCount'     => 'Der Z&auml;hler f&uuml;r die Ereignisvorlaufbilder muss mindestens ganzzahlig 0 und kleiner als die Bildpuffergr&ouml;&szlig;e sein',
-    'BadRefBlendPerc'      => 'Der Referenz-Blenden-Prozentwert muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadSectionLength'     => 'Die Bereichsl&auml;nge muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadSignalCheckColour' => 'Die Signalpr&uuml;ffarbe muss auf einen g&uuml;ltigen Farbwert eingestellt sein',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
+    'BadNameChars'         => 'Namen dürfen nur aus Buchstaben, Zahlen und Trenn- oder Unterstrichen bestehen',
+    'BadPalette'           => 'Die Palette muss auf einen gültigen Wert eingestellt sein', // Added - 2009-03-31
+    'BadPath'              => 'Der Pfad muss auf einen gültigen Wert eingestellt sein',
+    'BadPort'              => 'Der Port muss auf eine gültige Zahl eingestellt sein',
+    'BadPostEventCount'    => 'Der Zähler für die Ereignisfolgebilder muss ganzzahlig 0 oder größer sein',
+    'BadPreEventCount'     => 'Der Zähler für die Ereignisvorlaufbilder muss mindestens ganzzahlig 0 und kleiner als die Bildpuffergröße sein',
+    'BadRefBlendPerc'      => 'Der Referenz-Blenden-Prozentwert muss ganzzahlig 0 oder größer sein',
+    'BadSectionLength'     => 'Die Bereichslänge muss ganzzahlig 0 oder größer sein',
+    'BadSignalCheckColour' => 'Die Signalprüffarbe muss auf einen gültigen Farbwert eingestellt sein',
     'BadStreamReplayBuffer'=> 'Der Wiedergabestrompuffer tream replay buffer must be an integer of zero or more',
-    'BadWarmupCount'       => 'Die Anzahl der Vorw�rmbilder muss ganzzahlig 0 oder gr&ouml;&szlig;er sein',
-    'BadWebColour'         => 'Die Webfarbe muss auf einen g&uuml;ltigen Farbwert eingestellt sein',
-    'BadWidth'             => 'Die Breite muss auf einen g&uuml;ltigen Wert eingestellt sein',
+    'BadWarmupCount'       => 'Die Anzahl der Vorwärmbilder muss ganzzahlig 0 oder größer sein',
+    'BadWebColour'         => 'Die Webfarbe muss auf einen gültigen Farbwert eingestellt sein',
+    'BadWidth'             => 'Die Breite muss auf einen gültigen Wert eingestellt sein',
     'Bandwidth'            => 'Bandbreite',
-    'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
+    'BandwidthHead'        => 'Bandbreite',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
     'BlobPx'               => 'Blob-Pixel',
-    'BlobSizes'            => 'Blobgr&ouml;&szlig;e',
+    'BlobSizes'            => 'Blobgröße',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Helligkeit',
-    'Buffers'              => 'Puffer',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
+    'Buffers'              => 'Buffer',
+    'CSSDescription'       => 'Ändere das standard CSS für diesen Computer.', // Added - 2015-04-18
     'CanAutoFocus'         => 'Kann Autofokus',
-    'CanAutoGain'          => 'Kann Auto-Verst&auml;rkung',
+    'CanAutoGain'          => 'Kann Auto-Verstärkung',
     'CanAutoIris'          => 'Kann Auto-Iris',
-    'CanAutoWhite'         => 'Kann Auto-Wei&szlig;-Abgleich',
+    'CanAutoWhite'         => 'Kann Auto-Weiß-Abgleich',
     'CanAutoZoom'          => 'Kann Auto-Zoom',
-    'CanFocus'             => 'Kann&nbsp;Fokus',
+    'CanFocus'             => 'Kann Fokus',
     'CanFocusAbs'          => 'Kann absoluten Fokus',
     'CanFocusCon'          => 'Kann kontinuierlichen Fokus',
     'CanFocusRel'          => 'Kann relativen Fokus',
-    'CanGain'              => 'Kann Verst&auml;rkung',
-    'CanGainAbs'           => 'Kann absolute Verst&auml;rkung',
-    'CanGainCon'           => 'Kann kontinuierliche Verst&auml;rkung',
-    'CanGainRel'           => 'Kann relative Verst&auml;kung',
-    'CanIris'              => 'Kann&nbsp;Iris',
+    'CanGain'              => 'Kann Verstärkung',
+    'CanGainAbs'           => 'Kann absolute Verstärkung',
+    'CanGainCon'           => 'Kann kontinuierliche Verstärkung',
+    'CanGainRel'           => 'Kann relative Verstäkung',
+    'CanIris'              => 'Kann Iris',
     'CanIrisAbs'           => 'Kann absolute Iris',
     'CanIrisCon'           => 'Kann kontinuierliche Iris',
     'CanIrisRel'           => 'Kann relative Iris',
-    'CanMove'              => 'Kann&nbsp;Bewegung',
+    'CanMove'              => 'Kann Bewegung',
     'CanMoveAbs'           => 'Kann absolute Bewegung',
     'CanMoveCon'           => 'Kann kontinuierliche Bewegung',
     'CanMoveDiag'          => 'Kann diagonale Bewegung',
     'CanMoveMap'           => 'Kann Mapped-Bewegung',
     'CanMoveRel'           => 'Kann relative Bewegung',
-    'CanPan'               => 'Kann&nbsp;Pan' ,
-    'CanReset'             => 'Kann&nbsp;Reset',
+    'CanPan'               => 'Kann Pan' ,
+    'CanReset'             => 'Kann Reset',
     'CanSetPresets'        => 'Kann Voreinstellungen setzen',
-    'CanSleep'             => 'Kann&nbsp;Sleep',
-    'CanTilt'              => 'Kann&nbsp;Neigung',
-    'CanWake'              => 'Kann&nbsp;Wake',
-    'CanWhite'             => 'Kann Wei&szlig;-Abgleich',
-    'CanWhiteAbs'          => 'Kann absoluten Wei&szlig;-Abgleich',
-    'CanWhiteBal'          => 'Kann Wei&szlig;-Abgleich',
-    'CanWhiteCon'          => 'Kann kontinuierlichen Wei&szlig;-Abgleich',
-    'CanWhiteRel'          => 'Kann relativen Wei&szlig;-Abgleich',
-    'CanZoom'              => 'Kann&nbsp;Zoom',
+    'CanSleep'             => 'Kann Sleep',
+    'CanTilt'              => 'Kann Neigung',
+    'CanWake'              => 'Kann Wake',
+    'CanWhite'             => 'Kann Weiß-Abgleich',
+    'CanWhiteAbs'          => 'Kann absoluten Weiß-Abgleich',
+    'CanWhiteBal'          => 'Kann Weiß-Abgleich',
+    'CanWhiteCon'          => 'Kann kontinuierlichen Weiß-Abgleich',
+    'CanWhiteRel'          => 'Kann relativen Weiß-Abgleich',
+    'CanZoom'              => 'Kann Zoom',
     'CanZoomAbs'           => 'Kann absoluten Zoom',
     'CanZoomCon'           => 'Kann kontinuierlichen Zoom',
     'CanZoomRel'           => 'Kann relativen Zoom',
     'Cancel'               => 'Abbruch',
     'CancelForcedAlarm'    => 'Abbruch des unbedingten Alarms',
-    'CaptureHeight'        => 'Erfasse H&ouml;he',
-    'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
+    'CaptureHeight'        => 'Erfasse Höhe',
+    'CaptureMethod'        => 'Aufnahmemethode',         // Added - 2009-02-08
     'CapturePalette'       => 'Erfasse Farbpalette',
+    'CaptureResolution'    => 'Aufnahmeauflösung',     // Added - 2015-04-18
     'CaptureWidth'         => 'Erfasse Breite',
     'Cause'                => 'Grund',
-    'CheckMethod'          => 'Alarm-Pr&uuml;fmethode',
-    'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
+    'CheckMethod'          => 'Alarm-Prüfmethode',
+    'ChooseDetectedCamera' => 'Wähle erkannte Kamera', // Added - 2009-03-31
     'ChooseFilter'         => 'Filterauswahl',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
-    'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
-    'ChoosePreset'         => 'Voreinstellung ausw&auml;hlen',
-    'Clear'                => 'Clear',                  // Added - 2011-06-16
-    'Close'                => 'Schlie&szlig;en',
+    'ChooseLogFormat'      => 'Wähle ein Log-Format',    // Added - 2011-06-17
+    'ChooseLogSelection'   => 'Wähle eine Log-Auswahl', // Added - 2011-06-17
+    'ChoosePreset'         => 'Voreinstellung auswählen',
+    'Clear'                => 'Leeren',                  // Added - 2011-06-16
+    'Close'                => 'Schließen',
     'Colour'               => 'Farbe',
     'Command'              => 'Kommando',
-    'Component'            => 'Component',              // Added - 2011-06-16
+    'Component'            => 'Komponente',              // Added - 2011-06-16
     'Config'               => 'Konfig.',
-    'ConfiguredFor'        => 'Konfiguriert f&uuml;r',
-    'ConfirmDeleteEvents'  => 'Sind Sie sicher, dass Sie die ausgew&auml;hlten Ereignisse l&ouml;schen wollen?',
-    'ConfirmPassword'      => 'Passwortbest&auml;tigung',
+    'ConfiguredFor'        => 'Konfiguriert für',
+    'ConfirmDeleteEvents'  => 'Sind Sie sicher, dass Sie die ausgewählten Ereignisse löschen wollen?',
+    'ConfirmPassword'      => 'Passwortbestätigung',
     'ConjAnd'              => 'und',
     'ConjOr'               => 'oder',
     'Console'              => 'Konsole',
-    'ContactAdmin'         => 'Bitte kontaktieren Sie den Administrator f&uuml;r weitere Details',
+    'ContactAdmin'         => 'Bitte kontaktieren Sie den Administrator für weitere Details',
     'Continue'             => 'Weiter',
     'Contrast'             => 'Kontrast',
     'Control'              => 'Kontrolle',
     'ControlAddress'       => 'Kontrolladresse',
-    'ControlCap'           => 'Kontrollm&ouml;glichkeit',
-    'ControlCaps'          => 'Kontrollm&ouml;glichkeiten',
-    'ControlDevice'        => 'Kontrollger&auml;t',
+    'ControlCap'           => 'Kontrollmöglichkeit',
+    'ControlCaps'          => 'Kontrollmöglichkeiten',
+    'ControlDevice'        => 'Kontrollgerät',
     'ControlType'          => 'Kontrolltyp',
     'Controllable'         => 'Kontrollierbar',
+    'Current'              => 'Aktuell',                // Added - 2015-04-18
     'Cycle'                => 'Zyklus',
     'CycleWatch'           => 'Zeitzyklus',
-    'DateTime'             => 'Date/Time',              // Added - 2011-06-16
+    'DateTime'             => 'Datum/Zeit',              // Added - 2011-06-16
     'Day'                  => 'Tag',
     'Debug'                => 'Debug',
     'DefaultRate'          => 'Standardrate',
     'DefaultScale'         => 'Standardskalierung',
     'DefaultView'          => 'Standardansicht',
-    'Delete'               => 'L&ouml;schen',
-    'DeleteAndNext'        => 'L&ouml;schen &amp; N&auml;chstes',
-    'DeleteAndPrev'        => 'L&ouml;schen &amp; Vorheriges',
-    'DeleteSavedFilter'    => 'L&ouml;sche gespeichertes Filter',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Verzögerung',                  // Added - 2015-04-18
+    'Delete'               => 'Löschen',
+    'DeleteAndNext'        => 'Löschen &amp; Nächstes',
+    'DeleteAndPrev'        => 'Löschen &amp; Vorheriges',
+    'DeleteSavedFilter'    => 'Lösche gespeichertes Filter',
     'Description'          => 'Beschreibung',
-    'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
-    'Device'               => 'Device',                 // Added - 2009-02-08
-    'DeviceChannel'        => 'Ger&auml;tekanal',
-    'DeviceFormat'         => 'Ger&auml;teformat',
-    'DeviceNumber'         => 'Ger&auml;tenummer',
-    'DevicePath'           => 'Ger&auml;tepfad',
-    'Devices'              => 'Ger&auml;te',
+    'DetectedCameras'      => 'Erkannte Kameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Erkannte Profile',      // Added - 2015-04-18
+    'Device'               => 'Gerät',                 // Added - 2009-02-08
+    'DeviceChannel'        => 'Gerätekanal',
+    'DeviceFormat'         => 'Geräteformat',
+    'DeviceNumber'         => 'Gerätenummer',
+    'DevicePath'           => 'Gerätepfad',
+    'Devices'              => 'Geräte',
     'Dimensions'           => 'Abmessungen',
     'DisableAlarms'        => 'Alarme abschalten',
     'Disk'                 => 'Disk',
-    'Display'              => 'Display',                // Added - 2011-01-30
-    'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'Display'              => 'Anzeige',                // Added - 2011-01-30
+    'Displaying'           => 'Gezeigt',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Bitte spenden Sie.',
     'DonateAlready'        => 'Nein, ich habe schon gespendet',
-    'DonateEnticement'     => 'Sie benutzen ZoneMinder nun schon eine Weile und es ist hoffentlich eine n&uuml;tzliche Applikation zur Verbesserung Ihrer Heim- oder Arbeitssicherheit. Obwohl ZoneMinder eine freie Open-Source-Software ist und bleiben wird, entstehen Kosten bei der Entwicklung und dem Support.<br><br>Falls Sie ZoneMinder f�r Weiterentwicklung in der Zukunft unterst&uuml;tzen m&ouml;chten, denken Sie bitte �ber eine Spende f&uuml;r das Projekt unter der Webadresse http://www.zoneminder.com/donate.html oder &uuml;ber nachfolgend stehende Option nach. Spenden sind, wie der Name schon sagt, immer freiwillig. Dem Projekt helfen kleine genauso wie gr&ouml;&szlig;ere Spenden sehr weiter und ein herzlicher Dank ist jedem Spender sicher.<br><br>Vielen Dank daf&uuml;r, dass sie ZoneMinder benutzen. Vergessen Sie nicht die Foren unter ZoneMinder.com, um Support zu erhalten und Ihre Erfahrung mit ZoneMinder zu verbessern!',
+    'DonateEnticement'     => 'Sie benutzen ZoneMinder nun schon eine Weile und es ist hoffentlich eine nützliche Applikation zur Verbesserung Ihrer Heim- oder Arbeitssicherheit. Obwohl ZoneMinder eine freie Open-Source-Software ist und bleiben wird, entstehen Kosten bei der Entwicklung und dem Support.<br><br>Falls Sie ZoneMinder für Weiterentwicklung in der Zukunft unterstützen möchten, denken Sie bitte über eine Spende für das Projekt unter der Webadresse http://www.zoneminder.com/donate.html oder über nachfolgend stehende Option nach. Spenden sind, wie der Name schon sagt, immer freiwillig. Dem Projekt helfen kleine genauso wie größere Spenden sehr weiter und ein herzlicher Dank ist jedem Spender sicher.<br><br>Vielen Dank dafür, dass sie ZoneMinder benutzen. Vergessen Sie nicht die Foren unter ZoneMinder.com, um Support zu erhalten und Ihre Erfahrung mit ZoneMinder zu verbessern!',
     'DonateRemindDay'      => 'Noch nicht, erinnere mich in einem Tag noch mal.',
     'DonateRemindHour'     => 'Noch nicht, erinnere mich in einer Stunde noch mal.',
     'DonateRemindMonth'    => 'Noch nicht, erinnere mich in einem Monat noch mal.',
-    'DonateRemindNever'    => 'Nein, ich m&ouml;chte nicht spenden, niemals erinnern.',
+    'DonateRemindNever'    => 'Nein, ich möchte nicht spenden, niemals erinnern.',
     'DonateRemindWeek'     => 'Noch nicht, erinnere mich in einer Woche noch mal.',
-    'DonateYes'            => 'Ja, ich m&ouml;chte jetzt spenden.',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
+    'DonateYes'            => 'Ja, ich möchte jetzt spenden.',
     'Download'             => 'Download',
-    'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
+    'DuplicateMonitorName' => 'Duplizierter Monitorname', // Added - 2009-03-31
     'Duration'             => 'Dauer',
     'Edit'                 => 'Bearbeiten',
     'Email'                => 'E-Mail',
@@ -277,16 +286,16 @@ $SLANG = array(
     'EnterNewFilterName'   => 'Neuen Filternamen eingeben',
     'Error'                => 'Fehler',
     'ErrorBrackets'        => 'Fehler. Bitte nur gleiche Anzahl offener und geschlossener Klammern.',
-    'ErrorValidValue'      => 'Fehler. Bitte alle Werte auf richtige Eingabe pr&uuml;fen',
+    'ErrorValidValue'      => 'Fehler. Bitte alle Werte auf richtige Eingabe prüfen',
     'Etc'                  => 'etc.',
     'Event'                => 'Ereignis',
     'EventFilter'          => 'Ereignisfilter',
     'EventId'              => 'Ereignis-ID',
     'EventName'            => 'Ereignisname',
-    'EventPrefix'          => 'Ereignis-Pr&auml;fix',
+    'EventPrefix'          => 'Ereignis-Präfix',
     'Events'               => 'Ereignisse',
     'Exclude'              => 'Ausschluss;',
-    'Execute'              => 'Ausf&uuml;hren',
+    'Execute'              => 'Ausführen',
     'Export'               => 'Exportieren',
     'ExportDetails'        => 'Exportiere Ereignis-Details',
     'ExportFailed'         => 'Exportieren fehlgeschlagen',
@@ -298,48 +307,49 @@ $SLANG = array(
     'ExportLog'            => 'Export Log',             // Added - 2011-06-17
     'ExportMiscFiles'      => 'Exportiere andere Dateien (falls vorhanden)',
     'ExportOptions'        => 'Exportierungsoptionen',
-    'ExportSucceeded'      => 'Export Succeeded',       // Added - 2009-02-08
+    'ExportSucceeded'      => 'Export erfolgreich',       // Added - 2009-02-08
     'ExportVideoFiles'     => 'Exportiere Videodateien (falls vorhanden)',
     'Exporting'            => 'Exportiere',
     'FPS'                  => 'fps',
     'FPSReportInterval'    => 'fps-Meldeintervall',
     'FTP'                  => 'FTP',
     'Far'                  => 'Weit',
-    'FastForward'          => 'Schnell vorw&auml;rts',
+    'FastForward'          => 'Schnell vorwärts',
     'Feed'                 => 'Eingabe',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'Datei',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archivierung aller Treffer',
-    'FilterDeleteEvents'   => 'L&ouml;schen aller Treffer',
+    'FilterDeleteEvents'   => 'Löschen aller Treffer',
     'FilterEmailEvents'    => 'Detaillierte E-Mail zu allen Treffern',
-    'FilterExecuteEvents'  => 'Ausf&uuml;hren bei allen Treffern',
+    'FilterExecuteEvents'  => 'Ausführen bei allen Treffern',
+    'FilterLog'            => 'Log filtern',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Detaillierte Nachricht zu allen Treffern',
     'FilterPx'             => 'Filter-Pixel',
-    'FilterUnset'          => 'Sie m&uuml;ssen eine Breite und H&ouml;he f&uuml;r das Filter angeben',
+    'FilterUnset'          => 'Sie müssen eine Breite und Höhe für das Filter angeben',
     'FilterUploadEvents'   => 'Hochladen aller Treffer',
-    'FilterVideoEvents'    => 'Video f&uuml;r alle Treffer erstellen',
+    'FilterVideoEvents'    => 'Video für alle Treffer erstellen',
     'Filters'              => 'Filter',
     'First'                => 'Erstes',
     'FlippedHori'          => 'Horizontal gespiegelt',
     'FlippedVert'          => 'Vertikal gespiegelt',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'Keine',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Fokus',
-    'ForceAlarm'           => 'Unbedingter Alarm',
+    'ForceAlarm'           => 'Erzwinge Alarm',
     'Format'               => 'Format',
     'Frame'                => 'Bild',
     'FrameId'              => 'Bild-ID',
     'FrameRate'            => 'Abspielgeschwindigkeit',
     'FrameSkip'            => 'Bilder auslassen',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Bilder',
     'Func'                 => 'Fkt.',
     'Function'             => 'Funktion',
-    'Gain'                 => 'Verst&auml;rkung',
+    'Gain'                 => 'Verstärkung',
     'General'              => 'Allgemeines',
     'GenerateVideo'        => 'Erzeuge Video',
     'GeneratingVideo'      => 'Erzeuge Video...',
@@ -348,7 +358,7 @@ $SLANG = array(
     'Group'                => 'Gruppe',
     'Groups'               => 'Gruppen',
     'HasFocusSpeed'        => 'Hat Fokus-Geschwindigkeit',
-    'HasGainSpeed'         => 'Hat Verst&auml;kungs-Geschwindigkeit',
+    'HasGainSpeed'         => 'Hat Verstäkungs-Geschwindigkeit',
     'HasHomePreset'        => 'Hat Standardvoreinstellungen',
     'HasIrisSpeed'         => 'Hat Irisgeschwindigkeit',
     'HasPanSpeed'          => 'Hat Pan-Geschwindigkeit',
@@ -356,10 +366,10 @@ $SLANG = array(
     'HasTiltSpeed'         => 'Hat Neigungsgeschwindigkeit',
     'HasTurboPan'          => 'Hat Turbo-Pan',
     'HasTurboTilt'         => 'Hat Turbo-Neigung',
-    'HasWhiteSpeed'        => 'Hat Wei&szlig;-Abgleichgeschwindigkeit',
+    'HasWhiteSpeed'        => 'Hat Weiß-Abgleichgeschwindigkeit',
     'HasZoomSpeed'         => 'Hat Zoom-Geschwindigkeit',
     'High'                 => 'hohe',
-    'HighBW'               => 'Hohe&nbsp;B/W',
+    'HighBW'               => 'Hohe B/W',
     'Home'                 => 'Home',
     'Hour'                 => 'Stunde',
     'Hue'                  => 'Farbton',
@@ -367,22 +377,22 @@ $SLANG = array(
     'Idle'                 => 'Leerlauf',
     'Ignore'               => 'Ignoriere',
     'Image'                => 'Bild',
-    'ImageBufferSize'      => 'Bildpuffergr&ouml;&szlig;e',
+    'ImageBufferSize'      => 'Bildpuffergröße',
     'Images'               => 'Bilder',
     'In'                   => 'In',
     'Include'              => 'Einschluss',
     'Inverted'             => 'Invertiert',
     'Iris'                 => 'Iris',
-    'KeyString'            => 'Schl&uuml;sselwort',
+    'KeyString'            => 'Schlüsselwort',
     'Label'                => 'Bezeichnung',
     'Language'             => 'Sprache',
     'Last'                 => 'Letztes',
     'Layout'               => 'Layout',                 // Added - 2009-02-08
-    'Level'                => 'Level',                  // Added - 2011-06-16
+    'Level'                => 'Stufe',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
     'LimitResultsPost'     => 'Ergebnisse;', // This is used at the end of the phrase 'Limit to first N results only'
     'LimitResultsPre'      => 'Begrenze nur auf die ersten', // This is used at the beginning of the phrase 'Limit to first N results only'
-    'Line'                 => 'Line',                   // Added - 2011-06-16
+    'Line'                 => 'Zeile',                   // Added - 2011-06-16
     'LinkedMonitors'       => 'Verbundene Monitore',
     'List'                 => 'Liste',
     'Load'                 => 'Last',
@@ -395,7 +405,7 @@ $SLANG = array(
     'Logout'               => 'Abmelden',
     'Logs'                 => 'Logs',                   // Added - 2011-06-17
     'Low'                  => 'niedrige',
-    'LowBW'                => 'Niedrige&nbsp;B/W',
+    'LowBW'                => 'Niedrige B/W',
     'Main'                 => 'Haupt',
     'Man'                  => 'Man',
     'Manual'               => 'Manual',
@@ -406,9 +416,9 @@ $SLANG = array(
     'MaxFocusRange'        => 'Maximaler Fokusbereich',
     'MaxFocusSpeed'        => 'Maximale Fokusgeschwindigkeit',
     'MaxFocusStep'         => 'Maximale Fokusstufe',
-    'MaxGainRange'         => 'Maximaler Verst&auml;rkungsbereich',
-    'MaxGainSpeed'         => 'Maximale Verst&auml;rkungsgeschwindigkeit',
-    'MaxGainStep'          => 'Maximale Verst&auml;rkungsstufe',
+    'MaxGainRange'         => 'Maximaler Verstärkungsbereich',
+    'MaxGainSpeed'         => 'Maximale Verstärkungsgeschwindigkeit',
+    'MaxGainStep'          => 'Maximale Verstärkungsstufe',
     'MaxIrisRange'         => 'Maximaler Irisbereich',
     'MaxIrisSpeed'         => 'Maximale Irisgeschwindigkeit',
     'MaxIrisStep'          => 'Maximale Irisstufe',
@@ -418,32 +428,32 @@ $SLANG = array(
     'MaxTiltRange'         => 'Maximaler Neig.-Bereich',
     'MaxTiltSpeed'         => 'Maximale Neig.-Geschw.',
     'MaxTiltStep'          => 'Maximale Neig.-Stufe',
-    'MaxWhiteRange'        => 'Maximaler Wei&szlig;-Abgl.bereich',
-    'MaxWhiteSpeed'        => 'Maximale Wei&szlig;-Abgl.geschw.',
-    'MaxWhiteStep'         => 'Maximale Wei&szlig;-Abgl.stufe',
+    'MaxWhiteRange'        => 'Maximaler Weiß-Abgl.bereich',
+    'MaxWhiteSpeed'        => 'Maximale Weiß-Abgl.geschw.',
+    'MaxWhiteStep'         => 'Maximale Weiß-Abgl.stufe',
     'MaxZoomRange'         => 'Maximaler Zoom-Bereich',
     'MaxZoomSpeed'         => 'Maximale Zoom-Geschw.',
     'MaxZoomStep'          => 'Maximale Zoom-Stufe',
     'MaximumFPS'           => 'Maximale FPS',
     'Medium'               => 'mittlere',
-    'MediumBW'             => 'Mittlere&nbsp;B/W',
-    'Message'              => 'Message',                // Added - 2011-06-16
+    'MediumBW'             => 'Mittlere B/W',
+    'Message'              => 'Nachricht',                // Added - 2011-06-16
     'MinAlarmAreaLtMax'    => 'Der minimale Alarmbereich sollte kleiner sein als der maximale',
-    'MinAlarmAreaUnset'    => 'Sie m&uuml;ssen einen Minimumwert an Alarmfl&auml;chenpixeln angeben',
-    'MinBlobAreaLtMax'     => 'Die minimale Blob-Fl&auml;che muss kleiner sein als die maximale',
-    'MinBlobAreaUnset'     => 'Sie m&uuml;ssen einen Minimumwert an Blobfl&auml;chenpixeln angeben',
-    'MinBlobLtMinFilter'   => 'Die minimale Blob-Fl&auml;che sollte kleiner oder gleich der minimalen Filterfl&auml;che sein',
-    'MinBlobsLtMax'        => 'Die minimalen Blobs m&uuml;ssen kleiner sein als die maximalen',
-    'MinBlobsUnset'        => 'Sie m&uuml;ssen einen Minimumwert an Blobs angeben',
-    'MinFilterAreaLtMax'   => 'Die minimale Filterfl&auml;che sollte kleiner sein als die maximale',
-    'MinFilterAreaUnset'   => 'Sie m&uuml;ssen einen Minimumwert an Filterpixeln angeben',
-    'MinFilterLtMinAlarm'  => 'Die minimale Filterfl&auml;che sollte kleiner oder gleich der minimalen Alarmfl&auml;che sein',
+    'MinAlarmAreaUnset'    => 'Sie müssen einen Minimumwert an Alarmflächenpixeln angeben',
+    'MinBlobAreaLtMax'     => 'Die minimale Blob-Fläche muss kleiner sein als die maximale',
+    'MinBlobAreaUnset'     => 'Sie müssen einen Minimumwert an Blobflächenpixeln angeben',
+    'MinBlobLtMinFilter'   => 'Die minimale Blob-Fläche sollte kleiner oder gleich der minimalen Filterfläche sein',
+    'MinBlobsLtMax'        => 'Die minimalen Blobs müssen kleiner sein als die maximalen',
+    'MinBlobsUnset'        => 'Sie müssen einen Minimumwert an Blobs angeben',
+    'MinFilterAreaLtMax'   => 'Die minimale Filterfläche sollte kleiner sein als die maximale',
+    'MinFilterAreaUnset'   => 'Sie müssen einen Minimumwert an Filterpixeln angeben',
+    'MinFilterLtMinAlarm'  => 'Die minimale Filterfläche sollte kleiner oder gleich der minimalen Alarmfläche sein',
     'MinFocusRange'        => 'Min. Fokusbereich',
     'MinFocusSpeed'        => 'Min. Fokusgeschw.',
     'MinFocusStep'         => 'Min. Fokusstufe',
-    'MinGainRange'         => 'Min. Verst&auml;rkungsbereich',
-    'MinGainSpeed'         => 'Min. Verst&auml;rkungsgeschwindigkeit',
-    'MinGainStep'          => 'Min. Verst&auml;rkungsstufe',
+    'MinGainRange'         => 'Min. Verstärkungsbereich',
+    'MinGainSpeed'         => 'Min. Verstärkungsgeschwindigkeit',
+    'MinGainStep'          => 'Min. Verstärkungsstufe',
     'MinIrisRange'         => 'Min. Irisbereich',
     'MinIrisSpeed'         => 'Min. Irisgeschwindigkeit',
     'MinIrisStep'          => 'Min. Irisstufe',
@@ -451,38 +461,40 @@ $SLANG = array(
     'MinPanSpeed'          => 'Min. Pan-Geschwindigkeit',
     'MinPanStep'           => 'Min. Pan-Stufe',
     'MinPixelThresLtMax'   => 'Der minimale Pixelschwellwert muss kleiner sein als der maximale',
-    'MinPixelThresUnset'   => 'Sie m&uuml;ssen einen minimalen Pixel-Schwellenwert angeben',
+    'MinPixelThresUnset'   => 'Sie müssen einen minimalen Pixel-Schwellenwert angeben',
     'MinTiltRange'         => 'Min. Neigungsbereich',
     'MinTiltSpeed'         => 'Min. Neigungsgeschwindigkeit',
     'MinTiltStep'          => 'Min. Neigungsstufe',
-    'MinWhiteRange'        => 'Min. Wei&szlig;-Abgleichbereich',
-    'MinWhiteSpeed'        => 'Min. Wei&szlig;-Abgleichgeschwindigkeit',
-    'MinWhiteStep'         => 'Min. Wei&szlig;-Abgleichstufe',
+    'MinWhiteRange'        => 'Min. Weiß-Abgleichbereich',
+    'MinWhiteSpeed'        => 'Min. Weiß-Abgleichgeschwindigkeit',
+    'MinWhiteStep'         => 'Min. Weiß-Abgleichstufe',
     'MinZoomRange'         => 'Min. Zoom-Bereich',
     'MinZoomSpeed'         => 'Min. Zoom-Geschwindigkeit',
     'MinZoomStep'          => 'Min. Zoom-Stufe',
     'Misc'                 => 'Verschiedenes',
+    'Mode'                 => 'Modus',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Monitor-ID',
     'MonitorPreset'        => 'Monitor-Voreinstellung',
-    'MonitorPresetIntro'   => 'W&auml;hlen Sie eine geeignete Voreinstellung aus der folgenden Liste.<br><br>Bitte beachten Sie, dass dies m&ouml;gliche Einstellungen von Ihnen am Monitor &uuml;berschreiben kann.<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
+    'MonitorPresetIntro'   => 'Wählen Sie eine geeignete Voreinstellung aus der folgenden Liste.<br><br>Bitte beachten Sie, dass dies mögliche Einstellungen von Ihnen am Monitor überschreiben kann.<br><br>',
+    'MonitorProbe'         => 'Kamera suche',          // Added - 2009-03-31
+    'MonitorProbeIntro'    => 'Die nachfolgende Liste zeigt erkannte Analog- und Netzwerkkameras, ob sie bereits genutzt werden und ob sie zur Auswahl verfügbar sind.<br/><br/>Wähle den gewünschten Eintrag aus der folgenden Liste.<br/><br/>Bitte Beachten: Nicht alle  Kameras können erkannt werden. Die Auswahl einer Kamera kann bereits eingetragene Werte im aktuellen Monitor überschreiben.<br/><br/>', // Added - 2009-03-31
     'Monitors'             => 'Monitore',
     'Montage'              => 'Montage',
     'Month'                => 'Monat',
-    'More'                 => 'More',                   // Added - 2011-06-16
+    'More'                 => 'Mehr',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Bewegung',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
-    'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrx'           => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
+    'Mtg2widgrd'           => '2 Spalten',              // Added 2013.08.15.
+    'Mtg3widgrd'           => '3 Spalten',              // Added 2013.08.15.
+    'Mtg3widgrx'           => '3 Spalten, skaliert, vergr. bei Alarm',              // Added 2013.08.15.
+    'Mtg4widgrd'           => '4 Spalten',              // Added 2013.08.15.
+    'MtgDefault'           => 'Standard',              // Added 2013.08.15.
     'MustBeGe'             => 'muss groesser oder gleich sein wie',
     'MustBeLe'             => 'muss kleiner oder gleich sein wie',
-    'MustConfirmPassword'  => 'Sie m&uuml;ssen das Passwort best&auml;tigen.',
-    'MustSupplyPassword'   => 'Sie m&uuml;ssen ein Passwort vergeben.',
-    'MustSupplyUsername'   => 'Sie m&uuml;ssen einen Usernamen vergeben.',
+    'MustConfirmPassword'  => 'Sie müssen das Passwort bestätigen.',
+    'MustSupplyPassword'   => 'Sie müssen ein Passwort vergeben.',
+    'MustSupplyUsername'   => 'Sie müssen einen Usernamen vergeben.',
     'Name'                 => 'Name',
     'Near'                 => 'Nah',
     'Network'              => 'Netzwerk',
@@ -492,20 +504,23 @@ $SLANG = array(
     'NewPassword'          => 'Neues Passwort',
     'NewState'             => 'Neuer Status',
     'NewUser'              => 'Neuer Benutzer',
-    'Next'                 => 'N&auml;chstes',
+    'Next'                 => 'Nächstes',
     'No'                   => 'Nein',
-    'NoDetectedCameras'    => 'No Detected Cameras',    // Added - 2009-03-31
+    'NoDetectedCameras'    => 'Keine Kameras erkannt',    // Added - 2009-03-31
     'NoFramesRecorded'     => 'Es gibt keine Aufnahmen von diesem Ereignis.',
     'NoGroup'              => 'Keine Gruppe',
     'NoSavedFilters'       => 'Keine gespeicherten Filter',
-    'NoStatisticsRecorded' => 'Keine Statistik f&uuml;r dieses Ereignis/diese Bilder',
+    'NoStatisticsRecorded' => 'Keine Statistik für dieses Ereignis/diese Bilder',
     'None'                 => 'ohne',
-    'NoneAvailable'        => 'Nichts verf&uuml;gbar',
+    'NoneAvailable'        => 'Nichts verfügbar',
     'Normal'               => 'Normal',
     'Notes'                => 'Bemerkungen',
     'NumPresets'           => 'Nummerierte Voreinstellungen',
     'Off'                  => 'Aus',
     'On'                   => 'An',
+    'OnvifCredentialsIntro'=> 'Bitte den Benutzernamen und das Passwort für die gewählte Kamera eintragen.<br/>Der hier eingetragene Benutzer wird erstellt mitsamt des Passworts, falls kein Benutzer für diese Kamera erstellt wurde.<br/><br/>', // Added - 2015-04-18
+    'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
+    'OnvifProbeIntro'      => 'Die folgende Liste zeigt erkannte ONVIF Kameras, ob sie bereits genutzt werden und ob sie zur Auswahl verfügbar sind.<br/><br/>Wähle den gewünschten Eintrag aus der folgenden Liste.<br/><br/>Bitte Beachten: Nicht alle  Kameras können erkannt werden. Die Auswahl einer Kamera kann bereits eingetragene Werte im aktuellen Monitor überschreiben.<br/><br/>', // Added - 2015-04-18
     'OpEq'                 => 'gleich zu',
     'OpGt'                 => 'groesser als',
     'OpGtEq'               => 'groesser oder gleich wie',
@@ -516,15 +531,15 @@ $SLANG = array(
     'OpNe'                 => 'nicht gleich',
     'OpNotIn'              => 'nicht im Satz',
     'OpNotMatches'         => 'nicht zutreffend',
-    'Open'                 => '&Ouml;ffnen',
+    'Open'                 => 'öffnen',
     'OptionHelp'           => 'Hilfe',
-    'OptionRestartWarning' => 'Ver&auml;nderungen werden erst nach einem Neustart des Programms aktiv.\nF&uuml;r eine sofortige &Auml;nderung starten Sie das Programm bitte neu.',
+    'OptionRestartWarning' => 'Veränderungen werden erst nach einem Neustart des Programms aktiv.\nFür eine sofortige änderung starten Sie das Programm bitte neu.',
     'Options'              => 'Optionen',
     'OrEnterNewName'       => 'oder neuen Namen eingeben',
     'Order'                => 'Reihenfolge',
     'Orientation'          => 'Ausrichtung',
     'Out'                  => 'Aus',
-    'OverwriteExisting'    => '&Uuml;berschreibe bestehende',
+    'OverwriteExisting'    => 'überschreibe bestehende',
     'Paged'                => 'Seitennummeriert',
     'Pan'                  => 'Pan',
     'PanLeft'              => 'Pan-Left',
@@ -532,11 +547,11 @@ $SLANG = array(
     'PanTilt'              => 'Pan/Neigung',
     'Parameter'            => 'Parameter',
     'Password'             => 'Passwort',
-    'PasswordsDifferent'   => 'Die Passw&ouml;rter sind unterschiedlich',
+    'PasswordsDifferent'   => 'Die Passwörter sind unterschiedlich',
     'Paths'                => 'Pfade',
     'Pause'                => 'Pause',
     'Phone'                => 'Telefon',
-    'PhoneBW'              => 'Tel.&nbsp;B/W',
+    'PhoneBW'              => 'Tel. B/W',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
     'PixelDiff'            => 'Pixel-Differenz',
     'Pixels'               => 'Pixel',
@@ -547,57 +562,60 @@ $SLANG = array(
     'Point'                => 'Punkt',
     'PostEventImageBuffer' => 'Nachereignispuffer',
     'PreEventImageBuffer'  => 'Vorereignispuffer',
-    'PreserveAspect'       => 'Seitenverh&auml;ltnis beibehalten',
+    'PreserveAspect'       => 'Seitenverhältnis beibehalten',
     'Preset'               => 'Voreinstellung',
     'Presets'              => 'Voreinstellungen',
     'Prev'                 => 'Vorheriges',
-    'Probe'                => 'Probe',                  // Added - 2009-03-31
+    'Probe'                => 'Sonde',                  // Added - 2009-03-31
+    'ProfileProbe'         => 'Streamsonde',           // Added - 2015-04-18
+    'ProfileProbeIntro'    => 'Die folgende Liste zeigt die verfügbaren Streamingprofile der ausgewählten Kamera.<br/><br/>Wähle den gewünschten Eintrag aus der folgenden Liste.<br/><br/>Bitte Beachten: Zoneminder kann keine zusätzlichen Profile konfigurieren. Die Auswahl einer Kamera kann bereits eingetragene Werte im aktuellen Monitor überschreiben.<br/><br/>', // Added - 2015-04-18
+    'Progress'             => 'Fortschritt',               // Added - 2015-04-18
     'Protocol'             => 'Protokoll',
     'Rate'                 => 'Abspielgeschwindigkeit',
     'Real'                 => 'Real',
     'Record'               => 'Aufnahme',
     'RefImageBlendPct'     => 'Referenz-Bildblende',
     'Refresh'              => 'Aktualisieren',
-    'Remote'               => 'Entfernt',
-    'RemoteHostName'       => 'Entfernter Hostname',
-    'RemoteHostPath'       => 'Entfernter Hostpfad',
-    'RemoteHostPort'       => 'Entfernter Hostport',
-    'RemoteHostSubPath'    => 'Remote Host SubPath',    // Added - 2009-02-08
-    'RemoteImageColours'   => 'Entfernte Bildfarbe',
-    'RemoteMethod'         => 'Remote Method',          // Added - 2009-02-08
-    'RemoteProtocol'       => 'Remote Protocol',        // Added - 2009-02-08
+    'Remote'               => 'Remote',
+    'RemoteHostName'       => 'Remote Hostname',
+    'RemoteHostPath'       => 'Remote Hostpfad',
+    'RemoteHostPort'       => 'Remote Hostport',
+    'RemoteHostSubPath'    => 'Remote Hostunterpfad',    // Added - 2009-02-08
+    'RemoteImageColours'   => 'Remote Bildfarbe',
+    'RemoteMethod'         => 'Remote Methode',          // Added - 2009-02-08
+    'RemoteProtocol'       => 'Remote Protokol',        // Added - 2009-02-08
     'Rename'               => 'Umbenennen',
     'Replay'               => 'Wiederholung',
     'ReplayAll'            => 'Alle Ereignisse',
-    'ReplayGapless'        => 'L&uuml;ckenlose Ereignisse',
+    'ReplayGapless'        => 'Lückenlose Ereignisse',
     'ReplaySingle'         => 'Einzelereignis',
-    'Reset'                => 'Zur&uuml;cksetzen',
-    'ResetEventCounts'     => 'L&ouml;sche Ereignispunktzahl',
+    'Reset'                => 'Zurücksetzen',
+    'ResetEventCounts'     => 'Lösche Ereignispunktzahl',
     'Restart'              => 'Neustart',
     'Restarting'           => 'Neustarten',
     'RestrictedCameraIds'  => 'Verbotene Kamera-ID',
-    'RestrictedMonitors'   => 'Eingeschr&auml;nkte Monitore',
-    'ReturnDelay'          => 'R&uuml;ckkehr-Verz&ouml;gerung',
-    'ReturnLocation'       => 'R&uuml;ckkehrpunkt',
-    'Rewind'               => 'Zur&uuml;ckspulen',
+    'RestrictedMonitors'   => 'Eingeschränkte Monitore',
+    'ReturnDelay'          => 'Rückkehr-Verzögerung',
+    'ReturnLocation'       => 'Rückkehrpunkt',
+    'Rewind'               => 'Zurückspulen',
     'RotateLeft'           => 'Drehung links',
     'RotateRight'          => 'Drehung rechts',
-    'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
+    'RunLocalUpdate'       => 'Bitte zmupdate.pl starten um upzudaten.', // Added - 2011-05-25
     'RunMode'              => 'Betriebsmodus',
     'RunState'             => 'Laufender Status',
     'Running'              => 'In Betrieb',
-    'Save'                 => 'OK',
+    'Save'                 => 'Speichern',
     'SaveAs'               => 'Speichere als',
     'SaveFilter'           => 'Speichere Filter',
     'Scale'                => 'Skalierung',
     'Score'                => 'Punktzahl',
     'Secs'                 => 'Sekunden',
-    'Sectionlength'        => 'Sektionsl&auml;nge',
+    'Sectionlength'        => 'Sektionslänge',
     'Select'               => 'Auswahl',
-    'SelectFormat'         => 'Select Format',          // Added - 2011-06-17
-    'SelectLog'            => 'Select Log',             // Added - 2011-06-17
-    'SelectMonitors'       => 'W&auml;hle Monitore',
-    'SelfIntersecting'     => 'Die Polygonr&auml;nder d&uuml;rfen sich nicht &uuml;berschneiden.',
+    'SelectFormat'         => 'Format Auswahl',          // Added - 2011-06-17
+    'SelectLog'            => 'Log Auswahl',             // Added - 2011-06-17
+    'SelectMonitors'       => 'Wähle Monitore',
+    'SelfIntersecting'     => 'Die Polygonränder dürfen sich nicht überschneiden.',
     'Set'                  => 'Setze',
     'SetNewBandwidth'      => 'Setze neue Bandbreite',
     'SetPreset'            => 'Setze Voreinstellung',
@@ -605,15 +623,15 @@ $SLANG = array(
     'ShowFilterWindow'     => 'Zeige Filterfenster',
     'ShowTimeline'         => 'Zeige Zeitlinie',
     'SignalCheckColour'    => 'Farbe des Signalchecks',
-    'Size'                 => 'Gr&ouml;&szlig;e',
-    'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
+    'Size'                 => 'Größe',
+    'SkinDescription'      => 'Wähle den standard Skin für diesen Computer.', // Added - 2011-01-30
     'Sleep'                => 'Schlaf',
     'SortAsc'              => 'aufsteigend',
     'SortBy'               => 'Sortieren nach',
     'SortDesc'             => 'absteigend',
     'Source'               => 'Quelle',
-    'SourceColours'        => 'Source Colours',         // Added - 2009-02-08
-    'SourcePath'           => 'Source Path',            // Added - 2009-02-08
+    'SourceColours'        => 'Quellenfarben',         // Added - 2009-02-08
+    'SourcePath'           => 'Quellenpfad',            // Added - 2009-02-08
     'SourceType'           => 'Quellentyp',
     'Speed'                => 'Geschwindigkeit',
     'SpeedHigh'            => 'Hohe Geschwindigkeit',
@@ -625,9 +643,9 @@ $SLANG = array(
     'Stats'                => 'Status',
     'Status'               => 'Status',
     'Step'                 => 'Stufe',
-    'StepBack'             => 'Einen Schritt r&uuml;ckw&auml;rts',
-    'StepForward'          => 'Einen Schritt vorw&auml;rts',
-    'StepLarge'            => 'Gro&szlig;e Stufe',
+    'StepBack'             => 'Einen Schritt rückwärts',
+    'StepForward'          => 'Einen Schritt vorwärts',
+    'StepLarge'            => 'Große Stufe',
     'StepMedium'           => 'Mittlere Stufe',
     'StepNone'             => 'Keine Stufe',
     'StepSmall'            => 'Kleine Stufe',
@@ -639,6 +657,7 @@ $SLANG = array(
     'Submit'               => 'Absenden',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Zielfarbbereich',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Miniatur',
     'Tilt'                 => 'Neigung',
@@ -646,10 +665,10 @@ $SLANG = array(
     'TimeDelta'            => 'Zeitdifferenz',
     'TimeStamp'            => 'Zeitstempel',
     'Timeline'             => 'Zeitlinie',
-    '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'         => 'Bewege die Maus über dem Graphen um eine Vorschau und Ereignisdetails zu sehen.',               // Added 2013.08.15.
+    'TimelineTip2'         => 'Clicke auf den farbigen Abschnitt des Graphen oder auf das Bild um den Ereignis zu betrachten',   // Added 2013.08.15.
+    'TimelineTip3'         => 'Clicke auf den Hintergrund, um in den Zeitabschnitt um das Ereignis hereinzuzoomen.',              // Added 2013.08.15.
+    'TimelineTip4'         => 'Benutze die unteren Bedienelemente um herauszuzoomen oder sich in der Zeitleiste zu bewegen.',       // Added 2013.08.15.
     'Timestamp'            => 'Zeitstempel',
     'TimestampLabelFormat' => 'Format des Zeitstempels',
     'TimestampLabelX'      => 'Zeitstempel-X',
@@ -658,34 +677,37 @@ $SLANG = array(
     'Tools'                => 'Werkzeuge',
     'Total'                => 'Total',                  // Added - 2011-06-16
     'TotalBrScore'         => 'Totale<br/>Punktzahl',
-    'TrackDelay'           => 'Nachf&uuml;hrungsverz&ouml;gerung',
-    'TrackMotion'          => 'Bewegungs-Nachf&uuml;hrung',
-    'Triggers'             => 'Ausl&ouml;ser',
+    'TrackDelay'           => 'Nachführungsverzögerung',
+    'TrackMotion'          => 'Bewegungs-Nachführung',
+    'Triggers'             => 'Auslöser',
     'TurboPanSpeed'        => 'Turbo-Pan-Geschwindigkeit',
     'TurboTiltSpeed'       => 'Turbo-Neigungsgeschwindigkeit',
     'Type'                 => 'Typ',
     'Unarchive'            => 'Aus Archiv entfernen',
-    'Undefined'            => 'Undefined',              // Added - 2009-02-08
+    'Undefined'            => 'Undefiniert',              // Added - 2009-02-08
     'Units'                => 'Einheiten',
     'Unknown'              => 'Unbekannt',
     'Update'               => 'Aktualisieren',
-    'UpdateAvailable'      => 'Eine Aktualisierung f&uuml;r ZoneMinder ist verf&uuml;gbar.',
-    'UpdateNotNecessary'   => 'Es ist keine Aktualisierung verf&uuml;gbar.',
-    'Updated'              => 'Updated',                // Added - 2011-06-16
-    'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
+    'UpdateAvailable'      => 'Eine Aktualisierung für ZoneMinder ist verfügbar.',
+    'UpdateNotNecessary'   => 'Es ist keine Aktualisierung verfügbar.',
+    'Updated'              => 'Aktualisiert',                // Added - 2011-06-16
+    'Upload'               => 'Hochladen',                 // Added - 2011-08-23
     'UseFilter'            => 'Benutze Filter',
-    'UseFilterExprsPost'   => '&nbsp;Filter&nbsp;Ausdr&uuml;cke', // This is used at the end of the phrase 'use N filter expressions'
-    'UseFilterExprsPre'    => 'Benutze&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UseFilterExprsPost'   => ' Filter Ausdrücke', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'    => 'Benutze ', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Benutzer',
     'Username'             => 'Benutzername',
     'Users'                => 'Benutzer',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Aufnahmen pro Bild',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Wert',
     'Version'              => 'Version',
     'VersionIgnore'        => 'Ignoriere diese Version',
     'VersionRemindDay'     => 'Erinnere mich wieder in 1 Tag.',
     'VersionRemindHour'    => 'Erinnere mich wieder in 1 Stunde.',
-    'VersionRemindNever'   => 'Informiere mich nicht mehr &uuml;ber neue Versionen.',
+    'VersionRemindNever'   => 'Informiere mich nicht mehr über neue Versionen.',
     'VersionRemindWeek'    => 'Erinnere mich wieder in 1 Woche.',
     'Video'                => 'Video',
     'VideoFormat'          => 'Videoformat',
@@ -694,19 +716,19 @@ $SLANG = array(
     'VideoGenNoFiles'      => 'Keine Videodateien gefunden.',
     'VideoGenParms'        => 'Parameter der Videoerzeugung',
     'VideoGenSucceeded'    => 'Videoerzeugung erfolgreich!',
-    'VideoSize'            => 'Videogr&ouml;&szlig;e',
+    'VideoSize'            => 'Videogröße',
     'View'                 => 'Ansicht',
     'ViewAll'              => 'Alles ansehen',
     'ViewEvent'            => 'Zeige Ereignis',
     'ViewPaged'            => 'Seitenansicht',
     'Wake'                 => 'Aufwachen',
-    'WarmupFrames'         => 'Aufw&auml;rmbilder',
+    'WarmupFrames'         => 'Aufwärmbilder',
     'Watch'                => 'Beobachte',
     'Web'                  => 'Web',
     'WebColour'            => 'Webfarbe',
     'Week'                 => 'Woche',
-    'White'                => 'Wei&szlig;',
-    'WhiteBalance'         => 'Wei&szlig;-Abgleich',
+    'White'                => 'Weiß',
+    'WhiteBalance'         => 'Weiß-Abgleich',
     'Wide'                 => 'Weit',
     'X'                    => 'X',
     'X10'                  => 'X10',
@@ -717,17 +739,17 @@ $SLANG = array(
     'Yes'                  => 'Ja',
     'YouNoPerms'           => 'Keine Erlaubnis zum Zugang dieser Resource.',
     'Zone'                 => 'Zone',
-    'ZoneAlarmColour'      => 'Alarmfarbe (Rot/Gr&uuml;n/Blau)',
+    'ZoneAlarmColour'      => 'Alarmfarbe (Rot/Grün/Blau)',
     'ZoneArea'             => 'Zone Area',
-    'ZoneFilterSize'       => 'Filter-Breite/-H&ouml;he (Pixel)',
-    'ZoneMinMaxAlarmArea'  => 'Min./max. Alarmfl&auml;che',
-    'ZoneMinMaxBlobArea'   => 'Min./max. Blobfl&auml;che',
+    'ZoneExtendAlarmFrames' => 'Alarmstatus nach Ende für Frames aufrechterhalten',
+    'ZoneFilterSize'       => 'Filter-Breite/-Höhe (Pixel)',
+    'ZoneMinMaxAlarmArea'  => 'Min./max. Alarmfläche',
+    'ZoneMinMaxBlobArea'   => 'Min./max. Blobfläche',
     'ZoneMinMaxBlobs'      => 'Min./max. Blobs',
-    'ZoneMinMaxFiltArea'   => 'Min./max. Filterfl&auml;che',
+    'ZoneMinMaxFiltArea'   => 'Min./max. Filterfläche',
     'ZoneMinMaxPixelThres' => 'Min./max. Pixelschwellwert',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
-    'ZoneOverloadFrames'   => 'Bildauslassrate bei System&uuml;berlastung',
-    'ZoneExtendAlarmFrames' => 'Alarmstatus nach Ende f&uuml;r Frames aufrechterhalten',
+    'ZoneOverloadFrames'   => 'Bildauslassrate bei Systemüberlastung',
     'Zones'                => 'Zonen',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Hineinzoomen',
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 927440513..08795edf4 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -89,6 +89,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Alarm',
     'All'                  => 'Alle',
     'Apply'                => 'Aktiver',
@@ -133,13 +134,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Navne m� kun indeholde alphanumeric karaktere plus hyphen og underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -159,7 +160,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob St�relse',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Brightness',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffere',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Kan Auto Focus',
     'CanAutoGain'          => 'Kan Auto Gain',
     'CanAutoIris'          => 'Kan Auto Iris',
@@ -203,6 +206,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Capture Height',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Capture Palette',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Capture Width',
     'Cause'                => '�rsag',
     'CheckMethod'          => 'Alarm Check Methode',
@@ -233,6 +237,7 @@ $SLANG = array(
     'ControlDevice'        => 'Kontrol Enhed',
     'ControlType'          => 'Kontrol Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => 'Cycle Watch',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -241,12 +246,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Slet',
     'DeleteAndNext'        => 'Slet &amp; N�ste',
     'DeleteAndPrev'        => 'Slet &amp; Forrige',
     'DeleteSavedFilter'    => 'Slet Gemte filter',
     'Description'          => 'Beskrivelse',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Enheds Kanal',
     'DeviceFormat'         => 'Enheds Format',
@@ -258,6 +266,7 @@ $SLANG = array(
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -267,7 +276,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Forl�b',
@@ -310,10 +318,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Arkiver alle matchende',
     'FilterDeleteEvents'   => 'Slet alle matchende',
     'FilterEmailEvents'    => 'Email detalier af alle matchende',
     'FilterExecuteEvents'  => 'K�r kommando p� alle matchende',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Send detalier af alle matchende',
     'FilterPx'             => 'Filter Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -323,12 +333,12 @@ $SLANG = array(
     'First'                => 'F�rste',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Fokus',
     'ForceAlarm'           => 'Tving Alarm',
     'Format'               => 'Format',
@@ -336,7 +346,6 @@ $SLANG = array(
     'FrameId'              => 'Billede Id',
     'FrameRate'            => 'Billede Rate',
     'FrameSkip'            => 'Billede Skip',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Billede',
     'Func'                 => 'Func',
     'Function'             => 'Funktion',
@@ -463,6 +472,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Monitor&nbsp;Ids',
     'MonitorPreset'        => 'Monitor Preset',
@@ -473,12 +483,13 @@ $SLANG = array(
     'Montage'              => 'Montage',
     'Month'                => 'M�ned',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Flyt',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-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.
     'MustBeGe'             => 'skal v�re st�re end eller ligmed',
     'MustBeLe'             => 'Skal v�re mindre end eller ligmed',
     'MustConfirmPassword'  => 'Du skal konfimere password',
@@ -507,6 +518,9 @@ $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
+    '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'                 => 'ligmed',
     'OpGt'                 => 'st�re end',
     'OpGtEq'               => 'st�re end eller ligmed',
@@ -553,6 +567,9 @@ $SLANG = array(
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Rate',
     'Real'                 => 'Real',
@@ -640,6 +657,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -674,13 +692,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Ingen updatering er n�dvendig.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Brug Filter',
     'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Brug&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Bruger',
     'Username'             => 'Bruger Navn',
     'Users'                => 'Brugere',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'V�rdig',
     'Version'              => 'Version',
     'VersionIgnore'        => 'Ignorer denne version',
@@ -720,6 +741,7 @@ $SLANG = array(
     'Zone'                 => 'Zone',
     'ZoneAlarmColour'      => 'Alarm Farve (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -728,7 +750,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zoner',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 77c968645..ceaabad02 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -96,6 +96,7 @@ $SLANG = array(
     'AlarmLimits'           => 'Alarm Limits',
     'AlarmMaximumFPS'       => 'Alarm Maximum FPS',
     'AlarmPx'               => 'Alarm Px',
+    'AlarmRefImageBlendPct' => 'Alarm Reference Image Blend %ge',
     'AlarmRGBUnset'         => 'You must set an alarm RGB colour',
     'Alert'                 => 'Alert',
     'All'                   => 'All',
@@ -168,6 +169,7 @@ $SLANG = array(
     'Blobs'                 => 'Blobs',
     'BlobSizes'             => 'Blob Sizes',
     'Brightness'            => 'Brightness',
+    'Buffer'                => 'Buffer',
     'Buffers'               => 'Buffers',
     'CanAutoFocus'          => 'Can Auto Focus',
     'CanAutoGain'           => 'Can Auto Gain',
@@ -241,6 +243,7 @@ $SLANG = array(
     'ControlDevice'         => 'Control Device',
     'Controllable'          => 'Controllable',
     'ControlType'           => 'Control Type',
+    'Current'               => 'Current',
     'Cycle'                 => 'Cycle',
     'CycleWatch'            => 'Cycle Watch',
     'Day'                   => 'Day',
@@ -248,6 +251,8 @@ $SLANG = array(
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
     'DefaultView'           => 'Default View',
+    'Deinterlacing'         => 'Deinterlacing',
+    'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete &amp; Next',
     'DeleteAndPrev'         => 'Delete &amp; Prev',
     'Delete'                => 'Delete',
@@ -319,8 +324,10 @@ $SLANG = array(
     'FilterDeleteEvents'    => 'Delete all matches',
     'FilterEmailEvents'     => 'Email details of all matches',
     'FilterExecuteEvents'   => 'Execute command on all matches',
+    'FilterLog'             => 'Filter log',
     'FilterMessageEvents'   => 'Message details of all matches',
     'FilterPx'              => 'Filter Px',
+    'Filter'                => 'Filter',
     'Filters'               => 'Filters',
     'FilterUnset'           => 'You must specify a filter width and height',
     'FilterUploadEvents'    => 'Upload all matches',
@@ -468,6 +475,7 @@ $SLANG = array(
     'MinZoomSpeed'          => 'Min Zoom Speed',
     'MinZoomStep'           => 'Min Zoom Step',
     'Misc'                  => 'Misc',
+    'Mode'                  => 'Mode',
     'MonitorIds'            => 'Monitor&nbsp;Ids',
     'Monitor'               => 'Monitor',
     'MonitorPresetIntro'    => 'Select an appropriate preset from the list below.<br/><br/>Please note that this may overwrite any values you already have configured for the current monitor.<br/><br/>',
@@ -561,6 +569,7 @@ $SLANG = array(
     'Probe'                 => 'Probe',
     'ProfileProbe'          => 'Stream Probe',
     '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/>',
+    'Progress'              => 'Progress',
     'Protocol'              => 'Protocol',
     'Rate'                  => 'Rate',
     'Real'                  => 'Real',
@@ -648,6 +657,7 @@ $SLANG = array(
     'Stream'                => 'Stream',
     'Submit'                => 'Submit',
     'System'                => 'System',
+    'TargetColorspace'      => 'Target colorspace',
     'Tele'                  => 'Tele',
     'Thumbnail'             => 'Thumbnail',
     'Tilt'                  => 'Tilt',
@@ -879,7 +889,7 @@ $OLANG = array(
 		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index ee1508723..1445437f6 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -39,6 +39,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Alerta',
     'All'                  => 'Todo',
     'Apply'                => 'Aplicar',
@@ -83,13 +84,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Los nombres pueden contener solamente caracteres alfanum�ricos m�s el gui�n y la raya',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -109,7 +110,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob Sizes',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Brillo',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -153,6 +156,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Captura Alto',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Captura Paleta',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Captura Ancho',
     'Cause'                => 'Cause',
     'CheckMethod'          => 'Alarm Check Method',
@@ -183,6 +187,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => 'Cycle Watch',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -191,12 +196,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Borrar',
     'DeleteAndNext'        => 'Borrar &amp; Pr�ximo',
     'DeleteAndPrev'        => 'Borrar &amp; Anterior',
     'DeleteSavedFilter'    => 'Borrar Filtro Guardado',
     'Description'          => 'Descripci�n',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Canal',
     'DeviceFormat'         => 'Se�al',
@@ -208,6 +216,7 @@ $SLANG = array(
     'Disk'                 => 'Disco',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -217,7 +226,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Duraci�n',
@@ -260,10 +268,12 @@ $SLANG = array(
     'Feed'                 => 'Vista',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archivar todos los eventos',
     'FilterDeleteEvents'   => 'Borrar todos los eventos',
     'FilterEmailEvents'    => 'Mandar un mail de todos los eventos',
     'FilterExecuteEvents'  => 'Ejecutar un comando en las coincidencias',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Mandar un mensaje de los eventos',
     'FilterPx'             => 'Filtro Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -273,12 +283,12 @@ $SLANG = array(
     'First'                => 'Primero',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'Forzar Alarma',
     'Format'               => 'Format',
@@ -286,7 +296,6 @@ $SLANG = array(
     'FrameId'              => 'Id Cuadro',
     'FrameRate'            => 'Velocidad del video',
     'FrameSkip'            => 'Saltear Cuadro',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Cuadros',
     'Func'                 => 'Func',
     'Function'             => 'Funci�n',
@@ -413,6 +422,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Otros',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Ids&nbsp;Monitor',
     'MonitorPreset'        => 'Monitor Preset',
@@ -423,12 +433,13 @@ $SLANG = array(
     'Montage'              => 'C�mara M�ltiple',
     'Month'                => 'Mes',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'Debe ser mayor o igual que',
     'MustBeLe'             => 'Debe ser menor o igual que',
     'MustConfirmPassword'  => 'Debe confirmar la contrase�a',
@@ -457,6 +468,9 @@ $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
+    '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'                 => 'igual que',
     'OpGt'                 => 'mayor que',
     'OpGtEq'               => 'mayor o igual que',
@@ -503,6 +517,9 @@ $SLANG = array(
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Ritmo',
     'Real'                 => 'Real',
@@ -590,6 +607,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => 'Sistema',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -624,13 +642,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'No se requiere Actualizaci�n',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Usar Filtro',
     'UseFilterExprsPost'   => '&nbsp;filtrar&nbsp;sentencias', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Utilizar&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Usuario',
     'Username'             => 'Nombre',
     'Users'                => 'Usuarios',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Valor',
     'Version'              => 'Versi�n',
     'VersionIgnore'        => 'Ignore esta versi�n',
@@ -670,6 +691,7 @@ $SLANG = array(
     'Zone'                 => 'Zona',
     'ZoneAlarmColour'      => 'Color Alarma (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -678,7 +700,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zonas',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index 1e80f6500..38b879814 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -72,6 +72,7 @@ header ('Content-type: text/html; charset=utf-8');
 // Simple String Replacements
 $SLANG = array(
     '24BitColour'           => 'Color 24 bits',
+    '32BitColour'          => '32 bit colour',          // Added - 2015-04-18
     '8BitGrey'              => 'Grises 8 bits',
     'Action'                => 'Acción',
     'Actual'                => 'Actual',
@@ -87,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'       => 'Máximos MPS alarma',
     'AlarmPx'               => 'Px alarma',
     'AlarmRGBUnset'         => 'Debe establecer un color RGB para alarma',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                 => 'Alerta',
     'All'                   => 'Todo',
     'Apply'                 => 'Aplicar',
@@ -126,17 +128,18 @@ $SLANG = array(
     'BadAlarmFrameCount'    => 'El número de marcos de alarma debe tener un número entero de uno o más',
     'BadAlarmMaxFPS'        => 'Máximos MPS de alarma debe ser un valor entero positivo o de punto flotante',
     'BadChannel'            => 'El canal debe estar establecido en un entero de cero o más',
+    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2015-04-18
     'BadDevice'             => 'El dispositivo debe tener un valor válido',
     'BadFPSReportInterval'  => 'El registro de intervalo de recuento búfer de MPS debe ser un entero de 100 o más',
     'BadFormat'             => 'El formato debe tener un valor válido',
     'BadFrameSkip'          => 'El número de omisión de marcos debe ser un entero de cero o más',
-    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'             => 'La altura debe tener un valor válido',
     'BadHost'               => 'El host debe tener una dirección ip o nombre de host válidos, no incluir http://',
     'BadImageBufferCount'   => 'El tamaño de búfer de imagen debe serun entero de 10 o más',
     'BadLabelX'             => 'La coordenada de la etiqueta X debe ser un entero de cero o más',
     'BadLabelY'             => 'La coordenada de la etiqueta Y debe ser un entero de cero o más',
     'BadMaxFPS'             => 'MPS máximos debe tener un valor entero positivo o de punto flotante',
+    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'          => 'Los nombre sólo pueden contener carácteres alfanuméricos además de guiones y guiones bajos',
     'BadPalette'            => 'La paleta debe tener un valor válido',
     'BadPath'               => 'La ruta debe tener un valo válido',
@@ -156,7 +159,9 @@ $SLANG = array(
     'BlobSizes'             => 'Tamaño gotas',
     'Blobs'                 => 'Gotas',
     'Brightness'            => 'Brillo',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'               => 'Búfers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'          => 'Puede enfocar automáticamente',
     'CanAutoGain'           => 'Puede usar ganancia automática',
     'CanAutoIris'           => 'Puede ajustar el iris automáticamente',
@@ -200,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'         => 'Altura de captura',
     'CaptureMethod'         => 'Método de captura',
     'CapturePalette'        => 'Paleta de captura',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'          => 'Ancho de captura',
     'Cause'                 => 'Causa',
     'CheckMethod'           => 'Método de comprobación de alarma',
@@ -230,6 +236,7 @@ $SLANG = array(
     'ControlDevice'         => 'Controlar dispositivo',
     'ControlType'           => 'Tipo de control',
     'Controllable'          => 'Controlable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                 => 'Ciclo',
     'CycleWatch'            => 'Visión ciclo',
     'DateTime'              => 'Fecha/Hora',
@@ -238,12 +245,15 @@ $SLANG = array(
     'DefaultRate'           => 'Tasa por defecto',
     'DefaultScale'          => 'Escala por defecto',
     'DefaultView'           => 'Vista por defecto',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'                => 'Borrar',
     'DeleteAndNext'         => 'Borrar &amp; siguiente',
     'DeleteAndPrev'         => 'Borrar &amp; anterior',
     'DeleteSavedFilter'     => 'Borrar filtro guardado',
     'Description'           => 'Descripción',
     'DetectedCameras'       => 'Cámaras detectadas',
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'                => 'Dispositivo',
     'DeviceChannel'         => 'Canal de dispositivo',
     'DeviceFormat'          => 'Formato de dispositivo',
@@ -255,6 +265,7 @@ $SLANG = array(
     'Disk'                  => 'Disco',
     'Display'               => 'Visualizar',
     'Displaying'            => 'Visualizando',
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection', // Added - 2015-04-18
     'Donate'                => 'Por favor, done',
     'DonateAlready'         => 'No, ya he donado',
     'DonateEnticement'      => 'Ha estado ejecutando ZoneMinder por un tiempo y con suerte le resultará un útil complemento para su seguridad en hogar y trabajo. Aunque ZoneMinder es, y será, libre y de código abierto, cuesta dinero desarrollarlo y mantenerlo. Si quiere ayudar a mantener un futuro desarrollo y nuevas funciones entonces considere hacer un donativo por favor. Donar es, por supuesto, opcional pero muy apreciado y puede donar tanto como desee sin importar la cantidad.<br/><br/>Si desea hacer una donación por favor seleccione la opción de debajo o vaya a http://www.zoneminder.com/donate.html en su navegador.<br/><br/>Muchas gracias por usar ZoneMinder y no se olvide de vistar los foros en ZoneMinder.com para obtener soporte o hacer sugerencias sobre cómo mejorar su experiencia con ZoneMinder aún más.',
@@ -306,10 +317,12 @@ $SLANG = array(
     'Feed'                  => 'Feed',
     'Ffmpeg'                => 'Ffmpeg',
     'File'                  => 'Archivo',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'   => 'Archivar todas las coincidencias',
     'FilterDeleteEvents'    => 'Borrar todas las coincidencias',
     'FilterEmailEvents'     => 'Enviar detalles de todas las coincidencias por email',
     'FilterExecuteEvents'   => 'Ejecutar comando para todas las coincidencias',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'   => 'Detalles de mensaje de todas las coincidencias',
     'FilterPx'              => 'Filtrar Px',
     'FilterUnset'           => 'Debe especificar un ancho y un alto para el filtro',
@@ -319,12 +332,12 @@ $SLANG = array(
     'First'                 => 'Primero',
     'FlippedHori'           => 'Girado horizontalmente',
     'FlippedVert'           => 'Girado verticalmente',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                 => 'Enfoque',
     'ForceAlarm'            => 'Forzar alama',
     'Format'                => 'Formato',
@@ -332,7 +345,6 @@ $SLANG = array(
     'FrameId'               => 'Id del marco',
     'FrameRate'             => 'Ratío del marco',
     'FrameSkip'             => 'Omisión de marcos',
-    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Frames'                => 'Marcos',
     'Func'                  => 'Func',
     'Function'              => 'Función',
@@ -459,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'          => 'Velocidad de zoom mínima',
     'MinZoomStep'           => 'Grado de zoom mínimo',
     'Misc'                  => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'               => 'Monitor',
     'MonitorIds'            => 'Ids&nbsp;monitor',
     'MonitorPreset'         => 'Programar monitor',
@@ -469,12 +482,13 @@ $SLANG = array(
     'Montage'               => 'Montaje',
     'Month'                 => 'Mes',
     'More'                  => 'Más',
+    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Move'                  => 'Mover',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-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.
     'MustBeGe'              => 'debe ser mayor o igual que',
     'MustBeLe'              => 'debe ser menor o igual que',
     'MustConfirmPassword'   => 'Debe confirmar la contraseña',
@@ -503,6 +517,9 @@ $SLANG = array(
     'NumPresets'            => 'Número programa',
     '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
+    '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'                  => 'igual a',
     'OpGt'                  => 'mayor que',
     'OpGtEq'                => 'mayor que o igual a',
@@ -540,6 +557,7 @@ $SLANG = array(
     'Play'                  => 'Reproducir',
     'PlayAll'               => 'Reproducir rodo',
     'PleaseWait'            => 'Espere por favor',
+    'Plugins'              => 'Plugins',                // Added - 2015-04-18
     'Point'                 => 'Punto',
     'PostEventImageBuffer'  => 'Cuenta de imagen post evento',
     'PreEventImageBuffer'   => 'Cuenta de imagen pre evento',
@@ -548,6 +566,9 @@ $SLANG = array(
     'Presets'               => 'Programas',
     'Prev'                  => 'Anterior',
     'Probe'                 => 'Sondear',
+    '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'              => 'Protocolo',
     'Rate'                  => 'Valorar',
     'Real'                  => 'Real',
@@ -635,6 +656,7 @@ $SLANG = array(
     'Submit'                => 'Enviar',
     'System'                => 'Sistema',
     'SystemLog'             => 'Registros del sistema',
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                  => 'Tele',
     'Thumbnail'             => 'Thumbnail',
     'Tilt'                  => 'Inclinar',
@@ -672,9 +694,13 @@ $SLANG = array(
     'UseFilter'             => 'Usar filtro',
     'UseFilterExprsPost'    => '&nbsp;filtros&nbsp;de expresión', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'     => 'Usar&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'          => 'Used Plugins',           // Added - 2015-04-18
     'User'                  => 'Usuario',
     'Username'              => 'Nombre de usuario',
     'Users'                 => 'Usuarios',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                 => 'Valor',
     'Version'               => 'Versión',
     'VersionIgnore'         => 'Ignorar esta versión',
@@ -714,6 +740,7 @@ $SLANG = array(
     'Zone'                  => 'Zona',
     'ZoneAlarmColour'       => 'Color de alarma (rojo/verde/bzul)',
     'ZoneArea'              => 'Área de zona',
+    'ZoneExtendAlarmFrames'=> 'Extend Alarm Frame Count', // Added - 2015-04-18
     'ZoneFilterSize'        => 'Filtrar anchura/altura (píxeles)',
     'ZoneMinMaxAlarmArea'   => 'Mín/Máx área de alarma',
     'ZoneMinMaxBlobArea'    => 'Mín/Máx área de goteo',
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index f328fb9e3..21274663d 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -89,6 +89,7 @@ $SLANG = array(
     'AlarmMaximumFPS'       => 'Alarmi Maksimaalne FPS',
     'AlarmPx'               => 'Alarm Px',
     'AlarmRGBUnset'         => 'Sa pead panema alarmi RGB värvi',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                 => 'Hoiatus',
     'All'                   => 'All',
     'Apply'                 => 'Apply',
@@ -133,13 +134,13 @@ $SLANG = array(
     'BadFPSReportInterval'  => 'FPS raporteerimise intervall puhvri hulk peab olema integer, null või rohkem',
     'BadFormat'             => 'Formaadiks peab olema pandud õige väärtus',
     'BadFrameSkip'          => 'Kaadri vahelejätmise hulk peab olema integer, null või rohkem',
-    'BadMotionFrameSkip'    => 'Liikumise kaadri vahelejätmise hulk peab olema integer, null või rohkem',
     'BadHeight'             => 'Kõrguseks peab olema valitud õige väärtus',
     'BadHost'               => 'Host ipeab olema õige. Ip aadress või hostinimi, ei tohi sisaldada http://',
     'BadImageBufferCount'   => 'Pildi puhvri suurus peab olema integer, 10 või rohkem',
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'    => 'Liikumise kaadri vahelejätmise hulk peab olema integer, null või rohkem',
     'BadNameChars'          => 'Names may only contain alphanumeric characters plus hyphen and underscore',
     'BadPalette'            => 'Palette must be set to a valid value',
     'BadPath'               => 'Path must be set to a valid value',
@@ -159,7 +160,9 @@ $SLANG = array(
     'BlobSizes'             => 'Blob Sizes',
     'Blobs'                 => 'Blobs',
     'Brightness'            => 'Heledus',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'               => 'Puhver',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'          => 'Can Auto Focus',
     'CanAutoGain'           => 'Can Auto Gain',
     'CanAutoIris'           => 'Can Auto Iris',
@@ -203,6 +206,7 @@ $SLANG = array(
     'CaptureHeight'         => 'Capture Height',
     'CaptureMethod'         => 'Capture Method',
     'CapturePalette'        => 'Capture Palette',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'          => 'Capture Width',
     'Cause'                 => 'Cause',
     'CheckMethod'           => 'Alarm Check Method',
@@ -233,6 +237,7 @@ $SLANG = array(
     'ControlDevice'         => 'Control Device',
     'ControlType'           => 'Control Type',
     'Controllable'          => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                 => 'Cycle',
     'CycleWatch'            => 'Cycle Watch',
     'DateTime'              => 'Kuupäev/Aeg',              // Added - 2011-06-16
@@ -241,12 +246,15 @@ $SLANG = array(
     'DefaultRate'           => 'Default Kiirus',
     'DefaultScale'          => 'Default Suurus',
     'DefaultView'           => 'Default Vaade',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'                => 'Kustuta',
     'DeleteAndNext'         => 'Kustuta &amp; Järgmine',
     'DeleteAndPrev'         => 'Kustuta &amp; Eelmine',
     'DeleteSavedFilter'     => 'Kustuta salvestatud filter',
     'Description'           => 'Kirjeldus',
     'DetectedCameras'       => 'Tuvastatud kaamerad',
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'                => 'Seade',
     'DeviceChannel'         => 'Seadme Kanal',
     'DeviceFormat'          => 'Seadme Formaat',
@@ -258,6 +266,7 @@ $SLANG = array(
     'Disk'                  => 'Ketas',
     'Display'               => 'Ekraan',                // Added - 2011-03-02
     'Displaying'            => 'Väljapanek',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection', // Added - 2015-04-18
     'Donate'                => 'Palun Anneta',
     'DonateAlready'         => 'EI, Ma olen juba annetanud',
     'DonateEnticement'      => 'Sa oled juba kasutanud ZoneMinderit juba mõnda aega. Nüüd kus sa oled leidnud, et see on kasulik lisa sinu kodule  või sinu töökohale. Kuigi ZoneMinder on, jääb alatiseks, vabaks ja avatud lähtekoodiks, siiski selle arendamiseks kulub aega ja raha. Kui sa soovid meid aidata, siis toeta meid tuleviku arendusteks ja uute lisade loomiseks. Palun mõelge annetuse peale. 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.',
@@ -309,10 +318,12 @@ $SLANG = array(
     'Feed'                  => 'Feed',
     'Ffmpeg'                => 'Ffmpeg',
     'File'                  => 'Fail',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'   => 'Archive all matches',
     'FilterDeleteEvents'    => 'Delete all matches',
     'FilterEmailEvents'     => 'Email details of all matches',
     'FilterExecuteEvents'   => 'Execute command on all matches',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'   => 'Message details of all matches',
     'FilterPx'              => 'Filter Px',
     'FilterUnset'           => 'You must specify a filter width and height',
@@ -322,12 +333,12 @@ $SLANG = array(
     'First'                 => 'Esimene',
     'FlippedHori'           => 'Flipped Horizontally',
     'FlippedVert'           => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                 => 'Fookus',
     'ForceAlarm'            => 'Force Alarm',
     'Format'                => 'Format',
@@ -335,7 +346,6 @@ $SLANG = array(
     'FrameId'               => 'Frame Id',
     'FrameRate'             => 'Kaadri Sagedus',
     'FrameSkip'             => 'Frame Skip',
-    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Frames'                => 'Kaadrid',
     'Func'                  => 'Func',
     'Function'              => 'Funktsioon',
@@ -462,6 +472,7 @@ $SLANG = array(
     'MinZoomSpeed'          => 'Min Zoom Speed',
     'MinZoomStep'           => 'Min Zoom Step',
     'Misc'                  => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'               => 'Monitor',
     'MonitorIds'            => 'Monitor&nbsp;Ids',
     'MonitorPreset'         => 'Monitor Preset',
@@ -472,12 +483,13 @@ $SLANG = array(
     'Montage'               => 'Montage',
     'Month'                 => 'Kuus',
     'More'                  => 'Veel',                   // Added - 2011-06-16
+    'MotionFrameSkip'       => 'Motion Frame Skip',
     'Move'                  => 'Liiguta',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-pildi ruudustik',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-pildi ruudustik',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-pildi ruudustik',              // Added 2013.08.15.
     'Mtg3widgrx'            => '3-pildi ruudustik, skaleeritud, suurenda kui on alarm',              // Added 2013.08.15.
+    'Mtg4widgrd'            => '4-pildi ruudustik',              // Added 2013.08.15.
+    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'MustBeGe'              => 'peab olema suurem kui või võrdne ',
     'MustBeLe'              => 'peab olema väiksem kui või võrdne',
     'MustConfirmPassword'   => 'Sa pead kinnitama parooli',
@@ -506,6 +518,9 @@ $SLANG = array(
     'NumPresets'            => 'Num Presets',
     'Off'                   => 'Väljas',
     'On'                    => 'Sees',
+    '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'                  => 'Võrdne',
     'OpGt'                  => 'Suurem kui',
     'OpGtEq'                => 'suurem kui või võrdne',
@@ -552,6 +567,9 @@ $SLANG = array(
     'Presets'               => 'Eelseaded',
     'Prev'                  => 'Prev',
     'Probe'                 => 'Probe',
+    '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',
     'Rate'                  => 'Rate',
     'Real'                  => 'Reaaalne',
@@ -639,6 +657,7 @@ $SLANG = array(
     'Submit'                => 'Submit',
     'System'                => 'Süsteem',
     'SystemLog'             => 'Süsteemi Logi',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                  => 'Tele',
     'Thumbnail'             => 'Thumbnail',
     'Tilt'                  => 'Tilt',
@@ -676,9 +695,13 @@ $SLANG = array(
     'UseFilter'             => 'Kasuta Filtrit',
     'UseFilterExprsPost'    => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'     => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'          => 'Used Plugins',           // Added - 2015-04-18
     'User'                  => 'Kasutaja',
     'Username'              => 'Kasutajanimi',
     'Users'                 => 'Kasutajad',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                 => 'Väärtus',
     'Version'               => 'Versioon',
     'VersionIgnore'         => 'Ignoreeri See Versioon',
@@ -718,6 +741,7 @@ $SLANG = array(
     'Zone'                  => 'Tsoon',
     'ZoneAlarmColour'       => 'Alarmi Värv (Red"Punane"/Green"Roheline"/Blue"Sinine")',
     'ZoneArea'              => 'Tsooni Ala',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'        => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'   => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'    => 'Min/Max Blob Area',
@@ -726,7 +750,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres'  => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'         => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'    => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                 => 'Tsoone',
     'Zoom'                  => 'Suurenda',
     'ZoomIn'                => 'Suurenda lähemale',
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index 3ee74aa23..afab7db14 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -69,544 +69,567 @@
 // setlocale( LC_CTYPE, 'en_GB' ); Character class settings 4.3.0 and after
 // setlocale( LC_TIME, 'en_GB' ); Date and time formatting 4.3.0 and after
 
+// Set date and time format (example: sam. 18 avril, 19h02)
+setlocale(LC_ALL, "fr_FR.UTF-8");
+define("DATE_FMT_CONSOLE_LONG", "%a %d %b, %Hh%M");
+define( "STRF_FMT_DATETIME_SHORT", "%d/%m/%y %H:%M:%S" );
+define( "STRF_FMT_DATETIME_SHORTER", "%d/%m %H:%M:%S" );
+
 // Simple String Replacements
 $SLANG = array(
-    '24BitColour'          => 'Couleur 24 bit',
-    '32BitColour'          => 'Couleur 32 bit',          // Added - 2011-06-15
-    '8BitGrey'             => 'Gris 8 bit',
+    '24BitColour'          => 'Couleur 24 bits',
+    '32BitColour'          => 'Couleur 32 bits',          // Added - 2011-06-15
+    '8BitGrey'             => 'Gris 8 bits',
     'Action'               => 'Action',
-    'Actual'               => 'RÈel',
-    'AddNewControl'        => 'Ajouter controle',
-    'AddNewMonitor'        => 'Ajouter camÈra',
+    'Actual'               => 'Réel',
+    'AddNewControl'        => 'Ajouter contrôle',
+    'AddNewMonitor'        => 'Ajouter caméra',
     'AddNewUser'           => 'Ajouter utilisateur',
     'AddNewZone'           => 'Ajouter zone',
     'Alarm'                => 'Alarme',
     'AlarmBrFrames'        => 'Images<br/>alarme',
     'AlarmFrame'           => 'Image alarme',
-    'AlarmFrameCount'      => 'Nombre dimage alarme',
+    'AlarmFrameCount'      => 'Nb d\'image(s) en alarme',
     'AlarmLimits'          => 'Limites alarme',
     'AlarmMaximumFPS'      => 'i/s maximum pendant alarme',
-    'AlarmPx'              => 'Px Alarme',
-    'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmPx'              => 'Px alarme',
+    'AlarmRGBUnset'        => 'Vous devez définir une couleur RVB pour l\'alarme',
+    'AlarmRefImageBlendPct'=> '% fusion image référence en alarme', // Added - 2015-04-18
     'Alert'                => 'Alerte',
     'All'                  => 'Tous',
     'Apply'                => 'Appliquer',
-    'ApplyingStateChange'  => 'Appl. chgt Ètat',
-    'ArchArchived'         => 'ArchivÈ seul.',
+    'ApplyingStateChange'  => 'Appl. chgt état',
+    'ArchArchived'         => 'Archivé seul.',
     'ArchUnarchived'       => 'Non-arch. seul.',
     'Archive'              => 'Archiver',
-    'Archived'             => 'ArchivÈs',
-    'Area'                 => 'Area',
-    'AreaUnits'            => 'Area (px/%)',
+    'Archived'             => 'Archivés',
+    'Area'                 => 'Surface',
+    'AreaUnits'            => 'Surface (px/%)',
     'AttrAlarmFrames'      => 'Images alarme',
     'AttrArchiveStatus'    => 'Etat Archive',
     'AttrAvgScore'         => 'Score moy.',
     'AttrCause'            => 'Cause',
     'AttrDate'             => 'Date',
     'AttrDateTime'         => 'Date/Heure',
-    'AttrDiskBlocks'       => 'Disk Blocks',
-    'AttrDiskPercent'      => 'Disk Percent',
-    'AttrDuration'         => 'DurÈe',
+    'AttrDiskBlocks'       => 'Blocs disque',
+    'AttrDiskPercent'      => '% disque',
+    'AttrDuration'         => 'Durée',
     'AttrFrames'           => 'Images',
     'AttrId'               => 'Id',
     'AttrMaxScore'         => 'Score max.',
-    'AttrMonitorId'        => 'N∞ camÈra',
-    'AttrMonitorName'      => 'Nom camÈra',
+    'AttrMonitorId'        => 'N°',
+    'AttrMonitorName'      => 'Nom caméra',
     'AttrName'             => 'Nom',
     'AttrNotes'            => 'Notes',
-    'AttrSystemLoad'       => 'Charge SystËme',
+    'AttrSystemLoad'       => 'Charge système',
     'AttrTime'             => 'Heure',
     'AttrTotalScore'       => 'Score total',
     'AttrWeekday'          => 'Semaine',
     'Auto'                 => 'Auto',
-    'AutoStopTimeout'      => 'Auto Stop Timeout',
-    'Available'            => 'Disponible',              // Added - 2009-03-31
+    'AutoStopTimeout'      => 'Temporisation arrêt',
+    'Available'            => 'Disponibles',              // Added - 2009-03-31
     'AvgBrScore'           => 'Score<br/>moy.',
-    'Background'           => 'ArriËre-plan',
-    'BackgroundFilter'     => 'Lancer les filtres en arriËre-plan',
-    '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',
-    'BadChannel'           => 'Channel must be set to an integer of zero or more',
-    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2011-06-15
-    'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
-    'BadFormat'            => 'Format must be set to an integer of zero or more',
-    'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadHeight'            => 'Height must be set to a valid value',
-    'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
-    'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
-    'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
-    'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
-    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, trait d\'union ou soulignÈ',
-    'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
-    'BadPath'              => 'Path must be set to a valid value',
-    'BadPort'              => 'Port must be set to a valid number',
-    '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',
-    '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',
-    'BadWarmupCount'       => 'Warmup frames must be an integer of zero or more',
-    'BadWebColour'         => 'Web colour must be a valid web colour string',
-    'BadWidth'             => 'Width must be set to a valid value',
-    'Bandwidth'            => 'dÈbit',
-    'BandwidthHead'        => 'dÈbit',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
-    'BlobPx'               => 'Px forme',
-    'BlobSizes'            => 'Taille forme',
+    'Background'           => 'Arrière-plan',
+    'BackgroundFilter'     => 'Lancer les filtres en arrière-plan',
+    'BadAlarmFrameCount'   => 'Le nombre d\'images en alarme doit être un entier supérieur ou égal à 1',
+    'BadAlarmMaxFPS'       => 'Le nombre maximum d\'i/s en alarme doit être un entier ou un nombre à virgule flottante supérieur à 0',
+    'BadChannel'           => 'Le canal doit être un nombre entier supérieur ou égal à 0',
+    'BadColours'           => 'La valeur de la couleur cible est invalide', // Added - 2011-06-15
+    'BadDevice'            => 'Le chemin de l\'équipement être défini',
+    'BadFPSReportInterval' => 'L\'intervalle de rafraîchissement  de l\'information i/s doit être un entier supérieur ou égal à 0',
+    'BadFormat'            => 'Le format doit être un nombre entier supérieur ou égal à 0',
+    'BadFrameSkip'         => 'Le nombre d\'images à sauter doit être un entier supérieur ou égal à 0',
+    'BadHeight'            => 'La valeur de la hauteur est invalide',
+    'BadHost'              => 'Le nom d\'hôte doit être une adresse ip ou un nom dns valide sans le préfixe http://',
+    'BadImageBufferCount'  => 'La taille du tampon d \'images doit être un entier supérieur ou égal à 10',
+    'BadLabelX'            => 'La coordonnée X pour l\'horodatage doit être un entier supérieur ou égal à 0',
+    'BadLabelY'            => 'La coordonnée Y pour l\'horodatage doit être un entier supérieur ou égal à 0',
+    'BadMaxFPS'            => 'Le nombre maximum d\'i/s doit être un entier ou un nombre à virgule flottante supérieur à 0',
+    'BadMotionFrameSkip'   => 'Le nombre d\'images à sauter en cas de détection doit être un entier supérieur ou égal à 0',
+    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, trait d\'union ou souligné',
+    'BadPalette'           => 'La palette doit être définie', // Added - 2009-03-31
+    'BadPath'              => 'Le chemin doit être défini',
+    'BadPort'              => 'Le port doit être un nombre entier supérieur ou égal à 0',
+    'BadPostEventCount'    => 'Le nombre d\'images post-événements doit être un entier supérieur ou égal à 0',
+    'BadPreEventCount'     => 'Le nombre d\'images pré-événements doit être un entier supérieur ou égal à 0 et doit rester inférieur à la taille du tampon d\'images',
+    'BadRefBlendPerc'      => 'Le pourcentage de fusion de l\'image de référence doit être un entier supérieur à 0 et inférieur à 100',
+    'BadSectionLength'     => 'La longueur de la section doit être un entier supérieur ou égal à 30',
+    'BadSignalCheckColour' => 'La chaîne de caractères pour la couleur d\'état du signal est invalide',
+    'BadStreamReplayBuffer'=> 'Le tampon d\'images pour la relecture doit être un entier supérieur ou égal à 0',
+    'BadWarmupCount'       => 'Le nombre d\'images tests doit être un entier supérieur ou égal à 0',
+    'BadWebColour'         => 'La chaîne de caractères pour la couleur web est invalide',
+    'BadWidth'             => 'La valeur de la largeur est invalide',
+    'Bandwidth'            => 'Débit',
+    'BandwidthHead'        => 'Débit',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
+    'BlobPx'               => 'Pix. forme',
+    'BlobSizes'            => 'Tailles de forme',
     'Blobs'                => 'Formes',
-    'Brightness'           => 'LuminositÈ;',
+    'Brightness'           => 'Luminosité;',
+    'Buffer'               => 'Tampon',                 // Added - 2015-04-18
     'Buffers'              => 'Tampons',
-    'CanAutoFocus'         => 'Can Auto Focus',
-    'CanAutoGain'          => 'Can Auto Gain',
-    'CanAutoIris'          => 'Can Auto Iris',
-    'CanAutoWhite'         => 'Can Auto White Bal.',
-    'CanAutoZoom'          => 'Can Auto Zoom',
-    'CanFocus'             => 'Can Focus',
-    'CanFocusAbs'          => 'Can Focus Absolute',
-    'CanFocusCon'          => 'Can Focus Continuous',
-    'CanFocusRel'          => 'Can Focus Relative',
-    'CanGain'              => 'Can Gain ',
-    'CanGainAbs'           => 'Can Gain Absolute',
-    'CanGainCon'           => 'Can Gain Continuous',
-    'CanGainRel'           => 'Can Gain Relative',
-    'CanIris'              => 'Can Iris',
-    'CanIrisAbs'           => 'Can Iris Absolute',
-    'CanIrisCon'           => 'Can Iris Continuous',
-    'CanIrisRel'           => 'Can Iris Relative',
-    'CanMove'              => 'Can Move',
-    'CanMoveAbs'           => 'Can Move Absolute',
-    'CanMoveCon'           => 'Can Move Continuous',
-    'CanMoveDiag'          => 'Can Move Diagonally',
-    'CanMoveMap'           => 'Can Move Mapped',
-    'CanMoveRel'           => 'Can Move Relative',
-    'CanPan'               => 'Can Pan' ,
-    'CanReset'             => 'Can Reset',
-    'CanSetPresets'        => 'Can Set Presets',
-    'CanSleep'             => 'Can Sleep',
-    'CanTilt'              => 'Can Tilt',
-    'CanWake'              => 'Can Wake',
-    'CanWhite'             => 'Can White Balance',
-    'CanWhiteAbs'          => 'Can White Bal. Absolute',
-    'CanWhiteBal'          => 'Can White Bal.',
-    'CanWhiteCon'          => 'Can White Bal. Continuous',
-    'CanWhiteRel'          => 'Can White Bal. Relative',
-    'CanZoom'              => 'Can Zoom',
-    'CanZoomAbs'           => 'Can Zoom Absolute',
-    'CanZoomCon'           => 'Can Zoom Continuous',
-    'CanZoomRel'           => 'Can Zoom Relative',
+    'CSSDescription'       => 'Remplacer la feuille de style CSS par défaut', // Added - 2015-04-18
+    'CanAutoFocus'         => 'Automatique',
+    'CanAutoGain'          => 'Automatique',
+    'CanAutoIris'          => 'Automatique',
+    'CanAutoWhite'         => 'Automatique',
+    'CanAutoZoom'          => 'Automatique',
+    'CanFocus'             => 'Focus',
+    'CanFocusAbs'          => 'Absolu',
+    'CanFocusCon'          => 'Continu',
+    'CanFocusRel'          => 'Relatif',
+    'CanGain'              => 'Gain',
+    'CanGainAbs'           => 'Absolu',
+    'CanGainCon'           => 'Continu',
+    'CanGainRel'           => 'Relatif',
+    'CanIris'              => 'Iris',
+    'CanIrisAbs'           => 'Absolu',
+    'CanIrisCon'           => 'Continu',
+    'CanIrisRel'           => 'Relatif',
+    'CanMove'              => 'Déplacer',
+    'CanMoveAbs'           => 'Absolu',
+    'CanMoveCon'           => 'Continu',
+    'CanMoveDiag'          => 'Diagonale',
+    'CanMoveMap'           => 'Sur plan',
+    'CanMoveRel'           => 'Relatif',
+    'CanPan'               => 'Panoramique' ,
+    'CanReset'             => 'RàZ',
+    'CanSetPresets'        => 'Stockage prépos.',
+    'CanSleep'             => 'Veille',
+    'CanTilt'              => 'Inclinaison',
+    'CanWake'              => 'Réveil',
+    'CanWhite'             => 'Bal. des blancs',
+    'CanWhiteAbs'          => 'Absolu',
+    'CanWhiteBal'          => 'Bal. des blancs',
+    'CanWhiteCon'          => 'Continu',
+    'CanWhiteRel'          => 'Relatif',
+    'CanZoom'              => 'Zoom',
+    'CanZoomAbs'           => 'Absolu',
+    'CanZoomCon'           => 'Continu',
+    'CanZoomRel'           => 'Relatif',
     'Cancel'               => 'Annuler',
-    'CancelForcedAlarm'    => 'Annuler Alarme ForcÈe',
+    'CancelForcedAlarm'    => 'Annuler alarme forcée',
     'CaptureHeight'        => 'Hauteur',
-    'CaptureMethod'        => 'MÈthode',         // Added - 2009-02-08
+    'CaptureMethod'        => 'Méthode',         // Added - 2009-02-08
     'CapturePalette'       => 'Palette',
+    'CaptureResolution'    => 'Résolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Largeur',
     'Cause'                => 'Cause',
-    'CheckMethod'          => 'MÈthode vÈrif. alarme',
-    'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
+    'CheckMethod'          => 'Méthode vérif. alarme',
+    'ChooseDetectedCamera' => 'Choisir', // Added - 2009-03-31
     'ChooseFilter'         => 'Choisir filtre',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
-    'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
-    'ChoosePreset'         => 'Choisir PrÈrÈglages',
+    'ChooseLogFormat'      => 'Choisir un format de journal',    // Added - 2011-06-17
+    'ChooseLogSelection'   => 'Choisir une sélection de journaux', // Added - 2011-06-17
+    'ChoosePreset'         => 'Choisir préréglage',
     'Clear'                => 'Effacer',                  // Added - 2011-06-16
     'Close'                => 'Fermer',
     'Colour'               => 'Couleur',
     'Command'              => 'Commande',
-    'Component'            => 'Component',              // Added - 2011-06-16
+    'Component'            => 'Composant',              // Added - 2011-06-16
     'Config'               => 'Config',
-    'ConfiguredFor'        => 'ConfigurÈ pour',
-    'ConfirmDeleteEvents'  => 'Are you sure you wish to delete the selected events?',
-    'ConfirmPassword'      => 'Confirmer mot de passe',
+    'ConfiguredFor'        => 'Configuré pour',
+    'ConfirmDeleteEvents'  => 'Etes-vous sûr de vouloir effacer le(s) événement(s) sélectionné(s)?',
+    'ConfirmPassword'      => 'Répéter mot de passe',
     'ConjAnd'              => 'et',
     'ConjOr'               => 'ou',
     'Console'              => 'Console',
     'ContactAdmin'         => 'Contactez votre administrateur SVP',
     'Continue'             => 'Continuer',
     'Contrast'             => 'Contraste',
-    'Control'              => 'Control',
-    'ControlAddress'       => 'Control Address',
-    'ControlCap'           => 'Control Capability',
-    'ControlCaps'          => 'Control Capabilities',
-    'ControlDevice'        => 'Control Device',
-    'ControlType'          => 'Control Type',
-    'Controllable'         => 'Controllable',
+    'Control'              => 'Contrôle',
+    'ControlAddress'       => 'Adresse',
+    'ControlCap'           => 'Capacité de contrôle',
+    'ControlCaps'          => 'Capacités de contrôle',
+    'ControlDevice'        => 'Equipement',
+    'ControlType'          => 'Type',
+    'Controllable'         => 'Controlâble',
+    'Current'              => 'En cours',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
-    'CycleWatch'           => 'Cycle vision',
-    'DateTime'             => 'Date/Time',              // Added - 2011-06-16
-    'Day'                  => 'Aujourd&#39;hui',
+    'CycleWatch'           => 'Vision de cycle',
+    'DateTime'             => 'Date/Heure',              // Added - 2011-06-16
+    'Day'                  => 'Aujourd\'hui',
     'Debug'                => 'Debug',
-    'DefaultRate'          => 'Vitesse par dÈfaut',
-    'DefaultScale'         => 'Echelle par dÈfaut',
-    'DefaultView'          => 'Vue par dÈfaut',
+    'DefaultRate'          => 'Vitesse par défaut',
+    'DefaultScale'         => 'Echelle par défaut',
+    'DefaultView'          => 'Vue par défaut',
+    'Deinterlacing'        => 'Désentrelacement',          // Added - 2015-04-18
+    'Delay'                => 'Délai',                  // Added - 2015-04-18
     'Delete'               => 'Effacer',
     'DeleteAndNext'        => 'Eff. &amp; suiv.',
     'DeleteAndPrev'        => 'Eff. &amp; prec.',
-    'DeleteSavedFilter'    => 'Eff. filtre sauvÈ',
+    'DeleteSavedFilter'    => 'Eff. filtre sauvé',
     'Description'          => 'Description',
-    'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
-    'Device'               => 'CamÈra',                 // Added - 2009-02-08
-    'DeviceChannel'        => 'Canal camÈra',
-    'DeviceFormat'         => 'Format camÈra',
-    'DeviceNumber'         => 'NumÈro camÈra',
-    'DevicePath'           => 'Chemin',
-    'Devices'              => 'CamÈras',
+    'DetectedCameras'      => 'Caméra(s) détectée(s)',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Profil(s) détecté(s)',      // Added - 2015-04-18
+    'Device'               => 'Equipement',                 // Added - 2009-02-08
+    'DeviceChannel'        => 'Canal',
+    'DeviceFormat'         => 'Format vidéo',
+    'DeviceNumber'         => 'Numéro caméra',
+    'DevicePath'           => 'Chemin de l\'équipement',
+    'Devices'              => 'Caméras',
     'Dimensions'           => 'Dimensions',
-    'DisableAlarms'        => 'DÈsactiver les alarmes',
+    'DisableAlarms'        => 'Désactiver les alarmes',
     'Disk'                 => 'Stockage',
     'Display'              => 'Affichage',                // Added - 2011-01-30
-    'Displaying'           => 'Displaying',             // Added - 2011-06-16
-    'Donate'               => 'Please Donate',
-    '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 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'      => 'Not yet, remind again in 1 day',
-    'DonateRemindHour'     => 'Not yet, remind again in 1 hour',
-    'DonateRemindMonth'    => 'Not yet, remind again in 1 month',
-    'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
-    'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
-    'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
-    'Download'             => 'TÈlÈcharger',
-    'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
-    'Duration'             => 'DurÈe',
+    'Displaying'           => 'Affichés',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Réaliser détection native',
+    'Donate'               => 'Veuillez faire un don',
+    'DonateAlready'        => 'Non, j\'ai déjà donné',
+    'DonateEnticement'     => 'Vous utilisez ZoneMinder depuis quelque temps et nous espérons que vous trouvez cette solution utile. Bien que ZoneMinder est, et restera, une solution libre et ouverte (open source), son développement et son maintien nécessitent des moyens financiers. Si vous voulez aider au développement et à l\'ajout de fonctionnalités, veuillez considérer la possibilité d\'effectuer un don. Les dons sont bien sûr optionnels mais grandement appréciés et vous pouvez donner le montant que vous désirez.<br><br>Si vous voulez effectuer un don, veuillez sélectionner l\'option ci-dessous ou veuillez vous rendre sur http://www.zoneminder.com/donate.html à l\'aide de votre navigateur internet.<br><br>Merci d\'utiliser ZoneMinder et n\'oubliez pas de visiter les forums sur ZoneMinder.com pour le support ou des suggestions pour rendre votre expérience de ZoneMinder encore meilleure.',
+    'DonateRemindDay'      => 'Pas encore, me rappeler dans 1 jour',
+    'DonateRemindHour'     => 'Pas encore, me rappeler dans 1 heure',
+    'DonateRemindMonth'    => 'Pas encore, me rappeler dans 1 mois',
+    'DonateRemindNever'    => 'Non, je ne veux pas faire de don, ne me rappeler pas',
+    'DonateRemindWeek'     => 'Pas encore, me rappeler dans 1 semaine',
+    'DonateYes'            => 'Oui, je souhaiterais faire un don maintenant',
+    'Download'             => 'Télécharger',
+    'DuplicateMonitorName' => 'Dupliquer le nom de la caméra', // Added - 2009-03-31
+    'Duration'             => 'Durée',
     'Edit'                 => 'Editer',
     'Email'                => 'Email',
     'EnableAlarms'         => 'Activer les alarmes',
-    'Enabled'              => 'ActivÈ',
+    'Enabled'              => 'Activé',
     'EnterNewFilterName'   => 'Entrer nom nouv. filtre',
     'Error'                => 'Erreur',
-    'ErrorBrackets'        => 'Erreur, vÈrifiez que toutes les parenthËses ouvertes sont fermÈes',
-    'ErrorValidValue'      => 'Erreur, vÈrifiez que tous les termes ont une valeur valide',
+    'ErrorBrackets'        => 'Erreur, vérifiez que toutes les parenthèses ouvertes sont fermées',
+    'ErrorValidValue'      => 'Erreur, vérifiez que tous les termes ont une valeur valide',
     'Etc'                  => 'etc',
-    'Event'                => 'ÈvÈnement',
-    'EventFilter'          => 'Filtre ÈvÈnement',
+    'Event'                => 'Evénement',
+    'EventFilter'          => 'Filtre événement',
     'EventId'              => 'Id',
     'EventName'            => 'Nom',
-    'EventPrefix'          => 'Prefix',
-    'Events'               => 'ÈvÈnements',
+    'EventPrefix'          => 'Préfixe',
+    'Events'               => 'Evénements',
     'Exclude'              => 'Exclure',
-    'Execute'              => 'Executer',
+    'Execute'              => 'Exécuter',
     'Export'               => 'Exporter',
-    'ExportDetails'        => 'Exporter dÈtails ÈvÈnement',
-    'ExportFailed'         => 'Exportation ÈchouÈe',
+    'ExportDetails'        => 'Exporter détails événements',
+    'ExportFailed'         => 'Exportation échouée',
     'ExportFormat'         => 'Format',
     'ExportFormatTar'      => 'Tar',
     'ExportFormatZip'      => 'Zip',
-    'ExportFrames'         => 'Exporter dÈtails image',
-    'ExportImageFiles'     => 'Exporter fichiers image',
-    'ExportLog'            => 'Exporter Log',             // Added - 2011-06-17
+    'ExportFrames'         => 'Exporter détails image',
+    'ExportImageFiles'     => 'Exporter fichiers images',
+    'ExportLog'            => 'Exporter fichiers journaux',             // Added - 2011-06-17
     'ExportMiscFiles'      => 'Exporter autres fichiers',
-    'ExportOptions'        => 'Options d&#39;exportation',
-    'ExportSucceeded'      => 'Exportation rÈussie',       // Added - 2009-02-08
-    'ExportVideoFiles'     => 'Exporter fichiers video',
+    'ExportOptions'        => 'Options d\'exportation',
+    'ExportSucceeded'      => 'Exportation réussie',       // Added - 2009-02-08
+    'ExportVideoFiles'     => 'Exporter fichiers vidéo',
     'Exporting'            => 'Exportation',
     'FPS'                  => 'i/s',
-    'FPSReportInterval'    => 'FPS Report Interval',
+    'FPSReportInterval'    => 'Interv. de rafraîch. i/s',
     'FTP'                  => 'FTP',
     'Far'                  => 'Loin',
     'FastForward'          => 'Avance rapide',
     'Feed'                 => 'Flux',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'Fichier',
+    'Filter'               => 'Filtre',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archiver',
     'FilterDeleteEvents'   => 'Effacer',
-    'FilterEmailEvents'    => 'Envoyer les dÈtails par mail',
-    'FilterExecuteEvents'  => 'Executer une commande',
-    'FilterMessageEvents'  => 'Envoyer les dÈtails par message',
-    'FilterPx'             => 'Filter Px',
-    'FilterUnset'          => 'You must specify a filter width and height',
-    'FilterUploadEvents'   => 'TransfÈrer',
-    'FilterVideoEvents'    => 'CrÈer video',
+    'FilterEmailEvents'    => 'Envoyer les détails par email',
+    'FilterExecuteEvents'  => 'Exécuter une commande',
+    'FilterLog'            => 'Filtre',             // Added - 2015-04-18
+    'FilterMessageEvents'  => 'Envoyer les détails par message',
+    'FilterPx'             => 'Filtre Px',
+    'FilterUnset'          => 'Vous devez spécifier une largeur et une hauteur de filtre',
+    'FilterUploadEvents'   => 'Transférer',
+    'FilterVideoEvents'    => 'Créer vidéo',
     'Filters'              => 'Filtres',
     'First'                => 'Prem.',
-    'FlippedHori'          => 'Flipped Horizontally',
-    'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
+    'FlippedHori'          => 'Inversé horizontalement',
+    'FlippedVert'          => 'Inversé verticalement',
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'Aucun',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
-    'ForceAlarm'           => 'Force Alarme',
+    'ForceAlarm'           => 'Forcer alarme',
     'Format'               => 'Format',
     'Frame'                => 'Image',
-    'FrameId'              => 'N∞ image',
-    'FrameRate'            => 'Cadence Image',
+    'FrameId'              => 'N°',
+    'FrameRate'            => 'Cadence image',
     'FrameSkip'            => 'Saut image',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
-    'Frames'               => 'images',
+    'Frames'               => 'Images',
     'Func'                 => 'Fct',
     'Function'             => 'Mode',
     'Gain'                 => 'Gain',
-    'General'              => 'GÈnÈral',
-    'GenerateVideo'        => 'GÈnÈrer VidÈo',
-    'GeneratingVideo'      => 'GÈnÈration VidÈo',
+    'General'              => 'Général',
+    'GenerateVideo'        => 'Générer vidéo',
+    'GeneratingVideo'      => 'Génération vidéo',
     'GoToZoneMinder'       => 'Aller sur ZoneMinder.com',
     'Grey'                 => 'Gris',
     'Group'                => 'Groupe',
     'Groups'               => 'Groupes',
-    'HasFocusSpeed'        => 'Has Focus Speed',
-    'HasGainSpeed'         => 'Has Gain Speed',
-    'HasHomePreset'        => 'Has Home Preset',
-    'HasIrisSpeed'         => 'Has Iris Speed',
-    'HasPanSpeed'          => 'Has Pan Speed',
-    'HasPresets'           => 'Has Presets',
-    'HasTiltSpeed'         => 'Has Tilt Speed',
-    'HasTurboPan'          => 'Has Turbo Pan',
-    'HasTurboTilt'         => 'Has Turbo Tilt',
-    'HasWhiteSpeed'        => 'Has White Bal. Speed',
-    'HasZoomSpeed'         => 'Has Zoom Speed',
+    'HasFocusSpeed'        => 'Vitesse',
+    'HasGainSpeed'         => 'Vitesse gain',
+    'HasHomePreset'        => 'Position par défaut',
+    'HasIrisSpeed'         => 'Vitesse',
+    'HasPanSpeed'          => 'Vitesse',
+    'HasPresets'           => 'Prépositions',
+    'HasTiltSpeed'         => 'Vitesse',
+    'HasTurboPan'          => 'Turbo',
+    'HasTurboTilt'         => 'Incl. turbo',
+    'HasWhiteSpeed'        => 'Vitesse',
+    'HasZoomSpeed'         => 'Vitesse',
     'High'                 => 'Haut',
-    'HighBW'               => 'Haut&nbsp;N/B',
-    'Home'                 => 'Home',
+    'HighBW'               => 'Haut débit',
+    'Home'                 => 'Maison',
     'Hour'                 => 'Heure',
     'Hue'                  => 'Teinte',
-    'Id'                   => 'N∞',
+    'Id'                   => 'N°',
     'Idle'                 => 'Vide',
     'Ignore'               => 'Ignorer',
     'Image'                => 'Image',
     'ImageBufferSize'      => 'Taille tampon image',
     'Images'               => 'Images',
-    'In'                   => 'In',
+    'In'                   => 'Dans',
     'Include'              => 'Inclure',
-    'Inverted'             => 'InversÈ',
+    'Inverted'             => 'Inversé',
     'Iris'                 => 'Iris',
-    'KeyString'            => 'Key String',
-    'Label'                => 'Label',
+    'KeyString'            => 'Chaîne clé',
+    'Label'                => 'Etiquette',
     'Language'             => 'Langue',
     'Last'                 => 'Dernier',
     'Layout'               => 'Disposition',                 // Added - 2009-02-08
     'Level'                => 'Niveau',                  // Added - 2011-06-16
     'Libvlc'               => 'Libvlc',
-    'LimitResultsPost'     => 'rÈsultats seulement;', // This is used at the end of the phrase 'Limit to first N results only'
-    'LimitResultsPre'      => 'Limite au premier', // This is used at the beginning of the phrase 'Limit to first N results only'
+    'LimitResultsPost'     => 'résultat(s) seulement', // This is used at the end of the phrase 'Limit to first N results only'
+    'LimitResultsPre'      => 'Limiter au(x) premier(s)', // This is used at the beginning of the phrase 'Limit to first N results only'
     'Line'                 => 'Ligne',                   // Added - 2011-06-16
-    'LinkedMonitors'       => 'CamÈra(s) liÈ(s)',
+    'LinkedMonitors'       => 'Caméra(s) liée(s)',
     'List'                 => 'Liste',
-    'Load'                 => 'CPU',
+    'Load'                 => 'Charge',
     'Local'                => 'Local',
-    'Log'                  => 'Log',                    // Added - 2011-06-16
-    'LoggedInAs'           => 'ConnectÈ cÙ',
-    'Logging'              => 'Logging',                // Added - 2011-06-16
+    'Log'                  => 'Journal',                    // Added - 2011-06-16
+    'LoggedInAs'           => 'Connecté en tant que',
+    'Logging'              => 'Journalisation',                // Added - 2011-06-16
     'LoggingIn'            => 'Connexion',
-    'Login'                => 'Login',
-    'Logout'               => 'DÈconnexion',
-    'Logs'                 => 'Logs',                   // Added - 2011-06-17
+    'Login'                => 'Connexion',
+    'Logout'               => 'Déconnexion',
+    'Logs'                 => 'Journaux',                   // Added - 2011-06-17
     'Low'                  => 'Bas',
-    'LowBW'                => 'Basse&nbsp;N/B',
+    'LowBW'                => 'Bas débit',
     'Main'                 => 'Principal',
     'Man'                  => 'Man',
     'Manual'               => 'Manuel',
-    'Mark'                 => 'SÈlÈctionner',
+    'Mark'                 => 'Sélectionner',
     'Max'                  => 'Max',
-    'MaxBandwidth'         => 'Max Bandwidth',
+    'MaxBandwidth'         => 'Débit max',
     'MaxBrScore'           => 'Score<br/>max',
-    'MaxFocusRange'        => 'Max Focus Range',
-    'MaxFocusSpeed'        => 'Max Focus Speed',
-    'MaxFocusStep'         => 'Max Focus Step',
-    'MaxGainRange'         => 'Max Gain Range',
-    'MaxGainSpeed'         => 'Max Gain Speed',
-    'MaxGainStep'          => 'Max Gain Step',
-    'MaxIrisRange'         => 'Max Iris Range',
-    'MaxIrisSpeed'         => 'Max Iris Speed',
-    'MaxIrisStep'          => 'Max Iris Step',
-    'MaxPanRange'          => 'Max Pan Range',
-    'MaxPanSpeed'          => 'Max Pan Speed',
-    'MaxPanStep'           => 'Max Pan Step',
-    'MaxTiltRange'         => 'Max Tilt Range',
-    'MaxTiltSpeed'         => 'Max Tilt Speed',
-    'MaxTiltStep'          => 'Max Tilt Step',
-    'MaxWhiteRange'        => 'Max White Bal. Range',
-    'MaxWhiteSpeed'        => 'Max White Bal. Speed',
-    'MaxWhiteStep'         => 'Max White Bal. Step',
-    'MaxZoomRange'         => 'Max Zoom Range',
-    'MaxZoomSpeed'         => 'Max Zoom Speed',
-    'MaxZoomStep'          => 'Max Zoom Step',
+    'MaxFocusRange'        => 'Plage max',
+    'MaxFocusSpeed'        => 'Vitesse max',
+    'MaxFocusStep'         => 'Pas max',
+    'MaxGainRange'         => 'Plage gain max',
+    'MaxGainSpeed'         => 'Vitesse gain max',
+    'MaxGainStep'          => 'Pas gain max',
+    'MaxIrisRange'         => 'Plage max',
+    'MaxIrisSpeed'         => 'Vitesse max',
+    'MaxIrisStep'          => 'Pas max',
+    'MaxPanRange'          => 'Plage max',
+    'MaxPanSpeed'          => 'Vitesse max',
+    'MaxPanStep'           => 'Pas max',
+    'MaxTiltRange'         => 'Plage max',
+    'MaxTiltSpeed'         => 'Vitesse max',
+    'MaxTiltStep'          => 'Pas max',
+    'MaxWhiteRange'        => 'Plage max',
+    'MaxWhiteSpeed'        => 'Vitesse max',
+    'MaxWhiteStep'         => 'Pas max',
+    'MaxZoomRange'         => 'Plage max',
+    'MaxZoomSpeed'         => 'Vitesse max',
+    'MaxZoomStep'          => 'Pas max',
     'MaximumFPS'           => 'i/s maximum',
     'Medium'               => 'Moyen',
-    'MediumBW'             => 'Moy.&nbsp;N/B',
+    'MediumBW'             => 'Moy. débit',
     'Message'              => 'Message',                // Added - 2011-06-16
-    'MinAlarmAreaLtMax'    => 'Minimum alarm area should be less than maximum',
-    'MinAlarmAreaUnset'    => 'You must specify the minimum alarm pixel count',
-    'MinBlobAreaLtMax'     => 'Aire blob min. doit Í < aire blob maximum',
-    'MinBlobAreaUnset'     => 'You must specify the minimum blob pixel count',
-    'MinBlobLtMinFilter'   => 'Minimum blob area should be less than or equal to minimum filter area',
-    'MinBlobsLtMax'        => 'Blobs min. doit Í < blobs max.',
-    'MinBlobsUnset'        => 'You must specify the minimum blob count',
-    'MinFilterAreaLtMax'   => 'Minimum filter area should be less than maximum',
-    'MinFilterAreaUnset'   => 'You must specify the minimum filter pixel count',
-    'MinFilterLtMinAlarm'  => 'Minimum filter area should be less than or equal to minimum alarm area',
-    'MinFocusRange'        => 'Min Focus Range',
-    'MinFocusSpeed'        => 'Min Focus Speed',
-    'MinFocusStep'         => 'Min Focus Step',
-    'MinGainRange'         => 'Min Gain Range',
-    'MinGainSpeed'         => 'Min Gain Speed',
-    'MinGainStep'          => 'Min Gain Step',
-    'MinIrisRange'         => 'Min Iris Range',
-    'MinIrisSpeed'         => 'Min Iris Speed',
-    'MinIrisStep'          => 'Min Iris Step',
-    'MinPanRange'          => 'Min Pan Range',
-    'MinPanSpeed'          => 'Min Pan Speed',
-    'MinPanStep'           => 'Min Pan Step',
-    'MinPixelThresLtMax'   => 'Seuil pixel min. doit Í < seuil pixel max.',
-    'MinPixelThresUnset'   => 'You must specify a minimum pixel threshold',
-    'MinTiltRange'         => 'Min Tilt Range',
-    'MinTiltSpeed'         => 'Min Tilt Speed',
-    'MinTiltStep'          => 'Min Tilt Step',
-    'MinWhiteRange'        => 'Min White Bal. Range',
-    'MinWhiteSpeed'        => 'Min White Bal. Speed',
-    'MinWhiteStep'         => 'Min White Bal. Step',
-    'MinZoomRange'         => 'Min Zoom Range',
-    'MinZoomSpeed'         => 'Min Zoom Speed',
-    'MinZoomStep'          => 'Min Zoom Step',
+    'MinAlarmAreaLtMax'    => 'La surface minimum en alarme doit être inférieure au maximum',
+    'MinAlarmAreaUnset'    => 'Vous devez spécifier la surface minimum en alarme (nb de pixels)',
+    'MinBlobAreaLtMax'     => 'La surface minimum des formes doit être inférieure au maximum',
+    'MinBlobAreaUnset'     => 'Vous devez spécifier la surface minimum des formes (nb de pixels)',
+    'MinBlobLtMinFilter'   => 'La surface minimum des formes doit être inférieure à la surface minimum filtrée',
+    'MinBlobsLtMax'        => 'Le nombre minimum de formes doit être inférieur au maximum',
+    'MinBlobsUnset'        => 'Vous devez spécifier le nombre minimum de formes',
+    'MinFilterAreaLtMax'   => 'La surface minimum filtrée doit être inférieure au maximum',
+    'MinFilterAreaUnset'   => 'Vous devez spécifier la surface minimum filtrée (nb de pixels)',
+    'MinFilterLtMinAlarm'  => 'La surface minimum filtrée doit être inférieure à la surface minimum en alarme',
+    'MinFocusRange'        => 'Plage min',
+    'MinFocusSpeed'        => 'Vitesse min',
+    'MinFocusStep'         => 'Pas min',
+    'MinGainRange'         => 'Plage gain min',
+    'MinGainSpeed'         => 'Vitesse gain min',
+    'MinGainStep'          => 'Pas gain min',
+    'MinIrisRange'         => 'Plage min',
+    'MinIrisSpeed'         => 'Vitesse min',
+    'MinIrisStep'          => 'Pas min',
+    'MinPanRange'          => 'Plage min',
+    'MinPanSpeed'          => 'Vitesse min',
+    'MinPanStep'           => 'Pas min',
+    'MinPixelThresLtMax'   => 'Le seuil minimum de pixels doit être inférieur au maximum',
+    'MinPixelThresUnset'   => 'Vous devez spécifier le seuil minimum de pixels',
+    'MinTiltRange'         => 'Plage min',
+    'MinTiltSpeed'         => 'Vitesse min',
+    'MinTiltStep'          => 'Pas min',
+    'MinWhiteRange'        => 'Plage min',
+    'MinWhiteSpeed'        => 'Vitesse min',
+    'MinWhiteStep'         => 'Pas min',
+    'MinZoomRange'         => 'Plage min',
+    'MinZoomSpeed'         => 'Vitesse min',
+    'MinZoomStep'          => 'Pas min',
     'Misc'                 => 'Divers',
-    'Monitor'              => 'CamÈra',
-    'MonitorIds'           => 'N∞&nbsp;camÈra',
-    'MonitorPreset'        => 'PrÈrÈglages camÈra',
-    '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'         => 'Scanner CamÈra',          // 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'             => 'CamÈras',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
+    'Monitor'              => 'Caméra',
+    'MonitorIds'           => 'N°&nbsp;caméra',
+    'MonitorPreset'        => 'Préréglage caméra',
+    'MonitorPresetIntro'   => 'Sélectionnez un préréglage dans la liste ci-dessous.<br><br>Veuillez noter que la sauvegarde entraînera l\'écrasement des paramètres déjà configurés pour la caméra en cours.<br><br>',
+    'MonitorProbe'         => 'Autodétection caméras',          // Added - 2009-03-31
+    'MonitorProbeIntro'    => 'La liste ci-dessous montre les caméras détectées localement ou sur le réseau, qu\'elles soient déjà configurées ou non.<br/><br/>Sélectionnez la caméra désirée dans la liste.<br/><br/>Veuillez noter que toutes les caméras ne sont pas forcément détectées et que la sauvegarde entraînera l\'écrasement des paramètres déjà configurés pour la caméra en cours.<br/><br/>', // Added - 2009-03-31
+    'Monitors'             => 'Caméras',
     'Montage'              => 'Montage',
     'Month'                => 'Mois',
     'More'                 => 'Plus',                   // Added - 2011-06-16
-    'Move'                 => 'DÈplacer',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
-    'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrx'            => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
-    'MustBeGe'             => 'doit Ítre sup. ou Ègal ‡',
-    'MustBeLe'             => 'doit Ítre inf. ou Ègal ‡',
+    'MotionFrameSkip'      => 'Saut image en alarme',
+    'Move'                 => 'Déplacement',
+    'Mtg2widgrd'           => '2 colonnes',              // Added 2013.08.15.
+    'Mtg3widgrd'           => '3 colonnes',              // Added 2013.08.15.
+    'Mtg3widgrx'           => '3 colonnes, échelle auto, élargir sur alarme',              // Added 2013.08.15.
+    'Mtg4widgrd'           => '4 colonnes',              // Added 2013.08.15.
+    'MtgDefault'           => 'Défaut',              // Added 2013.08.15.
+    'MustBeGe'             => 'doit être sup. ou égal à',
+    'MustBeLe'             => 'doit être inf. ou égal à',
     'MustConfirmPassword'  => 'Confirmez le mot de passe',
     'MustSupplyPassword'   => 'Entrez un mot de passe',
     'MustSupplyUsername'   => 'Entrez un nom d\'utilisateur',
     'Name'                 => 'Nom',
-    'Near'                 => 'PrËs',
-    'Network'              => 'RÈseau',
+    'Near'                 => 'Près',
+    'Network'              => 'Réseau',
     'New'                  => 'Nouv.',
-    'NewGroup'             => 'Nouv. Groupe',
-    'NewLabel'             => 'Nouv. Label',
-    'NewPassword'          => 'Nouv. mt de passe',
-    'NewState'             => 'Nv Ètat',
-    'NewUser'              => 'Nv util.',
+    'NewGroup'             => 'Nouv. groupe',
+    'NewLabel'             => 'Nouv. label',
+    'NewPassword'          => 'Mot de passe',
+    'NewState'             => 'Nouv. état',
+    'NewUser'              => 'Nouv. utilisateur',
     'Next'                 => 'Suivant',
     'No'                   => 'Non',
-    'NoDetectedCameras'    => 'Pas de caméras dÈtectÈ',    // Added - 2009-03-31
-    'NoFramesRecorded'     => 'Pas d\'image enregistrÈe pour cet ÈvÈnement',
+    'NoDetectedCameras'    => 'Pas de caméras détectées',    // Added - 2009-03-31
+    'NoFramesRecorded'     => 'Pas d\'images enregistrées pour cet événement',
     'NoGroup'              => 'Pas de groupe',
-    'NoSavedFilters'       => 'Pasfiltressauv',
-    'NoStatisticsRecorded' => 'Pas de statistiques disponibles pour cet ÈvÈnmnt/imag.',
+    'NoSavedFilters'       => 'Pas de filtres sauvegardés',
+    'NoStatisticsRecorded' => 'Pas de statistiques disponibles pour cet événmnt/imag.',
     'None'                 => 'Aucun',
     'NoneAvailable'        => 'Aucun disponible',
     'Normal'               => 'Normal',
     'Notes'                => 'Notes',
-    'NumPresets'           => 'Num PrÈrÈglages',
-    'Off'                  => 'Off',
-    'On'                   => 'On',
-    'OpEq'                 => 'Ègal ‡',
-    'OpGt'                 => 'sup. ‡',
-    'OpGtEq'               => 'plus grand ou Ègal ‡',
+    'NumPresets'           => 'Nombre',
+    'Off'                  => 'Désactiver',
+    'On'                   => 'Activer',
+    'OnvifCredentialsIntro'=> 'Veuillez fournir un nom d\'utilisateur et un mot de passe pour la caméra sélectionnée.<br/>Si aucun utilisateur n\'a été créé pour la caméra alors l\'utilisateur saisi sera créé avec le mot de passe associé.<br/><br/>', // Added - 2015-04-18
+    'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
+    'OnvifProbeIntro'      => 'La liste ci-dessous montre les caméras ONVIF détectées et si elles sont déjà utilisées ou disponibles.<br/><br/>Sélectionnez la caméra souhaitée dans la liste ci-dessous.<br/><br/>Veuillez noter que toutes les caméras ne sont pas forcément détectées et que la sauvegarde entraînera l\'écrasement des paramètres déjà configurés pour la caméra en cours.<br/><br/>', // Added - 2015-04-18
+    'OpEq'                 => 'égal à',
+    'OpGt'                 => 'sup. à',
+    'OpGtEq'               => 'plus grand ou égal à',
     'OpIn'                 => 'en lot',
-    'OpLt'                 => 'inf. ‡',
-    'OpLtEq'               => 'inf. ou Ègal ‡',
+    'OpLt'                 => 'inf. à',
+    'OpLtEq'               => 'inf. ou égal à',
     'OpMatches'            => 'correspond',
     'OpNe'                 => 'diff. de',
     'OpNotIn'              => 'pas en lot',
     'OpNotMatches'         => 'ne correspond pas',
     'Open'                 => 'Ouvrir',
     'OptionHelp'           => 'Aide',
-    '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.',
+    'OptionRestartWarning' => 'Ces changements peuvent nécessiter un redémarrage de ZoneMinder pour être pleinement opérationnels.',
     'Options'              => 'Options',
-    'OrEnterNewName'       => 'ou entrez nv nom',
+    'OrEnterNewName'       => 'ou entrez nouv. nom',
     'Order'                => 'Ordre',
     'Orientation'          => 'Orientation',
-    'Out'                  => 'Out',
+    'Out'                  => 'Arrière',
     'OverwriteExisting'    => 'Ecraser l\'existant',
-    'Paged'                => 'PaginÈe',
-    'Pan'                  => 'Pan',
-    'PanLeft'              => 'Pan Left',
-    'PanRight'             => 'Pan Right',
-    'PanTilt'              => 'Pan/Tilt',
-    'Parameter'            => 'ParamËtre',
-    'Password'             => 'Mt de passe',
-    'PasswordsDifferent'   => 'Les 2 mots de passe sont diffÈrents',
+    'Paged'                => 'Paginée',
+    'Pan'                  => 'Panoramique',
+    'PanLeft'              => 'Pano. gauche',
+    'PanRight'             => 'Pano. droite',
+    'PanTilt'              => 'Pano. / Incl.',
+    'Parameter'            => 'Paramètre',
+    'Password'             => 'Mot de passe',
+    'PasswordsDifferent'   => 'Les 2 mots de passe sont différents',
     'Paths'                => 'Chemins',
     'Pause'                => 'Pause',
-    'Phone'                => 'TÈlÈphone',
-    'PhoneBW'              => 'Phone&nbsp;B/W',
+    'Phone'                => 'Téléphone',
+    'PhoneBW'              => 'Débit tél.',
     'Pid'                  => 'PID',                    // Added - 2011-06-16
-    'PixelDiff'            => 'Pixel Diff',
-    'Pixels'               => 'pixels',
+    'PixelDiff'            => 'Diff. pixel',
+    'Pixels'               => 'nb pixels',
     'Play'                 => 'Lire',
     'PlayAll'              => 'Tout lire',
     'PleaseWait'           => 'Attendez',
-    'Plugins'              => 'Plugins',
+    'Plugins'              => 'Greffons',
     'Point'                => 'Point',
-    'PostEventImageBuffer' => 'Nombre dimage(s) post-ÈvÈnement',
-    'PreEventImageBuffer'  => 'Nombre dimage(s) prÈ-ÈvÈnement',
-    'PreserveAspect'       => 'Conserver les proportions',
-    'Preset'               => 'PrÈrÈglage',
-    'Presets'              => 'PrÈrÈglages',
-    'Prev'                 => 'PrecÈdent',
-    'Probe'                => 'Scanner',                  // Added - 2009-03-31
+    'PostEventImageBuffer' => 'Nb d\'image(s) post-événement',
+    'PreEventImageBuffer'  => 'Nb d\'image(s) pré-événement',
+    'PreserveAspect'       => 'Préserver les proportions',
+    'Preset'               => 'Préréglage',
+    'Presets'              => 'Préréglages',
+    'Prev'                 => 'Précédent',
+    'Probe'                => 'Autodétection',                  // Added - 2009-03-31
+    'ProfileProbe'         => 'Détection de flux',           // Added - 2015-04-18
+    'ProfileProbeIntro'    => 'La liste ci-dessous montre les profils de flux existants pour la caméra sélectionnée.<br/><br/>Sélectionnez le profil désiré dans la liste ci-dessous.<br/><br/>Veuillez noter que ZoneMinder ne peut pas configurer de profils additionels et que la sauvegarde entraînera l\'écrasement des paramètres déjà configurés pour la caméra en cours.<br/><br/>', // Added - 2015-04-18
+    'Progress'             => 'Progression',               // Added - 2015-04-18
     'Protocol'             => 'Protocole',
     'Rate'                 => 'Vitesse',
-    'Real'                 => 'RÈel',
+    'Real'                 => 'Réel',
     'Record'               => 'Enregistrer',
-    'RefImageBlendPct'     => 'Reference Image Blend %ge',
-    'Refresh'              => 'RafraÓchir',
+    'RefImageBlendPct'     => '% fusion image référence',
+    'Refresh'              => 'Rafraîchir',
     'Remote'               => 'Distant',
-    'RemoteHostName'       => 'IP/DNS',
+    'RemoteHostName'       => 'Nom d\'hôte',
     'RemoteHostPath'       => 'Chemin',
     'RemoteHostPort'       => 'Port',
     'RemoteHostSubPath'    => 'Sous-chemin',    // Added - 2009-02-08
     'RemoteImageColours'   => 'Nombre de couleurs',
-    'RemoteMethod'         => 'MÈthode',          // Added - 2009-02-08
+    'RemoteMethod'         => 'Méthode',          // Added - 2009-02-08
     'RemoteProtocol'       => 'Protocole',        // Added - 2009-02-08
     'Rename'               => 'Renommer',
     'Replay'               => 'Relire',
-    'ReplayAll'            => 'Tous les ÈvÈnements',
-    'ReplayGapless'        => 'EvÈnement Gapless',
-    'ReplaySingle'         => 'EvÈnement unique',
-    'Reset'                => 'RAZ',
-    'ResetEventCounts'     => 'Rem. ‡ 0 comptage des Èvts',
-    'Restart'              => 'RedÈmarrer',
-    'Restarting'           => 'RedÈmarrage',
-    'RestrictedCameraIds'  => 'N∞ camÈras confid.',
-    'RestrictedMonitors'   => 'Restricted Monitors',
-    'ReturnDelay'          => 'Return Delay',
-    'ReturnLocation'       => 'Return Location',
-    'Rewind'               => 'Rembobiner',
+    'ReplayAll'            => 'Tous les événements',
+    'ReplayGapless'        => 'Rejouer sans blancs',
+    'ReplaySingle'         => 'Rejouer seul',
+    'Reset'                => 'RàZ',
+    'ResetEventCounts'     => 'RàZ compteur évts',
+    'Restart'              => 'Redémarrer',
+    'Restarting'           => 'Redémarrage',
+    'RestrictedCameraIds'  => 'N°',
+    'RestrictedMonitors'   => 'Caméra(s) uniquement visible(s)',
+    'ReturnDelay'          => 'Délai de retour',
+    'ReturnLocation'       => 'Position de retour',
+    'Rewind'               => 'Reculer',
     'RotateLeft'           => 'Rotation g.',
     'RotateRight'          => 'Rotation d.',
-    'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
+    'RunLocalUpdate'       => 'Veuillez éxecuter zmupdate.pl pour mettre à jour', // Added - 2011-05-25
     'RunMode'              => 'Mode de lancement',
-    'RunState'             => 'Changer Ètat',
-    'Running'              => 'En Fonctionnement',
-    'Save'                 => 'OK',
+    'RunState'             => 'Changer d\'état',
+    'Running'              => 'En marche',
+    'Save'                 => 'Sauvegarder',
     'SaveAs'               => 'Sauvegarder sous',
-    'SaveFilter'           => 'Sauvegarder Filtre',
+    'SaveFilter'           => 'Sauvegarder filtre',
     'Scale'                => 'Echelle',
     'Score'                => 'Score',
     'Secs'                 => 'Secs',
     'Sectionlength'        => 'Longueur section',
-    'Select'               => 'SÈlectionner',
-    'SelectFormat'         => 'SÈlectionner Format',          // Added - 2011-06-17
-    'SelectLog'            => 'SÈlectionner Log',             // Added - 2011-06-17
-    'SelectMonitors'       => 'SÈlectionner camÈras',
-    'SelfIntersecting'     => 'Polygon edges must not intersect',
-    'Set'                  => 'DÉfinir',
-    'SetNewBandwidth'      => 'RÈgler le dÈbit',
-    'SetPreset'            => 'DÈfinir PrÈrÈglages',
-    'Settings'             => 'RÈglages',
+    'Select'               => 'Sélectionner',
+    'SelectFormat'         => 'Sélectionner format',          // Added - 2011-06-17
+    'SelectLog'            => 'Sélectionner journal',             // Added - 2011-06-17
+    'SelectMonitors'       => 'Sélectionner caméras',
+    'SelfIntersecting'     => 'Les bords du polygone ne doivent pas se croiser',
+    'Set'                  => 'Définir',
+    'SetNewBandwidth'      => 'Régler le débit',
+    'SetPreset'            => 'Définir préréglage',
+    'Settings'             => 'Réglages',
     'ShowFilterWindow'     => 'Filtres',
-    'ShowTimeline'         => 'Afficher Chronologie',
-    'SignalCheckColour'    => 'Signal Check Colour',
+    'ShowTimeline'         => 'Afficher chronologie',
+    'SignalCheckColour'    => 'Couleur vérif. signal',
     'Size'                 => 'Taille',
-    'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
+    'SkinDescription'      => 'Remplacer le skin par défaut', // Added - 2011-01-30
     'Sleep'                => 'Veille',
     'SortAsc'              => 'Asc',
     'SortBy'               => 'Trier par',
@@ -614,136 +637,140 @@ $SLANG = array(
     'Source'               => 'Source',
     'SourceColours'        => 'Couleurs',         // Added - 2009-02-08
     'SourcePath'           => 'Chemin',            // Added - 2009-02-08
-    'SourceType'           => 'Type de Source',
+    'SourceType'           => 'Type de source',
     'Speed'                => 'Vitesse',
     'SpeedHigh'            => 'Rapide',
     'SpeedLow'             => 'Lent',
     'SpeedMedium'          => 'Moyen',
     'SpeedTurbo'           => 'Turbo',
-    'Start'                => 'DÈmarrer',
+    'Start'                => 'Démarrer',
     'State'                => 'Etat',
     'Stats'                => 'Stats',
     'Status'               => 'Statut',
-    'Step'                 => 'Step',
-    'StepBack'             => 'Step Back',
-    'StepForward'          => 'Step Forward',
-    'StepLarge'            => 'Large Step',
-    'StepMedium'           => 'Medium Step',
-    'StepNone'             => 'No Step',
-    'StepSmall'            => 'Small Step',
+    'Step'                 => 'Pas',
+    'StepBack'             => 'Reculer',
+    'StepForward'          => 'Avancer',
+    'StepLarge'            => 'Pas large',
+    'StepMedium'           => 'Pas moyen',
+    'StepNone'             => 'Pas nul',
+    'StepSmall'            => 'Pas faible',
     'Stills'               => 'Photos',
-    'Stop'                 => 'ArrÍter',
-    'Stopped'              => 'ArrÍtÈ',
+    'Stop'                 => 'Arrêter',
+    'Stopped'              => 'Arrêté',
     'Stream'               => 'Flux',
-    'StreamReplayBuffer'   => 'Stream Replay Image Buffer',
+    'StreamReplayBuffer'   => 'Nb d\'image(s) pour relecture',
     'Submit'               => 'Soumettre',
-    'System'               => 'SystËme',
-    'SystemLog'            => 'System Log',             // Added - 2011-06-16
-    'Tele'                 => 'Tele',
+    'System'               => 'Système',
+    'SystemLog'            => 'Journal système',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Espace de couleur cible',      // Added - 2015-04-18
+    'Tele'                 => 'Télé',
     'Thumbnail'            => 'Miniature',
-    'Tilt'                 => 'Tilt',
+    'Tilt'                 => 'Incliner',
     'Time'                 => 'Heure',
-    'TimeDelta'            => 'Time Delta',
+    'TimeDelta'            => 'Temps',
     'TimeStamp'            => 'Horodatage',
     'Timeline'             => 'Chronologie',
-    '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'         => 'Passez votre souris sur le graphique pour visualiser un aperçu de l\'image et les détails de l\'événement.',              // Added 2013.08.15.
+    'TimelineTip2'         => 'Cliquez sur les sections colorées du graphique ou sur l\'image pour voir l\'événement.',              // Added 2013.08.15.
+    'TimelineTip3'         => 'Cliquez sur le fond pour zoomer sur une plage de temps plus réduite autour de votre clic.',              // Added 2013.08.15.
+    'TimelineTip4'         => 'Utilisez les contrôles ci-dessous pour faire un zoom arrière ou naviguer en arrière et avancer sur l\'intervalle de temps.',              // Added 2013.08.15.
     'Timestamp'            => 'Horodatage',
-    'TimestampLabelFormat' => 'Format Horodatage',
-    'TimestampLabelX'      => 'Label Horodatage X',
-    'TimestampLabelY'      => 'Label Horodatage Y',
-    'Today'                => 'Aujourd&#39;hui',
+    'TimestampLabelFormat' => 'Format',
+    'TimestampLabelX'      => 'Coordonnée X',
+    'TimestampLabelY'      => 'Coordonnée Y',
+    'Today'                => 'Aujourd\'hui',
     'Tools'                => 'Outils',
     'Total'                => 'Total',                  // Added - 2011-06-16
     'TotalBrScore'         => 'Score<br/>total',
-    'TrackDelay'           => 'Track Delay',
-    'TrackMotion'          => 'Track Motion',
-    'Triggers'             => 'DÈclenchements',
-    'TurboPanSpeed'        => 'Turbo Pan Speed',
-    'TurboTiltSpeed'       => 'Turbo Tilt Speed',
+    'TrackDelay'           => 'Délai suivi',
+    'TrackMotion'          => 'Suivre détection',
+    'Triggers'             => 'Déclenchements',
+    'TurboPanSpeed'        => 'Vitesse turbo',
+    'TurboTiltSpeed'       => 'Vitesse turbo',
     'Type'                 => 'Type',
-    'Unarchive'            => 'DÈsarchiver',
-    'Undefined'            => 'indÈfini',              // Added - 2009-02-08
-    'Units'                => 'UnitÈs',
+    'Unarchive'            => 'Désarchiver',
+    'Undefined'            => 'Indéfini',              // Added - 2009-02-08
+    'Units'                => 'Unité',
     'Unknown'              => 'Inconnu',
-    'Update'               => 'Actualiser',
-    'UpdateAvailable'      => 'Mise ‡ jour de ZM disponible',
-    'UpdateNotNecessary'   => 'Pas de mise ‡ jour disponible',
-    'Updated'              => 'ActualisÈ',                // Added - 2011-06-16
-    'Upload'               => 'TransfÈrer',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
-    'UseFilter'            => 'Utiliser Filtre',
-    'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
-    'UseFilterExprsPre'    => 'Util.&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'Update'               => 'Mettre à jour',
+    'UpdateAvailable'      => 'Mise à jour dispo.',
+    'UpdateNotNecessary'   => 'Pas de mise à jour dispo.',
+    'Updated'              => 'Mis à jour',                // Added - 2011-06-16
+    'Upload'               => 'Transférer',                 // Added - 2011-08-23
+    'UseFilter'            => 'Utiliser filtre',
+    'UseFilterExprsPost'   => '&nbsp;filtre&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'    => 'Utiliser&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Filtres utilisés',
     'User'                 => 'Utilisateur',
-    'Username'             => 'Login',
+    'Username'             => 'Nom',
     'Users'                => 'Utilisateurs',
+    'V4L'                  => 'V4L',
+    'V4LCapturesPerFrame'  => 'Nb captures par image',
+    'V4LMultiBuffer'       => 'Mise en tampon multiple',
     'Value'                => 'Valeur',
     'Version'              => 'Version',
     'VersionIgnore'        => 'Ignorer cette version',
-    'VersionRemindDay'     => 'Me rappeler ds 1 j.',
-    'VersionRemindHour'    => 'Me rappleler dans 1 h.',
+    'VersionRemindDay'     => 'Me rappeler dans 1 jour',
+    'VersionRemindHour'    => 'Me rappeler dans 1 heure',
     'VersionRemindNever'   => 'Ne pas avertir des nvelles versions',
-    'VersionRemindWeek'    => 'Me rappeler ds 1 sem.',
-    'Video'                => 'VidÈo',
-    'VideoFormat'          => 'Format de la VidÈo',
-    'VideoGenFailed'       => 'Echec gÈnÈration vidÈo!',
-    'VideoGenFiles'        => 'Existing Video Files',
+    'VersionRemindWeek'    => 'Me rappeler dans 1 sem.',
+    'Video'                => 'Vidéo',
+    'VideoFormat'          => 'Format de la vidéo',
+    'VideoGenFailed'       => 'Echec génération vidéo !',
+    'VideoGenFiles'        => 'Fichiers vidéo existants',
     'VideoGenNoFiles'      => 'Aucun fichier vidéo trouvé',
-    'VideoGenParms'        => 'ParamËtres gÈnÈration vidÈo',
-    'VideoGenSucceeded'    => 'VidÈo gÈnÈrÈe avec succËs!',
-    'VideoSize'            => 'taille vidÈo',
+    'VideoGenParms'        => 'Paramètres génération vidéo',
+    'VideoGenSucceeded'    => 'Vidéo générée avec succès !',
+    'VideoSize'            => 'Taille vidéo',
     'View'                 => 'Voir',
     'ViewAll'              => 'Tout voir',
-    'ViewEvent'            => 'Voir ÈvÈnement',
-    'ViewPaged'            => 'Vue paginÈe',
-    'Wake'                 => 'RÈveiller',
-    'WarmupFrames'         => 'Images test',
+    'ViewEvent'            => 'Voir événement',
+    'ViewPaged'            => 'Vue paginée',
+    'Wake'                 => 'Réveiller',
+    'WarmupFrames'         => 'Nb d\'image(s) tests',
     'Watch'                => 'Regarder',
     'Web'                  => 'Web',
-    'WebColour'            => 'Web Colour',
+    'WebColour'            => 'Couleur web',
     'Week'                 => 'Semaine',
-    'White'                => 'White',
-    'WhiteBalance'         => 'White Balance',
+    'White'                => 'Blanc',
+    'WhiteBalance'         => 'Balance des blancs',
     'Wide'                 => 'Large',
     'X'                    => 'X',
     'X10'                  => 'X10',
-    'X10ActivationString'  => 'X10:chaÓne activation',
-    'X10InputAlarmString'  => 'X10:chaÓne alarme entrÈe',
-    'X10OutputAlarmString' => 'X10:chaÓne alarme sortie',
+    'X10ActivationString'  => 'X10:chaîne activation',
+    'X10InputAlarmString'  => 'X10:chaîne alarme entrée',
+    'X10OutputAlarmString' => 'X10:chaîne alarme sortie',
     'Y'                    => 'Y',
     'Yes'                  => 'Oui',
-    'YouNoPerms'           => 'Permissions nÈcessaires pour cette ressource.',
+    'YouNoPerms'           => 'Permissions nécessaires pour cette ressource.',
     'Zone'                 => 'Zone',
-    'ZoneAlarmColour'      => 'Couleur alarme (Red/Green/Blue)',
-    'ZoneArea'             => 'Zone Area',
-    'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
-    'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
-    'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
-    'ZoneMinMaxBlobs'      => 'Min/Max Blobs',
-    'ZoneMinMaxFiltArea'   => 'Min/Max Filtered Area',
-    'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
-    'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
-    'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
+    'ZoneAlarmColour'      => 'Couleur alarme (Rouge/Vert/Bleu)',
+    'ZoneArea'             => 'Surface de la zone',
+    'ZoneExtendAlarmFrames' => 'Nb image(s) pour extension alarme',
+    'ZoneFilterSize'       => 'Largeur/hauteur surface filtrée (nb pixels)',
+    'ZoneMinMaxAlarmArea'  => 'Surface en alarme min/max (nb pixels)',
+    'ZoneMinMaxBlobArea'   => 'Surface des formes min/max (nb pixels)',
+    'ZoneMinMaxBlobs'      => 'Nombre de formes min/max',
+    'ZoneMinMaxFiltArea'   => 'Surface filtrée min/max (nb pixels)',
+    'ZoneMinMaxPixelThres' => 'Seuil pixels min/max (0-255)',
+    'ZoneMinderLog'        => 'Journal de ZoneMinder',         // Added - 2011-06-17
+    'ZoneOverloadFrames'   => 'Nb image(s) ignorée(s) après dépass. seuil',
     'Zones'                => 'Zones',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom avant',
-    'ZoomOut'              => 'Zoom arriËre',
+    'ZoomOut'              => 'Zoom arrière',
 );
 
 // Complex replacements with formatting and/or placements, must be passed through sprintf
 $CLANG = array(
-    'CurrentLogin'         => 'Util. Actuel: \'%1$s\'',
-    'EventCount'           => '%1$s %2$s', // par ex. '37 ÈvËnts' (voir Vlang ci-dessous)
-    'LastEvents'           => '%1$s derniers %2$s', // par ex. '37 derniers  ÈvËnts' (voir Vlang ci-dessous)
-    'LatestRelease'        => 'La derniËre version est v%1$s, vous avez v%2$s.',
-    'MonitorCount'         => '%1$s %2$s', // par exemple '4 camÈras' (voir Vlang ci-dessous)
-    'MonitorFunction'      => 'CamÈra %1$s Fonction',
-    'RunningRecentVer'     => 'Vs avez la derniËre version de ZoneMinder, v%s.',
-    'VersionMismatch'      => 'Version mismatch, system is version %1$s, database is %2$s.', // Added - 2011-05-25
+    'CurrentLogin'         => 'Utilisateur actuel: \'%1$s\'',
+    'EventCount'           => '%1$s %2$s', // par ex. '37 évènts' (voir Vlang ci-dessous)
+    'LastEvents'           => '%1$s derniers %2$s', // par ex. '37 derniers  évènts' (voir Vlang ci-dessous)
+    'LatestRelease'        => 'La dernière version est v%1$s, vous avez v%2$s.',
+    'MonitorCount'         => '%1$s %2$s', // par exemple '4 caméras' (voir Vlang ci-dessous)
+    'MonitorFunction'      => 'Caméra %1$s Fonction',
+    'RunningRecentVer'     => 'Vous avez la dernière version de ZoneMinder, v%s.',
+    'VersionMismatch'      => 'Discordance entre version système (%1$s) et base de données (%2$s).', // Added - 2011-05-25
 );
 
 // The next section allows you to describe a series of word ending and counts used to 
@@ -780,8 +807,8 @@ $CLANG = array(
 
 // Variable arrays expressing plurality, see the zmVlang description above
 $VLANG = array(
-    'Event'                => array( 0=>'ÈvÈnements', 1=>'ÈvÈnement', 2=>'ÈvÈnements' ),
-    'Monitor'              => array( 0=>'camÈras', 1=>'camÈra', 2=>'camÈras' ),
+    'Event'                => array( 0=>'événements', 1=>'événement', 2=>'événements' ),
+    'Monitor'              => array( 0=>'caméras', 1=>'caméra', 2=>'caméras' ),
 );
 
 // You will need to choose or write a function that can correlate the plurality string arrays
@@ -800,7 +827,7 @@ function zmVlang( $langVarArray, $count )
             return( $value );
         }
     }
-    die( 'Error, unable to correlate variable language string' );
+    die( 'Erreur, impossible de corréler la chaîne de caractères' );
 }
 
 // This is an version that could be used in the Russian example above
@@ -874,10 +901,10 @@ $OLANG = array(
 		          "\"--verbose=2\" Set verbosity of libVLC"
 	),
 	
-//    'LANG_DEFAULT' => array(
-//        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
-//    ),
+    'LANG_DEFAULT' => array(
+        'Prompt' => "Langage par défaut pour l'interface web",
+        'Help' => "ZoneMinder est exploitable dans votre langue si le fichier de traduction approprié est disponible sur votre système. Cette option permet de changer la langue anglaise par défaut par la langue de votre choix dans la liste."
+    ),
 );
 
 ?>
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index 83f165cef..b7e89858c 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => '����� Px',
     'AlarmRGBUnset'        => '���� ���� ����� ����� ���',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => '�����',
     'All'                  => '���',
     'Apply'                => '���',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob Sizes',
     'Blobs'                => 'Blobs',
     'Brightness'           => '������',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => '���� ������� �������',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Capture Height',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Capture Palette',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Capture Width',
     'Cause'                => '����',
     'CheckMethod'          => 'Alarm Check Method',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'        => '���� ��������',
     'ControlType'          => '��� ��������',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => '������',
     'CycleWatch'           => '����� �������',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     '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'          => '�����',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => '���� �����',
     'DeviceFormat'         => '����� �����',
@@ -257,6 +265,7 @@ $SLANG = array(
     '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 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.',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'    => '��, ��� �� ���� �����, �� ����� ����',
     'DonateRemindWeek'     => '����� ��, ���� �� ���� ���� ���',
     'DonateYes'            => '��, ��� ������� ����� �����',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => '����',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => '��� ���',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => '����',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => '���� ������',
     'FilterDeleteEvents'   => '��� ������',
     'FilterEmailEvents'    => '��� ���� �� �� �������',
     'FilterExecuteEvents'  => 'Execute command on all matches',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Message details of all matches',
     'FilterPx'             => 'Filter Px',
     'FilterUnset'          => '���� ����� ���� ����� ����',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                => '������',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => '�����',
     'ForceAlarm'           => '���� �����',
     'Format'               => '�����',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'              => 'Frame Id',
     'FrameRate'            => 'Frame Rate',
     'FrameSkip'            => '��� �����',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => '�������',
     'Func'                 => '����',
     'Function'             => '�������',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => '�������',
     'MonitorIds'           => 'Monitor&nbsp;Ids',
     'MonitorPreset'        => 'Monitor Preset',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'              => 'Montage',
     'Month'                => '����',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => '���',
-    'MtgDefault'            => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'            => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'            => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'            => '4-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.
     'MustBeGe'             => 'must be greater than or equal to',
     'MustBeLe'             => 'must be less than or equal to',
     'MustConfirmPassword'  => 'You must confirm the password',
@@ -506,6 +517,9 @@ $SLANG = array(
     'NumPresets'           => 'Num Presets',
     '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'                 => '���� �',
     'OpGtEq'               => 'greater than or equal to',
@@ -552,6 +566,9 @@ $SLANG = array(
     'Presets'              => '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => '�����',
     'Real'                 => '�����',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => '�����',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => '��',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => '����� ���� �����.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     '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'
+    'UsedPlugins'	   => 'Used Plugins',
     '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'        => '����� ������ ��',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                 => '����',
     'ZoneAlarmColour'      => 'Alarm Colour (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => '������',
     'Zoom'                 => '���',
     'ZoomIn'               => '��� �����',
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 130899a27..6c97fa150 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -115,6 +115,7 @@ define( "STRF_FMT_DATETIME_SHORTER", "%m.%d. %H:%M:%S" );       // Strftime shor
 // Simple String Replacements
 $SLANG = array(
     '24BitColour'          => '24 bites szín',
+    '32BitColour'          => '32 bit colour',          // Added - 2015-04-18
     '8BitGrey'             => '8 bit szürkeárnyalat',
     'Action'               => 'Művelet',
     'Actual'               => 'Valós',
@@ -130,6 +131,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Maximális FPS riasztott állapotban',
     'AlarmPx'              => 'Riasztó képpont',
     'AlarmRGBUnset'        => 'Be kell állítani egy RGB színt a riasztáshoz',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Figyelem',
     'All'                  => 'Mind',
     'Apply'                => 'Alkalmaz',
@@ -169,17 +171,18 @@ $SLANG = array(
     'BadAlarmFrameCount'   => 'Riasztáshoz szükséges képkockák száma legyen legalább 1',
     'BadAlarmMaxFPS'       => 'Maximális FPS riasztott állapotban legyen megadva',
     'BadChannel'           => 'A csatorna száma legyen legalább 0',
+    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2015-04-18
     'BadDevice'            => 'Az eszköz elérése valós legyen',
     'BadFPSReportInterval' => 'Az FPS naplózásának gyakorisága legyen legalább 0',
     'BadFormat'            => 'A típus 0 vagy nagyobb egész szám legyen',
     'BadFrameSkip'         => 'Az eldobott képkockák száma legyen legalább 0',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'A képmagasság legyen érvényes érték képpontban megadva',
     'BadHost'              => 'A hoszt legyen valós IP cím vagy hosztnév http:// nélkül',
     'BadImageBufferCount'  => 'A képkockák száma a pufferben legyen legalább 10',
     'BadLabelX'            => 'A cimke X koordinátája legyen legalább 0',
     'BadLabelY'            => 'A cimke Y koordinátája legyen legalább 0',
     'BadMaxFPS'            => 'Maximális FPS nyugalmi állapotban legyen megadva',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'A név csak betűket, számokat, plusz-, kötő-, és aláhúzásjelet tartalmazhat',
     'BadPalette'           => 'A szín-palettának válasszin egy helyes értéket',
     'BadPath'              => 'A kép elérési útvonala helytelen',
@@ -199,7 +202,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob méretek',
     'Blobs'                => 'Blob-ok',
     'Brightness'           => 'Fényerő',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Pufferek',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Van autofókusza',
     'CanAutoGain'          => 'Van AGC-je',
     'CanAutoIris'          => 'Van autoírisze',
@@ -243,6 +248,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Képmagasság',
     'CaptureMethod'        => 'Digitalizálás módszere',
     'CapturePalette'       => 'Digitalizálás szín-palettája',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Képszélesség',
     'Cause'                => 'Okozó',
     'CheckMethod'          => 'A riasztás figyelésének módja',
@@ -273,6 +279,7 @@ $SLANG = array(
     'ControlDevice'        => 'Vezérlő eszköz',
     'ControlType'          => 'Vezérlés típusa',
     'Controllable'         => 'Vezérelhető',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Ciklikus nézet',
     'CycleWatch'           => 'Ciklikus nézet',
     'DateTime'             => 'Dátum/Idő', 
@@ -281,12 +288,15 @@ $SLANG = array(
     'DefaultRate'          => 'Alapértelmezett sebesség',
     'DefaultScale'         => 'Alapértelmezett méret',
     'DefaultView'          => 'Alapértelmezett nézet',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Törlés',
     'DeleteAndNext'        => 'Törlés &amp;<br>következő',
     'DeleteAndPrev'        => 'Törlés &amp;<br>előző',
     'DeleteSavedFilter'    => 'Mentett szűrő törlése',
     'Description'          => 'Leírás',
     'DetectedCameras'      => 'Érzékelt kamerák',
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Eszköz',
     'DeviceChannel'        => 'Eszköz csatornája',
     'DeviceFormat'         => 'Eszköz formátuma',
@@ -298,6 +308,7 @@ $SLANG = array(
     'Disk'                 => 'Tárhely',
     'Display'              => 'Megjelenés',
     'Displaying'           => 'Megjelenítés',
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection', // Added - 2015-04-18
     'Donate'               => 'Kérem támogasson',
     'DonateAlready'        => 'Nem, én már támogattam',
     'DonateEnticement'     => 'Ön már jó ideje használja a ZoneMindert, és reméljük hasznos eszköznek tartja háza vagy munkahelye biztonságában. Bár a ZoneMinder egy szabad, nyílt forráskódú termék és az is marad, a fejlesztése pénzbe kerül. Ha van lehetősége támogatni a jövőbeni fejlesztéseket és az új funkciókat kérem, tegye meg. A támogatás teljesen önkéntes, de nagyon megbecsült és mértéke is tetszőleges.<br><br>Ha támogatni szertne, kérem, válasszon az alábbi lehetőségekből vagy látogassa meg a http://www.zoneminder.com/donate.html oldalt.<br><br>Köszönjük, hogy használja a ZoneMinder-t és ne felejtse el meglátogatni a fórumokat a ZoneMinder.com oldalon támogatásért és ötletekért, hogy a jövőben is még jobban ki tudja használni a ZoneMinder lehetőségeit.',
@@ -349,10 +360,12 @@ $SLANG = array(
     'Feed'                 => 'Folyam',
     'Ffmpeg'               => 'ffmpeg',
     'File'                 => 'Fájl',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Minden találat archiválása',
     'FilterDeleteEvents'   => 'Minden találat törlése',
     'FilterEmailEvents'    => 'Minden találat adatainak küldése E-mailben',
     'FilterExecuteEvents'  => 'Parancs futtatása minden találaton',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Minden találat adatainak üzenése',
     'FilterPx'             => 'Szűrt képkockák',
     'FilterUnset'          => 'Meg kell adnod a szűrő szélességét és magasságát',
@@ -362,12 +375,12 @@ $SLANG = array(
     'First'                => 'Első',
     'FlippedHori'          => 'Vízszintes tükrözés',
     'FlippedVert'          => 'Függőleges tükrözés',
-    'FnNone'               => 'Letiltva',
-    'FnMonitor'            => 'Csak monitorozás',
-    'FnModect'             => 'Mozgásérzékelő',
-    'FnRecord'             => 'Folyamatos felvétel',
     'FnMocord'             => 'Folyamatos mozgással',
+    'FnModect'             => 'Mozgásérzékelő',
+    'FnMonitor'            => 'Csak monitorozás',
     'FnNodect'             => 'Külső érzékelő',
+    'FnNone'               => 'Letiltva',
+    'FnRecord'             => 'Folyamatos felvétel',
     'Focus'                => 'Fókusz',
     'ForceAlarm'           => 'Kézi riasztás',
     'Format'               => 'Formátum',
@@ -375,7 +388,6 @@ $SLANG = array(
     'FrameId'              => 'Képkocka azonosító',
     'FrameRate'            => 'FPS',
     'FrameSkip'            => 'Képkocka kihagyás',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Képkocka',
     'Func'                 => 'Funk.',
     'Function'             => 'Funkció',
@@ -502,6 +514,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min. zoom sebesség',
     'MinZoomStep'          => 'Min. zoom lépték',
     'Misc'                 => 'Egyéb',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Kamera',
     'MonitorIds'           => 'Kamera&nbsp;azonosítók',
     'MonitorPreset'        => 'Előre beállított kameraprofilok',
@@ -512,12 +525,13 @@ $SLANG = array(
     'Montage'              => 'Többkamerás nézet',
     'Month'                => 'Hónapban',
     'More'                 => 'Több',
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Mozgás',
-    'MtgDefault'           => 'Böngésző alapértelmezése szerint',
     'Mtg2widgrd'           => '2 oszlopban',
     'Mtg3widgrd'           => '3 oszlopban',
-    'Mtg4widgrd'           => '4 oszlopban',
     'Mtg3widgrx'           => '3 oszlopban skálázva, riasztás esetén kinagyítva',
+    'Mtg4widgrd'           => '4 oszlopban',
+    'MtgDefault'           => 'Böngésző alapértelmezése szerint',
     'MustBeGe'             => 'nagyobbnak vagy egyenlőnek kell lennie',
     'MustBeLe'             => 'kisebbnek vagy egyenlőnek kell lennie',
     'MustConfirmPassword'  => 'Meg kell erősítenie a jelszót',
@@ -546,6 +560,9 @@ $SLANG = array(
     'NumPresets'           => 'Profilok száma',
     'Off'                  => 'Ki',
     'On'                   => 'Be',
+    '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'                 => 'egyenlő',
     'OpGt'                 => 'nagyobb mint',
     'OpGtEq'               => 'nagyobb van egyenlő',
@@ -583,6 +600,7 @@ $SLANG = array(
     'Play'                 => 'Lejátszás',
     'PlayAll'              => 'Mind lejátszása',
     'PleaseWait'           => 'Kérlek várj...',
+    'Plugins'              => 'Plugins',                // Added - 2015-04-18
     'Point'                => 'Pont',
     'PostEventImageBuffer' => 'Esemény utáni képkockák a pufferben',
     'PreEventImageBuffer'  => 'Esemény elötti képkockák a pufferben',
@@ -591,6 +609,9 @@ $SLANG = array(
     'Presets'              => 'Előre beállított profilok',
     'Prev'                 => 'Előző',
     'Probe'                => 'Érzékelés',
+    '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',
     'Rate'                 => 'FPS',
     'Real'                 => 'Valós',
@@ -678,6 +699,7 @@ $SLANG = array(
     'Submit'               => 'Küldés',
     'System'               => 'Rendszer',
     'SystemLog'            => 'Rendszernapló',
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Táv',
     'Thumbnail'            => 'Előnézet',
     'Tilt'                 => 'Fel-le mozgás',
@@ -715,9 +737,13 @@ $SLANG = array(
     'UseFilter'            => 'Szűrőt használ',
     'UseFilterExprsPost'   => '&nbsp;szürés&nbsp; használata', // 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',           // Added - 2015-04-18
     'User'                 => 'Felhasználó',
     'Username'             => 'Felhasználónév',
     'Users'                => 'Felhasználók',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Érték',
     'Version'              => 'Verzió',
     'VersionIgnore'        => 'Ezen verzió figyelmen kívül hagyása',
@@ -757,6 +783,7 @@ $SLANG = array(
     'Zone'                 => 'Zóna:',
     'ZoneAlarmColour'      => 'Riasztott terület<br>színezése (R/G/B)',
     'ZoneArea'             => 'Zóna lefedettsége',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Szélesség és magasság<br>szűrés képpontban',
     'ZoneMinMaxAlarmArea'  => 'Min/Max riasztó terület',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob terület',
@@ -765,7 +792,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max képpont változási<br>küszöb (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Napló',
     'ZoneOverloadFrames'   => 'Túlterhelés esetén<br>ennyi képkocka hagyható ki',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zónák',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom be',
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 8842cfacf..b367da15a 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -93,6 +93,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'FPS massimi durante l\'allarme',
     'AlarmPx'              => 'Pixel Allarme',
     'AlarmRGBUnset'        => 'Devi settare un colore RGB di allarme',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Attenzione',
     'All'                  => 'Tutto',
     'Apply'                => 'Applica',
@@ -137,13 +138,13 @@ $SLANG = array(
     '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',
     'BadFrameSkip'         => 'Il numero di Frame da scartare deve essere un intero uguale a 0 o superiore',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'L\'altezza deve essere impostata con un valore valido',
     'BadHost'              => 'L\'host deve essere impostato con un indirizzo ip valido o con un hostname, non includendo http://',
     'BadImageBufferCount'  => 'La dimensione del buffer dell\'immagine deve essere impostata con un numero intero pari a 10 o maggiore',
     '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',
     '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
     'BadPath'              => 'Il percorso deve essere impostato con un valore valido',
@@ -163,7 +164,9 @@ $SLANG = array(
     'BlobSizes'            => 'Dimensioni Blob',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Luminosit&agrave;',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Puo\' Auto Focus',
     'CanAutoGain'          => 'Puo\' Auto Gains',
     'CanAutoIris'          => 'Puo\' Auto Iris',
@@ -207,6 +210,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Altezza img catturata',
     'CaptureMethod'        => 'Metodo di cattura',         // Added - 2009-02-08
     'CapturePalette'       => 'Paletta img Catturata',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Larghezza img Catturata',
     'Cause'                => 'Causa',
     'CheckMethod'          => 'Metodo di Controllo Allarme',
@@ -237,6 +241,7 @@ $SLANG = array(
     'ControlDevice'        => 'Dispositivo di controllo',
     'ControlType'          => 'Tipo Controllo',
     'Controllable'         => 'Controllabile',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cicla',
     'CycleWatch'           => 'Vista Ciclica',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -245,12 +250,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Scala di default',
     'DefaultView'          => 'Visualizzazione di default',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Elimina',
     'DeleteAndNext'        => 'Elimina &amp; Prossimo',
     'DeleteAndPrev'        => 'Elimina &amp; Precedente',
     'DeleteSavedFilter'    => 'Elimina il filtro salvato',
     'Description'          => 'Descrizione',
     'DetectedCameras'      => 'Telecamere Rilevate',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Periferica',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Canale Periferica',
     'DeviceFormat'         => 'Formato',
@@ -262,6 +270,7 @@ $SLANG = array(
     'Disk'                 => 'Utilizzo Disco',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Donate,per favore',
     'DonateAlready'        => 'No, ho gia donato...    ',
     'DonateEnticement'     => 'Stai usando ZoneMinder da un po\' di tempo e spero che tu lo stia trovando utile per la sicurezza di casa tua o del tuo posto di lavoro..Anche se ZoneMinder e\' distribuito liberamente come software libero,costa soldi sia svilupparlo che supportarlo. Se preferisci che questo software continui ad avere supporto e sviluppo in futuro allora considera l\idea di fare una piccola donazione. Donare e\' ovviamente opzionale, ma apprezzato e puoi donare quanto vuoi,quel poco o tanto che tu desideri.<br><br>Se hai voglia per cortesia seleziona l\'opzione sotto o punta il tuo browser a http://www.zoneminder.com/donate.html .<br><br>Grazie per usare ZoneMinder e non dimenticare di visitare il forum in ZoneMinder.com se cerchi supporto o hai suggerimenti riguardo a come rendere migliore Zoneminder.',
@@ -271,7 +280,6 @@ $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',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Il nome del monitor e\' gia\' presente', // Added - 2009-03-31
     'Duration'             => 'Durata',
@@ -314,10 +322,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // 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',
     'FilterPx'             => 'Px Filtro',
     'FilterUnset'          => 'Devi specificare altezza e larghezza per il filtro',
@@ -327,12 +337,12 @@ $SLANG = array(
     'First'                => 'Primo',
     'FlippedHori'          => 'ribaltato orizzontale',
     'FlippedVert'          => 'ribaltato verticale',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'Forza Allarme',
     'Format'               => 'Formato',
@@ -340,7 +350,6 @@ $SLANG = array(
     'FrameId'              => 'Id Immagine',
     'FrameRate'            => 'Immagini al secondo',
     'FrameSkip'            => 'Immagini saltate',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Immagini',
     'Func'                 => 'Funz',
     'Function'             => 'Funzione',
@@ -467,6 +476,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Velocita\' minima dello zoom',
     'MinZoomStep'          => 'Step minimo dello zoom',
     'Misc'                 => 'Altro',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Monitor&nbsp;Ids',
     'MonitorPreset'        => 'Monitor Presenti',
@@ -477,12 +487,13 @@ $SLANG = array(
     'Montage'              => 'Montaggio',
     'Month'                => 'Mese',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Sposta',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'deve essere superiore a',
     'MustBeLe'             => 'deve essere inferiore o pari a',
     'MustConfirmPassword'  => 'Devi confermare la password',
@@ -511,6 +522,9 @@ $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
+    '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'                 => 'uguale a',
     'OpGt'                 => 'maggiore di',
     'OpGtEq'               => 'maggiore o uguale a',
@@ -557,6 +571,9 @@ $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',
     'Rate'                 => 'Velocita\'',
     'Real'                 => 'Reale',
@@ -644,6 +661,7 @@ $SLANG = array(
     'Submit'               => 'Accetta',
     'System'               => 'Sistema',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Anteprima',
     'Tilt'                 => 'Tilt',
@@ -678,13 +696,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Nessun aggiornamento necessario.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Usa Filtro',
     'UseFilterExprsPost'   => '&nbsp;espressioni&nbsp;filtri', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Usa&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Utente',
     'Username'             => 'Nome Utente',
     'Users'                => 'Utenti',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Valore',
     'Version'              => 'Versione',
     'VersionIgnore'        => 'Ignora questa versione',
@@ -724,6 +745,7 @@ $SLANG = array(
     'Zone'                 => 'Zona',
     'ZoneAlarmColour'      => 'Colore Allarme (RGB)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Larghezza/Altezza Filtro (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Area Allarmata',
     'ZoneMinMaxBlobArea'   => 'Min/Max Area di Blob',
@@ -732,7 +754,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Soglia Pixel (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zone',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Ingrandisci',
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index 89f19bb1d..9f0134f0a 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => '�װ� Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => '�x��',
     'All'                  => '�S��',
     'Apply'                => '�K�p',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'            => '����� ����',
     'Blobs'                => '�����',
     'Brightness'           => '�P�x',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => '�ޯ̧',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'        => '��荞�ݍ���',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => '��荞����گ�',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => '��荞�ݕ�',
     'Cause'                => 'Cause',
     'CheckMethod'          => '�װ� �������@',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => '���يώ@',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => '�폜',
     'DeleteAndNext'        => '�����폜',
     'DeleteAndPrev'        => '�O���폜',
     'DeleteSavedFilter'    => '�ۑ�̨����̍폜',
     'Description'          => '����',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => '���޲� �����',
     'DeviceFormat'         => '���޲� ̫�ϯ�',
@@ -257,6 +265,7 @@ $SLANG = array(
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => '�p������',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                 => '���荞��',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archive all matches',
     'FilterDeleteEvents'   => 'Delete all matches',
     'FilterEmailEvents'    => 'Email details of all matches',
     'FilterExecuteEvents'  => 'Execute command on all matches',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Message details of all matches',
     'FilterPx'             => '̨��� Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                => '�ŏ�',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => '�����װ�',
     'Format'               => 'Format',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'              => '�ڰ� ID',
     'FrameRate'            => '�ڰ�ڰ�',
     'FrameSkip'            => '�ڰѽ����',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => '�ڰ�',
     'Func'                 => '�@�\\',
     'Function'             => '�@�\\',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => '���̑�',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => '����',
     'MonitorIds'           => '���� ID',
     'MonitorPreset'        => 'Monitor Preset',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'              => '�����ޭ',
     'Month'                => '��',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => '�������ȏ�łȂ���΂����Ȃ�',
     'MustBeLe'             => '�������ȉ��łȂ���΂����Ȃ�',
     'MustConfirmPassword'  => '�p�X���[�h�̊m�F�����Ă�������',
@@ -506,6 +517,9 @@ $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
+    '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'                 => '�ȉ�',
     'OpGtEq'               => '�������ȏ�',
@@ -552,6 +566,9 @@ $SLANG = array(
     'Presets'              => 'Presets',
     'Prev'                 => '�O',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'ڰ�',
     'Real'                 => '�����p',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => '����',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => '�����ްĂ̕K�v�͂���܂���',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => '̨������g�p���Ă�������',
     'UseFilterExprsPost'   => '&nbsp;̨�����', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => '�w�肵�Ă�������:&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     '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'                => '���l',
     'Version'              => '�ް�ޮ�',
     'VersionIgnore'        => '�����ް�ޮ݂𖳎�',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                 => '�ް�',
     'ZoneAlarmColour'      => '�װ� �װ (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => '�ް�',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index 877fddec0..298521b6a 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -1,877 +1,904 @@
-<?php
-//
-// ZoneMinder web Dutch language file, $Date: 2011-06-21 10:19:10 +0100 (Tue, 21 Jun 2011) $, $Revision: 3459 $
-// 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-// ZoneMinder Dutch Translation by Alco (a.k. nightcrawler)
-
-// Notes for Translators
-// 0. Get some credit, put your name in the line above (optional)
-// 1. When composing the language tokens in your language you should try and keep to roughly the
-//   same length text if possible. Abbreviate where necessary as spacing is quite close in a number of places.
-// 2. There are four types of string replacement
-//   a) Simple replacements are words or short phrases that are static and used directly. This type of
-//     replacement can be used 'as is'.
-//   b) Complex replacements involve some dynamic element being included and so may require substitution
-//     or changing into a different order. The token listed in this file will be passed through sprintf as
-//     a formatting string. If the dynamic element is a number you will usually need to use a variable
-//     replacement also as described below.
-//   c) Variable replacements are used in conjunction with complex replacements and involve the generation
-//     of a singular or plural noun depending on the number passed into the zmVlang function. See the 
-//     the zmVlang section below for a further description of this.
-//   d) Optional strings which can be used to replace the prompts and/or help text for the Options section
-//     of the web interface. These are not listed below as they are quite large and held in the database
-//     so that they can also be used by the zmconfig.pl script. However you can build up your own list
-//     quite easily from the Config table in the database if necessary.
-// 3. The tokens listed below are not used to build up phrases or sentences from single words. Therefore
-//   you can safely assume that a single word token will only be used in that context.
-// 4. In new language files, or if you are changing only a few words or phrases it makes sense from a 
-//   maintenance point of view to include the original language file and override the old definitions rather
-//   than copy all the language tokens across. To do this change the line below to whatever your base language
-//   is and uncomment it.
-// require_once( 'zm_lang_en_gb.php' );
-
-// You may need to change the character set here, if your web server does not already
-// do this by default, uncomment this if required.
-//
-// Example
-// header( "Content-Type: text/html; charset=iso-8859-1" );
-
-// 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.
-// If you do need to change your locale, be aware that the format of this function
-// is subtlely different in versions of PHP before and after 4.3.0, see
-// http://uk2.php.net/manual/en/function.setlocale.php for details.
-// Also be aware that changing the whole locale may affect some floating point or decimal 
-// arithmetic in the database, if this is the case change only the individual locale areas
-// that don't affect this rather than all at once. See the examples below.
-// Finally, depending on your setup, PHP may not enjoy have multiple locales in a shared 
-// threaded environment, if you get funny errors it may be this.
-//
-// Examples
-// setlocale( 'LC_ALL', 'en_GB' ); All locale settings pre-4.3.0
-// setlocale( LC_ALL, 'en_GB' ); All locale settings 4.3.0 and after
-// setlocale( LC_CTYPE, 'en_GB' ); Character class settings 4.3.0 and after
-// setlocale( LC_TIME, 'en_GB' ); Date and time formatting 4.3.0 and after
-
-// Simple String Replacements
-$SLANG = array(
-    '24BitColour'          => '24 bits kleuren',
-    '8BitGrey'             => '8 bits grijstinten',
-    'Action'               => 'Actie',
-    'Actual'               => 'Aktueel',
-    'AddNewControl'        => 'Nieuwe controle toevoegen',
-    'AddNewMonitor'        => 'Nieuwe monitor toevoegen',
-    'AddNewUser'           => 'Nieuwe gebruiker toevoegen',
-    'AddNewZone'           => 'Nieuw gebied toevoegen',
-    'Alarm'                => 'Alarm',
-    'AlarmBrFrames'        => 'Alarm<br/>Frames',
-    'AlarmFrame'           => 'Alarm Frame',
-    'AlarmFrameCount'      => 'Alarm Frame Aantal',
-    'AlarmLimits'          => 'Alarm Limieten',
-    'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
-    'AlarmPx'              => 'Alarm Px',
-    'AlarmRGBUnset'        => 'U moet een RGB alarm kleur keizen',
-    'Alert'                => 'Waarschuwing',
-    'All'                  => 'Alle',
-    'Apply'                => 'Voer uit',
-    'ApplyingStateChange'  => 'Status verandering aan het uitvoeren',
-    'ArchArchived'         => 'Alleen gearchiveerd',
-    'ArchUnarchived'       => 'Alleen ongearchiveerd',
-    'Archive'              => 'Archief',
-    'Archived'             => 'Archived',
-    'Area'                 => 'Gebied',
-    'AreaUnits'            => 'Gebied (px/%)',
-    'AttrAlarmFrames'      => 'Alarm frames',
-    'AttrArchiveStatus'    => 'Archief status',
-    'AttrAvgScore'         => 'Gem. score',
-    'AttrCause'            => 'Oorzaak',
-    'AttrDate'             => 'Datum',
-    'AttrDateTime'         => 'Datum/tijd',
-    'AttrDiskBlocks'       => 'Disk Blocks',
-    'AttrDiskPercent'      => 'Disk Percent',
-    'AttrDuration'         => 'Duur',
-    'AttrFrames'           => 'Frames',
-    'AttrId'               => 'Id',
-    'AttrMaxScore'         => 'Max. Score',
-    'AttrMonitorId'        => 'Monitor Id',
-    'AttrMonitorName'      => 'Monitor Naam',
-    'AttrName'             => 'Naam',
-    'AttrNotes'            => 'Notities',
-    'AttrSystemLoad'       => 'System Belasting',
-    'AttrTime'             => 'Tijd',
-    'AttrTotalScore'       => 'Totale Score',
-    'AttrWeekday'          => 'Weekdag',
-    'Auto'                 => 'Auto',
-    'AutoStopTimeout'      => 'Auto Stop Timeout',
-    'Available'            => 'Beschikbaar',              // Added - 2009-03-31
-    'AvgBrScore'           => 'Gem.<br/>score',
-    'Background'           => 'Achtergrond',
-    'BackgroundFilter'     => 'Run filter in achtergrond',
-    'BadAlarmFrameCount'   => 'Alarm frame moet een getal zijn van 1 of meer',
-    'BadAlarmMaxFPS'       => 'Alarm Maximum FPS moet een positiev getal zijn of een floating point waarde',
-    'BadChannel'           => 'Kanaal moet een getal zijn van 1 of meer',
-    'BadDevice'            => 'Apparaat moet een bestaande waarde krijgen',
-    'BadFPSReportInterval' => 'FPS rapport interval buffer en aantal moet een nummer groter dan nul zijn',
-    'BadFormat'            => 'Formaat moet een nummer nul of groter zijn',
-    'BadFrameSkip'         => 'Frame skip aantal moet een nummer nul of groter zijn',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadHeight'            => 'Hoogte moet een geldige waarde zijn',
-    'BadHost'              => 'Host moet een juiste address or hostname zijn, laat http:// weg ',
-    'BadImageBufferCount'  => 'Foto buffer groote moet een nummer 10 of groter zijn',
-    'BadLabelX'            => 'Label X co-ordinate moet een nummer nul of groter zijn',
-    'BadLabelY'            => 'Label Y co-ordinate moet een nummer nul of groter zijn',
-    'BadMaxFPS'            => 'Maximum FPS moet een positieve integer of floating point waarde zijn',
-    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters bevatten plus hyphens en underscores',
-    'BadPalette'           => 'Palette moet een geldige waarde zijn', // Added - 2009-03-31
-    'BadPath'              => 'Pad  moet een geldige waarde zijn',
-    'BadPort'              => 'Port moet een geldige nummer zijn',
-    'BadPostEventCount'    => 'Post gebeurtenis foto aantal moet een geldige waarde van nul of groter zijn',
-    'BadPreEventCount'     => 'Pre gebeurtenis aantal moe minimaal nul en lager dan de buffert grote',
-    'BadRefBlendPerc'      => 'Reference blend percentage moet een geldige waarde van nul of groter zijn',
-    'BadSectionLength'     => 'Selectie lengte moet een integer van 30 of meer zijn',
-    'BadSignalCheckColour' => 'Signaal controle kleur moet een geldige RGB waarde zijn',
-    'BadStreamReplayBuffer'=> 'Stream replay buffer moet een geldige waarde van nul of groter zijn',
-    'BadWarmupCount'       => 'Warmop frames moet een geldige waarde van nul of groter zijn',
-    'BadWebColour'         => 'Web kleur moeten een geldige webkleurwaarde bevatten',
-    'BadWidth'             => 'Breedte moet ingevuld worden',
-    'Bandwidth'            => 'Bandbreedte',
-    '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 grootte',
-    'Blobs'                => 'Blobs',
-    'Brightness'           => 'Helderheid',
-    'Buffers'              => 'Buffers',
-    'CanAutoFocus'         => 'Can Auto Focus',
-    'CanAutoGain'          => 'Can Auto Gain',
-    'CanAutoIris'          => 'Can Auto Iris',
-    'CanAutoWhite'         => 'Can Auto White Bal.',
-    'CanAutoZoom'          => 'Can Auto Zoom',
-    'CanFocus'             => 'Can Focus',
-    'CanFocusAbs'          => 'Can Focus Absoluut',
-    'CanFocusCon'          => 'Can Focus Continue',
-    'CanFocusRel'          => 'Can Focus Relatief',
-    'CanGain'              => 'Can Gain ',
-    'CanGainAbs'           => 'Can Gain Absoluut',
-    'CanGainCon'           => 'Can Gain Continue',
-    'CanGainRel'           => 'Can Gain Relatief',
-    'CanIris'              => 'Can Iris',
-    'CanIrisAbs'           => 'Can Iris Absoluut',
-    'CanIrisCon'           => 'Can Iris Continue',
-    'CanIrisRel'           => 'Can Iris Relatief',
-    'CanMove'              => 'Can Move',
-    'CanMoveAbs'           => 'Can Move Absoluut',
-    'CanMoveCon'           => 'Can Move Continue',
-    'CanMoveDiag'          => 'Can Move Diagonaal',
-    'CanMoveMap'           => 'Can Move Mapped',
-    'CanMoveRel'           => 'Can Move Relatief',
-    'CanPan'               => 'Can Pan' ,
-    'CanReset'             => 'Can Reset',
-    'CanSetPresets'        => 'Can Set Presets',
-    'CanSleep'             => 'Can Sleep',
-    'CanTilt'              => 'Can Tilt',
-    'CanWake'              => 'Can Wake',
-    'CanWhite'             => 'Can White Balance',
-    'CanWhiteAbs'          => 'Can White Bal. Absoluut',
-    'CanWhiteBal'          => 'Can White Bal.',
-    'CanWhiteCon'          => 'Can White Bal. Continue',
-    'CanWhiteRel'          => 'Can White Bal. Relatief',
-    'CanZoom'              => 'Can Zoom',
-    'CanZoomAbs'           => 'Can Zoom Absoluut',
-    'CanZoomCon'           => 'Can Zoom Continue',
-    'CanZoomRel'           => 'Can Zoom Relatief',
-    'Cancel'               => 'Afbreken',
-    'CancelForcedAlarm'    => 'Afbreken geforceerd alarm',
-    'CaptureHeight'        => 'Opname hoogte',
-    'CaptureMethod'        => 'Opname Methode',         // Added - 2009-02-08
-    'CapturePalette'       => 'Opname pallet',
-    'CaptureWidth'         => 'Opname breedte',
-    'Cause'                => 'Oorzaak',
-    'CheckMethod'          => 'Alarm controle Methode',
-    'ChooseDetectedCamera' => 'Kies gedetecteerde Camera', // Added - 2009-03-31
-    'ChooseFilter'         => 'Kies filter',
-    'ChooseLogFormat'      => 'Kies en log formaat',    // Added - 2011-06-17
-    'ChooseLogSelection'   => 'Kies een log selectie', // Added - 2011-06-17
-    'ChoosePreset'         => 'Kies voorkeur',
-    'Clear'                => 'Leeg',                  // Added - 2011-06-16
-    'Close'                => 'Sluit',
-    'Colour'               => 'Kleur',
-    'Command'              => 'Commando',
-    'Component'            => 'Component',              // Added - 2011-06-16
-    'Config'               => 'Configuratie',
-    'ConfiguredFor'        => 'Geconfigureerd voor',
-    'ConfirmDeleteEvents'  => 'Weet uw zeker dat uw deze gebeurtenissen wil verwijderen?',
-    'ConfirmPassword'      => 'Bevestig wachtwoord',
-    'ConjAnd'              => 'en',
-    'ConjOr'               => 'of',
-    'Console'              => 'Console',
-    'ContactAdmin'         => 'Neem A.U.B. contact op met uw beheerder voor details.',
-    'Continue'             => 'Continue',
-    'Contrast'             => 'Contrast',
-    'Control'              => 'Bestuur',
-    'ControlAddress'       => 'Bestuur adres',
-    'ControlCap'           => 'Bestuur mogelijkheid',
-    'ControlCaps'          => 'Bestuur mogelijkheden',
-    'ControlDevice'        => 'Bestuur apparaat',
-    'ControlType'          => 'Bestuur Type',
-    'Controllable'         => 'Bestuurbaar',
-    'Cycle'                => 'Cyclus',
-    'CycleWatch'           => 'Observeer cyclus',
-    'DateTime'             => 'Datum/Tijd',              // Added - 2011-06-16
-    'Day'                  => 'Dag',
-    'Debug'                => 'Debug',
-    'DefaultRate'          => 'Standaard Radius',
-    'DefaultScale'         => 'Standaard Schaal',
-    'DefaultView'          => 'Standaard scherm',
-    'Delete'               => 'verwijder',
-    'DeleteAndNext'        => 'verwijder &amp; volgende',
-    'DeleteAndPrev'        => 'verwijder &amp; vorige',
-    'DeleteSavedFilter'    => 'verwijder opgeslagen filter',
-    'Description'          => 'Omschrijving',
-    'DetectedCameras'      => 'Gedetecteerde Cameras',       // Added - 2009-03-31
-    'Device'               => 'Apparaat',                 // Added - 2009-02-08
-    'DeviceChannel'        => 'Apparaat kanaal',
-    'DeviceFormat'         => 'Apparaat formaat',
-    'DeviceNumber'         => 'Apparaat nummer',
-    'DevicePath'           => 'Apparaat pad',
-    'Devices'              => 'Apparaten',
-    'Dimensions'           => 'Afmetingen',
-    'DisableAlarms'        => 'Alarmen uitschakelen',
-    'Disk'                 => 'Schijf',
-    'Display'              => 'Weergave',                // Added - 2011-01-30
-    'Displaying'           => 'Weergaven',             // Added - 2011-06-16
-    'Donate'               => 'A.U.B geef ons een donatie',
-    'DonateAlready'        => 'Nee, ik heb al gedoneerd',
-    'DonateEnticement'     => 'U gebruikt Zoneminder nu voor een geruime tijd, hopelijk vindt je het een nuttige toevoeging voor u huis of werkplek beveiliging. Natuurlijk is en blijft Zoneminder gratis en open source software. Maar het kost geld om te ontwikkelen en support te onderhouden. Ik vraag u dan ook om er over na te denken om een donatie te doen om zo de ontwikkeling en support te ondersteunen. Natuurlijk bent u hier vrij in, en elke donatie hoe klein dan ook wordt erg gewaardeerd. <br><br> Als u wilt donderen geef dat hier onder dan aan of ga naar http://www.zoneminder.com/dontate.html in uw browser.<br><br>Bedankt voor het gebruiken van Zoneminder en vergeet niet om ons forum op ZoneMinder.com te bezoeken voor ondersteuning of suggesties waarmee u ZoneMinder beleving nog beter wordt.',
-    'DonateRemindDay'      => 'Nu niet, herinner mij over 1 dag hieraan',
-    'DonateRemindHour'     => 'Nu niet, herinner mij over een uur hieraan',
-    'DonateRemindMonth'    => 'Nu niet, herinner mij over een maand hieraan',
-    'DonateRemindNever'    => 'Nee, ik hiervoor wil niet doneren',
-    'DonateRemindWeek'     => 'Nu niet, herinner mij over een week hieraan',
-    'DonateYes'            => 'Ja, ik wil nu doneren',
-    'Download'             => 'Download',
-    'DuplicateMonitorName' => 'Duplicaat Monitor Naam', // Added - 2009-03-31
-    'Duration'             => 'Duur',
-    'Edit'                 => 'Bewerk',
-    'Email'                => 'Email',
-    'EnableAlarms'         => 'Enable Alarms',
-    'Enabled'              => 'Ingeschakeld',
-    'EnterNewFilterName'   => 'Voer nieuwe filter naam in',
-    'Error'                => 'Fout',
-    'ErrorBrackets'        => 'Fout, controleer of je even veel openings als afsluiting brackets hebt gebruikt',
-    'ErrorValidValue'      => 'Fout, Controleer of alle termen een geldige waarde hebben',
-    'Etc'                  => 'etc',
-    'Event'                => 'Gebeurtenis',
-    'EventFilter'          => 'Gebeurtenis filter',
-    'EventId'              => 'Gebeurtenis Id',
-    'EventName'            => 'Gebeurtenis Name',
-    'EventPrefix'          => 'Gebeurtenis Prefix',
-    'Events'               => 'Gebeurtenissen',
-    'Exclude'              => 'Sluit uit',
-    'Execute'              => 'Execute',
-    'Export'               => 'Exporteer',
-    'ExportDetails'        => 'Exporteer Gebeurtenis Details',
-    'ExportFailed'         => 'Exporteer gefaald',
-    'ExportFormat'         => 'Exporteer File Formaat',
-    'ExportFormatTar'      => 'Tar',
-    'ExportFormatZip'      => 'Zip',
-    'ExportFrames'         => 'Exporteer Frame Details',
-    'ExportImageFiles'     => 'Exporteer foto bestanden',
-    'ExportLog'            => 'Exporteer Log',             // Added - 2011-06-17
-    'ExportMiscFiles'      => 'Exporteer andere bestanden (wanneer aanwezig)',
-    'ExportOptions'        => 'Exporteer Opties',
-    'ExportSucceeded'      => 'Exporteren geslaagd',       // Added - 2009-02-08
-    'ExportVideoFiles'     => 'Exporteer Video bestanden (wanneer aanwezig)',
-    'Exporting'            => 'Exporteerd',
-    'FPS'                  => 'fps',
-    'FPSReportInterval'    => 'FPS rapportage interval',
-    'FTP'                  => 'FTP',
-    'Far'                  => 'Far',
-    'FastForward'          => 'Snel vooruit',
-    'Feed'                 => 'toevoer',
-    'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
-    'File'                 => 'Bestand',
-    'FilterArchiveEvents'  => 'Archiveer alle overeenkomsten',
-    'FilterDeleteEvents'   => 'Verwijder alle overeenkomsten',
-    'FilterEmailEvents'    => 'Email de details van alle overeenkomsten',
-    'FilterExecuteEvents'  => 'Voer opdrachten op alle overeenkomsten uit',
-    'FilterMessageEvents'  => 'Bericht de details van alle overeenkomsten',
-    'FilterPx'             => 'Filter px',
-    'FilterUnset'          => 'Je moet de filter hoogte en breedte opgeven',
-    'FilterUploadEvents'   => 'Verstuur alle overeenkomsten',
-    'FilterVideoEvents'    => 'Maak video voor alle matches',
-    'Filters'              => 'Filters',
-    'First'                => 'Eerste',
-    'FlippedHori'          => 'Horizontaal gedraait',
-    'FlippedVert'          => 'Vertikaal gedraait',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
-    'FnMocord'              => 'Mocord',            // Added 2013.08.16.
-    'FnNodect'              => 'Nodect',            // Added 2013.08.16.
-    'Focus'                => 'Focus',
-    'ForceAlarm'           => 'Forceeer alarm',
-    'Format'               => 'Formaat',
-    'Frame'                => 'Frame',
-    'FrameId'              => 'Frame id',
-    'FrameRate'            => 'Frame rate',
-    'FrameSkip'            => 'Frame overgeslagen',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
-    'Frames'               => 'Frames',
-    'Func'                 => 'Func',
-    'Function'             => 'Functie',
-    'Gain'                 => 'Gain',
-    'General'              => 'Generiek',
-    'GenerateVideo'        => 'Genereer Video',
-    'GeneratingVideo'      => 'Genereren Video',
-    'GoToZoneMinder'       => 'Ga naar ZoneMinder.com',
-    'Grey'                 => 'Grijs',
-    'Group'                => 'Groep',
-    'Groups'               => 'Groepen',
-    'HasFocusSpeed'        => 'Heeft Focus Sneldheid',
-    'HasGainSpeed'         => 'Heeft Gain Snelheid',
-    'HasHomePreset'        => 'Heeft start Voorkeuren',
-    'HasIrisSpeed'         => 'Heeft Iris Snelheid',
-    'HasPanSpeed'          => 'Heeft Pan Snelheid',
-    'HasPresets'           => 'Heeft Voorkeuren',
-    'HasTiltSpeed'         => 'Heeft Tilt Snelheid',
-    'HasTurboPan'          => 'Heeft Turbo Pan',
-    'HasTurboTilt'         => 'Heeft Turbo Tilt',
-    'HasWhiteSpeed'        => 'Heeft White Bal. Snelheid',
-    'HasZoomSpeed'         => 'Heeft Zoom Snelheid',
-    'High'                 => 'Hoog',
-    'HighBW'               => 'Hoog&nbsp;B/W',
-    'Home'                 => 'Home',
-    'Hour'                 => 'Uur',
-    'Hue'                  => 'Hue',
-    'Id'                   => 'Id',
-    'Idle'                 => 'Ongebruikt',
-    'Ignore'               => 'Negeer',
-    'Image'                => 'Foto',
-    'ImageBufferSize'      => 'Foto buffer grootte (frames)',
-    'Images'               => 'Fotos',
-    'In'                   => 'In',
-    'Include'              => 'voeg in',
-    'Inverted'             => 'Omgedraaid',
-    'Iris'                 => 'Iris',
-    'KeyString'            => 'Sleutel waarde',
-    'Label'                => 'Label',
-    'Language'             => 'Taal',
-    'Last'                 => 'Laatste',
-    'Layout'               => 'Layout',                 // Added - 2009-02-08
-    'Level'                => 'Nivo',                  // Added - 2011-06-16
-    'Libvlc'               => 'Libvlc',
-    'LimitResultsPost'     => 'resultaten;', // This is used at the end of the phrase 'Limit to first N results only'
-    'LimitResultsPre'      => 'beperk tot eerste', // This is used at the beginning of the phrase 'Limit to first N results only'
-    'Line'                 => 'Lijn',                   // Added - 2011-06-16
-    'LinkedMonitors'       => 'Gekoppelde monitoren',
-    'List'                 => 'Lijst',
-    'Load'                 => 'Belasting',
-    'Local'                => 'Lokaal',
-    'Log'                  => 'Log',                    // Added - 2011-06-16
-    'LoggedInAs'           => 'Aangemeld als',
-    'Logging'              => 'Logging',                // Added - 2011-06-16
-    'LoggingIn'            => 'Aanmelden..',
-    'Login'                => 'Aanmelden',
-    'Logout'               => 'Afmelden',
-    'Logs'                 => 'Logs',                   // Added - 2011-06-17
-    'Low'                  => 'Laag',
-    'LowBW'                => 'Laag&nbsp;B/W',
-    'Main'                 => 'Main',
-    'Man'                  => 'Man',
-    'Manual'               => 'Handmatig',
-    'Mark'                 => 'Markeer',
-    'Max'                  => 'Max',
-    'MaxBandwidth'         => 'Max Bandbreedte',
-    'MaxBrScore'           => 'Max.<br/>score',
-    'MaxFocusRange'        => 'Max Focus Bereik',
-    'MaxFocusSpeed'        => 'Max Focus Snelheid',
-    'MaxFocusStep'         => 'Max Focus Stap',
-    'MaxGainRange'         => 'Max Gain Bereik',
-    'MaxGainSpeed'         => 'Max Gain Snelheid',
-    'MaxGainStep'          => 'Max Gain Stap',
-    'MaxIrisRange'         => 'Max Iris Bereik',
-    'MaxIrisSpeed'         => 'Max Iris Snelheid',
-    'MaxIrisStep'          => 'Max Iris Stap',
-    'MaxPanRange'          => 'Max Pan Bereik',
-    'MaxPanSpeed'          => 'Max Pan Snelheid',
-    'MaxPanStep'           => 'Max Pan Stap',
-    'MaxTiltRange'         => 'Max Tilt Bereik',
-    'MaxTiltSpeed'         => 'Max Tilt Snelheid',
-    'MaxTiltStep'          => 'Max Tilt Stap',
-    'MaxWhiteRange'        => 'Max White Bal. Bereik',
-    'MaxWhiteSpeed'        => 'Max White Bal. Snelheid',
-    'MaxWhiteStep'         => 'Max White Bal. Stap',
-    'MaxZoomRange'         => 'Max Zoom Bereik',
-    'MaxZoomSpeed'         => 'Max Zoom Snelheid',
-    'MaxZoomStep'          => 'Max Zoom Stap',
-    'MaximumFPS'           => 'Maximum FPS',
-    'Medium'               => 'Medium',
-    'MediumBW'             => 'Medium&nbsp;B/W',
-    'Message'              => 'Message',                // Added - 2011-06-16
-    'MinAlarmAreaLtMax'    => 'Minimum alarm moet kleiner dan het maximum',
-    'MinAlarmAreaUnset'    => 'Specificeer het minimaal aantal alarm pixels',
-    'MinBlobAreaLtMax'     => 'minimum blob gebied moet kleiner zijn dan maximum blob gebied',
-    'MinBlobAreaUnset'     => 'Specificeer het minimaal aantal blob pixels',
-    'MinBlobLtMinFilter'   => 'Minimum blob gebied moet kleiner of gelijk aan het minimale filter gebied zijn',
-    'MinBlobsLtMax'        => 'Minimum blobs moet kleiner zijn dan maximum blobs',
-    'MinBlobsUnset'        => 'Specificeer het minimaal blob aantal',
-    'MinFilterAreaLtMax'   => 'Minimum filter gebied moet minder dan het maximum zijn',
-    'MinFilterAreaUnset'   => 'Specificeer het minimaal aantal filter pixels',
-    'MinFilterLtMinAlarm'  => 'Minimum filter gebied moet kleiner of gelijk aan het minimale alarm gebied zijn',
-    'MinFocusRange'        => 'Min Focus Bereik',
-    'MinFocusSpeed'        => 'Min Focus Snelheid',
-    'MinFocusStep'         => 'Min Focus Step',
-    'MinGainRange'         => 'Min Gain Bereik',
-    'MinGainSpeed'         => 'Min Gain Snelheid',
-    'MinGainStep'          => 'Min Gain Step',
-    'MinIrisRange'         => 'Min Iris Bereik',
-    'MinIrisSpeed'         => 'Min Iris Snelheid',
-    'MinIrisStep'          => 'Min Iris Step',
-    'MinPanRange'          => 'Min Draai Bereik',
-    'MinPanSpeed'          => 'Min Draai Snelheid',
-    'MinPanStep'           => 'Min Draai Step',
-    'MinPixelThresLtMax'   => 'Minimum pixel kleurdiepte moet kleiner zijn dan maximum pixel bereikwaarde',
-    'MinPixelThresUnset'   => 'Specificeer een minimale pixel bereikwaarde',
-    'MinTiltRange'         => 'Min Tilt Bereik',
-    'MinTiltSpeed'         => 'Min Tilt Snelheid',
-    'MinTiltStep'          => 'Min Tilt Step',
-    'MinWhiteRange'        => 'Min White Bal. Bereik',
-    'MinWhiteSpeed'        => 'Min White Bal. Snelheid',
-    'MinWhiteStep'         => 'Min White Bal. Step',
-    'MinZoomRange'         => 'Min Zoom Bereik',
-    'MinZoomSpeed'         => 'Min Zoom Snelheid',
-    'MinZoomStep'          => 'Min Zoom Step',
-    'Misc'                 => 'Misc',
-    'Monitor'              => 'Monitor',
-    'MonitorIds'           => 'Monitor&nbsp;Ids',
-    'MonitorPreset'        => 'Monitor Preset',
-    'MonitorPresetIntro'   => 'Selecteer een preset uit de lijst.<br><br>let op dit overschrijft de reeds ingevoerde waarden voor deze monitor!<br><br>',
-    'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
-    'MonitorProbeIntro'    => 'Deze lijst toont gedeteerde analoge en netwerk cameras en of deze al ingebruik of beschikbaar zijn.<br/><br/>Selecteer de gewenste waarde uit de lijst hier beneden.<br/><br/>Let er op dat het mogelijk is dat niet alle cameras hier worden weer gegeven, en dat alle ingevoerde waarden voor de huidige monitor worden overschreven.<br/><br/>', // Added - 2009-03-31
-    'Monitors'             => 'Monitoren',
-    'Montage'              => 'Montage',
-    'Month'                => 'Maand',
-    'More'                 => 'Meer',                   // Added - 2011-06-16
-    'Move'                 => 'Verplaats',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
-    'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-wide grid',              // Added 2013.08.15.
-    'Mtg3widgrx'           => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
-    'MustBeGe'             => 'Moet groter zijn of gelijk aan',
-    'MustBeLe'             => 'Moet kleiner zijn of gelijk aan',
-    'MustConfirmPassword'  => 'Je moet je wachtwoord bevestigen',
-    'MustSupplyPassword'   => 'Je moet een wachtwoord geven',
-    'MustSupplyUsername'   => 'Je moet een gebruikersnaam geven',
-    'Name'                 => 'Naam',
-    'Near'                 => 'Dichtbij',
-    'Network'              => 'Netwerk',
-    'New'                  => 'Nieuw',
-    'NewGroup'             => 'Niew Groep',
-    'NewLabel'             => 'Niew Label',
-    'NewPassword'          => 'Nieuw wachtwoord',
-    'NewState'             => 'Nieuwe status',
-    'NewUser'              => 'Nieuwe gebruiker',
-    'Next'                 => 'Volgende',
-    'No'                   => 'Nee',
-    'NoDetectedCameras'    => 'Geen cameras gedeteceerd',    // Added - 2009-03-31
-    'NoFramesRecorded'     => 'Er zijn geen frames opgenomen voor deze gebeurtenis',
-    'NoGroup'              => 'Geeb Groep',
-    'NoSavedFilters'       => 'Geen Opgeslagen Filters',
-    'NoStatisticsRecorded' => 'Er zijn geen statistieken opgenomen voor deze gebeurenis',
-    'None'                 => 'Geen',
-    'NoneAvailable'        => 'Geen beschikbaar',
-    'Normal'               => 'Normaal',
-    'Notes'                => 'Notities',
-    'NumPresets'           => 'Num Voorkeuren',
-    'Off'                  => 'Uit',
-    'On'                   => 'Aan',
-    'OpEq'                 => 'gelijk aan',
-    'OpGt'                 => 'groter dan',
-    'OpGtEq'               => 'groter dan of gelijk aan',
-    'OpIn'                 => 'in set',
-    'OpLt'                 => 'kleiner dan',
-    'OpLtEq'               => 'kleiner dan of gelijk aan',
-    'OpMatches'            => 'Komt overeen',
-    'OpNe'                 => 'niet gelijk aan',
-    'OpNotIn'              => 'niet in set',
-    'OpNotMatches'         => 'Komt niet overeen',
-    'Open'                 => 'Open',
-    'OptionHelp'           => 'OptieHelp',
-    'OptionRestartWarning' => 'Deze veranderingen passen niet aan\nals het systeem loopt. Als je\nKlaar bent met veranderen vergeet dan niet dat\nje ZoneMinder herstart.',
-    'Options'              => 'Opties',
-    'OrEnterNewName'       => 'of voer een nieuwe naam in',
-    'Order'                => 'Sorteer',
-    'Orientation'          => 'Orientatie',
-    'Out'                  => 'Uit',
-    'OverwriteExisting'    => 'Overschrijf bestaande',
-    'Paged'                => 'Paged',
-    'Pan'                  => 'Pan',
-    'PanLeft'              => 'Pan Links',
-    'PanRight'             => 'Pan Rechts',
-    'PanTilt'              => 'Pan/Tilt',
-    'Parameter'            => 'Parameter',
-    'Password'             => 'Wachtwoord',
-    'PasswordsDifferent'   => 'Het nieuwe en bevestigde wachtwoord zijn verschillend',
-    'Paths'                => 'Paden',
-    'Pause'                => 'Pause',
-    'Phone'                => 'Telefoon',
-    'PhoneBW'              => 'Telefoon&nbsp;B/W',
-    'Pid'                  => 'PID',                    // Added - 2011-06-16
-    'PixelDiff'            => 'Pixel Diff',
-    'Pixels'               => 'pixels',
-    'Play'                 => 'Speel',
-    'PlayAll'              => 'Speel Alles',
-    'PleaseWait'           => 'Wacht A.U.B.',
-    'Point'                => 'Punt',
-    'PostEventImageBuffer' => 'Post gebeurtenis foto Buffer',
-    'PreEventImageBuffer'  => 'Pre gebeurtenis foto Buffer',
-    'PreserveAspect'       => 'Beeld verhouding bewaren',
-    'Preset'               => 'Voorkeur',
-    'Presets'              => 'Voorkeuren',
-    'Prev'                 => 'Vorige',
-    'Probe'                => 'Scan',                  // Added - 2009-03-31
-    'Protocol'             => 'Protocol',
-    'Rate'                 => 'Waardering',
-    'Real'                 => 'Echte',
-    'Record'               => 'Record',
-    'RefImageBlendPct'     => 'Referentie foto Blend %ge',
-    'Refresh'              => 'Ververs',
-    'Remote'               => 'Remote',
-    'RemoteHostName'       => 'Remote Host Naam',
-    'RemoteHostPath'       => 'Remote Host Pad',
-    'RemoteHostPort'       => 'Remote Host Poort',
-    'RemoteHostSubPath'    => 'Remote Host SubPad',    // Added - 2009-02-08
-    'RemoteImageColours'   => 'Remote foto kleuren',
-    'RemoteMethod'         => 'Remote Methode',          // Added - 2009-02-08
-    'RemoteProtocol'       => 'Remote Protocol',        // Added - 2009-02-08
-    'Rename'               => 'Hernoem',
-    'Replay'               => 'Opnieuw',
-    'ReplayAll'            => 'Alle Gebeurtenissen',
-    'ReplayGapless'        => 'Opvolgende Gebeurtenissen',
-    'ReplaySingle'         => 'Enkele Gebeurtenis',
-    'Reset'                => 'Herstel',
-    'ResetEventCounts'     => 'Herstel gebeurtenis teller',
-    'Restart'              => 'Herstart',
-    'Restarting'           => 'Herstarten',
-    'RestrictedCameraIds'  => 'Verboden Camera Ids',
-    'RestrictedMonitors'   => 'Beperkte Monitoren',
-    'ReturnDelay'          => 'Return Delay',
-    'ReturnLocation'       => 'Return Locatie',
-    'Rewind'               => 'Rewind',
-    'RotateLeft'           => 'Draai linksom',
-    'RotateRight'          => 'Draai rechtsom',
-    'RunLocalUpdate'       => 'Gebruik zmupdate.pl om up te daten', // Added - 2011-05-25
-    'RunMode'              => 'Draai Modus',
-    'RunState'             => 'Draai Status',
-    'Running'              => 'Werkend',
-    'Save'                 => 'Opslaan',
-    'SaveAs'               => 'Opslaan als',
-    'SaveFilter'           => 'Opslaan Filter',
-    'Scale'                => 'Schaal',
-    'Score'                => 'Score',
-    'Secs'                 => 'Secs',
-    'Sectionlength'        => 'Sectie lengte',
-    'Select'               => 'Selecteer',
-    'SelectFormat'         => 'Selecteer Formaat',          // Added - 2011-06-17
-    'SelectLog'            => 'Selecteer Log',             // Added - 2011-06-17
-    'SelectMonitors'       => 'Selecteer Monitoren',
-    'SelfIntersecting'     => 'Polygon randen moeten niet overlappen',
-    'Set'                  => 'Zet',
-    'SetNewBandwidth'      => 'Zet Nieuwe Bandbreedte',
-    'SetPreset'            => 'Zet Preset',
-    'Settings'             => 'Instellingen',
-    'ShowFilterWindow'     => 'Toon Filter Venster',
-    'ShowTimeline'         => 'Toon Tijdslijn',
-    'SignalCheckColour'    => 'Signaal controle kleur',
-    'Size'                 => 'Groote',
-    'SkinDescription'      => 'Wijzig standaard uiterlijk voor deze computer', // Added - 2011-01-30
-    'Sleep'                => 'Slaap',
-    'SortAsc'              => 'Opl.',
-    'SortBy'               => 'Sorteer op',
-    'SortDesc'             => 'Afl.',
-    'Source'               => 'Bron',
-    'SourceColours'        => 'Bron Colours',         // Added - 2009-02-08
-    'SourcePath'           => 'Bron Path',            // Added - 2009-02-08
-    'SourceType'           => 'Bron Type',
-    'Speed'                => 'Snelheid',
-    'SpeedHigh'            => 'Hoge Snelheid',
-    'SpeedLow'             => 'Lage Snelheid',
-    'SpeedMedium'          => 'Medium Snelheid',
-    'SpeedTurbo'           => 'Turbo Snelheid',
-    'Start'                => 'Start',
-    'State'                => 'Status',
-    'Stats'                => 'Stats',
-    'Status'               => 'Status',
-    'Step'                 => 'Stap',
-    'StepBack'             => 'Stap Terug',
-    'StepForward'          => 'Stap Vooruit',
-    'StepLarge'            => 'Groten stap',
-    'StepMedium'           => 'Medium Stap',
-    'StepNone'             => 'Geen Stap',
-    'StepSmall'            => 'Smalle Stap',
-    'Stills'               => 'Plaatjes',
-    'Stop'                 => 'Stop',
-    'Stopped'              => 'Gestopt',
-    'Stream'               => 'Stream',
-    'StreamReplayBuffer'   => 'Stream Replay foto Buffer',
-    'Submit'               => 'Verzenden',
-    'System'               => 'Systeem',
-    'SystemLog'            => 'Systeem Log',             // Added - 2011-06-16
-    'Tele'                 => 'Tele',
-    'Thumbnail'            => 'Thumbnail',
-    'Tilt'                 => 'Tilt',
-    'Time'                 => 'Tijd',
-    'TimeDelta'            => 'Tijd Delta',
-    'TimeStamp'            => 'Tijdstempel',
-    'Timeline'             => 'Tijdslijn',
-    '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'            => 'Tijdstempel',
-    'TimestampLabelFormat' => 'Tijdstempel Label Format',
-    'TimestampLabelX'      => 'Tijdstempel Label X',
-    'TimestampLabelY'      => 'Tijdstempel Label Y',
-    'Today'                => 'Vandaag',
-    'Tools'                => 'Gereedschappen',
-    'Total'                => 'Totaal',                  // Added - 2011-06-16
-    'TotalBrScore'         => 'Totaal<br/>Score',
-    'TrackDelay'           => 'Track Vertraging',
-    'TrackMotion'          => 'Track Beweging',
-    'Triggers'             => 'Triggers',
-    'TurboPanSpeed'        => 'Turbo Pan Snelheid',
-    'TurboTiltSpeed'       => 'Turbo Tilt Snelheid',
-    'Type'                 => 'Type',
-    'Unarchive'            => 'Dearchiveer',
-    'Undefined'            => 'Ongedefineerd',              // Added - 2009-02-08
-    'Units'                => 'Eenheden',
-    'Unknown'              => 'Onbekend',
-    'Update'               => 'Ververs',
-    'UpdateAvailable'      => 'Een update voor ZoneMinder is beschikbaar',
-    'UpdateNotNecessary'   => 'Geen update noodzakelijk',
-    'Updated'              => 'Ververst',                // Added - 2011-06-16
-    'UseFilter'            => 'Gebruik Filter',
-    'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressies', // This is used at the end of the phrase 'use N filter expressions'
-    'UseFilterExprsPre'    => 'Gebruik&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
-    'User'                 => 'Gebruiker',
-    'Username'             => 'Gebruikersnaam',
-    'Users'                => 'Gebruikers',
-    'Value'                => 'Waarde',
-    'Version'              => 'Versie',
-    'VersionIgnore'        => 'Negeer deze versie',
-    'VersionRemindDay'     => 'Herinner mij na 1 dag',
-    'VersionRemindHour'    => 'Herinner mij na 1 uur',
-    'VersionRemindNever'   => 'Herinner mij niet aan nieuwe versies',
-    'VersionRemindWeek'    => 'Herinner mij na 1 week',
-    'Video'                => 'Video',
-    'VideoFormat'          => 'Video Formaat',
-    'VideoGenFailed'       => 'Video Generatie mislukt!',
-    'VideoGenFiles'        => 'Bestaande video bestanden',
-    'VideoGenNoFiles'      => 'Geen video bestanden gevonden',
-    'VideoGenParms'        => 'Video Generatie Parameters',
-    'VideoGenSucceeded'    => 'Video Generatie voltooid!',
-    'VideoSize'            => 'Video grootte',
-    'View'                 => 'Bekijk',
-    'ViewAll'              => 'Bekijk Alles',
-    'ViewEvent'            => 'Bekijk Gebeurtenis',
-    'ViewPaged'            => 'Bekijk Pagina',
-    'Wake'                 => 'Wakker',
-    'WarmupFrames'         => 'Warmop Frames',
-    'Watch'                => 'Observeer',
-    'Web'                  => 'Web',
-    'WebColour'            => 'Web Kleur',
-    'Week'                 => 'Week',
-    'White'                => 'Wit',
-    'WhiteBalance'         => 'Wit Balance',
-    'Wide'                 => 'Wijd',
-    'X'                    => 'X',
-    'X10'                  => 'X10',
-    'X10ActivationString'  => 'X10 Activatie Waarde',
-    'X10InputAlarmString'  => 'X10 Input Alarm Waarde',
-    'X10OutputAlarmString' => 'X10 Output Alarm Waarde',
-    'Y'                    => 'Y',
-    'Yes'                  => 'Ja',
-    'YouNoPerms'           => 'U heeft niet de rechten om toegang te krijgen tot deze bronnen.',
-    'Zone'                 => 'Zone',
-    'ZoneAlarmColour'      => 'Alarm Kleur (Rood/Groen/Blauw)',
-    'ZoneArea'             => 'Zone Gebied',
-    'ZoneFilterSize'       => 'Filter Hoogte/Breedte (pixels)',
-    'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmeer Gebied',
-    'ZoneMinMaxBlobArea'   => 'Min/Max Blob Gebied',
-    'ZoneMinMaxBlobs'      => 'Min/Max Blobs',
-    'ZoneMinMaxFiltArea'   => 'Min/Max Gefilterd Gebied',
-    'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
-    'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
-    'ZoneOverloadFrames'   => 'Overload Frame negeer aantal',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
-    'Zones'                => 'Zones',
-    'Zoom'                 => 'Zoom',
-    'ZoomIn'               => 'Zoom In',
-    'ZoomOut'              => 'Zoom Uit',
-);
-
-// Complex replacements with formatting and/or placements, must be passed through sprintf
-$CLANG = array(
-    'CurrentLogin'         => 'huidige login is \'%1$s\'',
-    'EventCount'           => '%1$s %2$s', // Als voorbeeld '37 gebeurtenissen' (from Vlang below)
-    'LastEvents'           => 'Last %1$s %2$s', // Als voorbeeld 'Laatste 37 gebeurtenissen' (from Vlang below)
-    'LatestRelease'        => 'de laatste release is v%1$s, jij hebt v%2$s.',
-    'MonitorCount'         => '%1$s %2$s', // Als voorbeeld '4 Monitoren' (from Vlang below)
-    'MonitorFunction'      => 'Monitor %1$s Functie',
-    'RunningRecentVer'     => 'U draait al met de laatste versie van ZoneMinder, v%s.',
-    'VersionMismatch'      => 'Versie verschil, systeem is versie %1$s, database is %2$s.', // Added - 2011-05-25
-);
-
-// The next section allows you to describe a series of word ending and counts used to 
-// generate the correctly conjugated forms of words depending on a count that is associated
-// with that word.
-// This intended to allow phrases such a '0 potatoes', '1 potato', '2 potatoes' etc to
-// conjugate correctly with the associated count.
-// In some languages such as English this is fairly simple and can be expressed by assigning
-// a count with a singular or plural form of a word and then finding the nearest (lower) value.
-// So '0' of something generally ends in 's', 1 of something is singular and has no extra
-// ending and 2 or more is a plural and ends in 's' also. So to find the ending for '187' of
-// something you would find the nearest lower count (2) and use that ending.
-//
-// So examples of this would be
-// $zmVlangPotato = array( 0=>'Potatoes', 1=>'Potato', 2=>'Potatoes' );
-// $zmVlangSheep = array( 0=>'Sheep' );
-//
-// where you can have as few or as many entries in the array as necessary
-// If your language is similar in form to this then use the same format and choose the
-// appropriate zmVlang function below.
-// If however you have a language with a different format of plural endings then another
-// approach is required . For instance in Russian the word endings change continuously
-// depending on the last digit (or digits) of the numerator. In this case then zmVlang
-// arrays could be written so that the array index just represents an arbitrary 'type'
-// and the zmVlang function does the calculation about which version is appropriate.
-//
-// So an example in Russian might be (using English words, and made up endings as I
-// don't know any Russian!!)
-// $zmVlangPotato = array( 1=>'Potati', 2=>'Potaton', 3=>'Potaten' );
-//
-// and the zmVlang function decides that the first form is used for counts ending in
-// 0, 5-9 or 11-19 and the second form when ending in 1 etc.
-//
-
-// Variable arrays expressing plurality, see the zmVlang description above
-$VLANG = array(
-    'Event'                => array( 0=>'gebeurtenissen', 1=>'gebeurtenis', 2=>'gebeurtenissen' ),
-    'Monitor'              => array( 0=>'Monitoren', 1=>'Monitor', 2=>'Monitoren' ),
-);
-
-// You will need to choose or write a function that can correlate the plurality string arrays
-// with variable counts. This is used to conjugate the Vlang arrays above with a number passed
-// in to generate the correct noun form.
-//
-// In languages such as English this is fairly simple 
-// Note this still has to be used with printf etc to get the right formating
-function zmVlang( $langVarArray, $count )
-{
-    krsort( $langVarArray );
-    foreach ( $langVarArray as $key=>$value )
-    {
-        if ( abs($count) >= $key )
-        {
-            return( $value );
-        }
-    }
-    die( 'Error, unable to correlate variable language string' );
-}
-
-// This is an version that could be used in the Russian example above
-// The rules are that the first word form is used if the count ends in
-// 0, 5-9 or 11-19. The second form is used then the count ends in 1
-// (not including 11 as above) and the third form is used when the 
-// count ends in 2-4, again excluding any values ending in 12-14.
-// 
-// function zmVlang( $langVarArray, $count )
-// {
-//  $secondlastdigit = substr( $count, -2, 1 );
-//  $lastdigit = substr( $count, -1, 1 );
-//  // or
-//  // $secondlastdigit = ($count/10)%10;
-//  // $lastdigit = $count%10;
-// 
-//  // Get rid of the special cases first, the teens
-//  if ( $secondlastdigit == 1 && $lastdigit != 0 )
-//  {
-//      return( $langVarArray[1] );
-//  }
-//  switch ( $lastdigit )
-//  {
-//      case 0 :
-//      case 5 :
-//      case 6 :
-//      case 7 :
-//      case 8 :
-//      case 9 :
-//      {
-//          return( $langVarArray[1] );
-//          break;
-//      }
-//      case 1 :
-//      {
-//          return( $langVarArray[2] );
-//          break;
-//      }
-//      case 2 :
-//      case 3 :
-//      case 4 :
-//      {
-//          return( $langVarArray[3] );
-//          break;
-//      }
-//  }
-//  die( 'Error, unable to correlate variable language string' );
-// }
-
-// This is an example of how the function is used in the code which you can uncomment and 
-// use to test your custom function.
-//$monitors = array();
-//$monitors[] = 1; // Choose any number
-//echo sprintf( $zmClangMonitorCount, count($monitors), zmVlang( $zmVlangMonitor, count($monitors) ) );
-
-// In this section you can override the default prompt and help texts for the options area
-// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
-// So for example, to override the help text for ZM_LANG_DEFAULT do
-$OLANG = array(
-	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
-		          "Examples (do not enter quotes)~~~~".
-		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
-		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
-	),
-	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
-		          "Examples (do not enter quotes)~~~~".
-		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
-		          "\"--verbose=2\" Set verbosity of libVLC"
-	),
-	
-//    'LANG_DEFAULT' => array(
-//        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
-//    ),
-);
-
-?>
+<?php
+//
+// ZoneMinder web Dutch language file, $Date: 2011-06-21 10:19:10 +0100 (Tue, 21 Jun 2011) $, $Revision: 3459 $
+// 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+// ZoneMinder Dutch Translation by Alco (a.k. nightcrawler)
+
+// Notes for Translators
+// 0. Get some credit, put your name in the line above (optional)
+// 1. When composing the language tokens in your language you should try and keep to roughly the
+//   same length text if possible. Abbreviate where necessary as spacing is quite close in a number of places.
+// 2. There are four types of string replacement
+//   a) Simple replacements are words or short phrases that are static and used directly. This type of
+//     replacement can be used 'as is'.
+//   b) Complex replacements involve some dynamic element being included and so may require substitution
+//     or changing into a different order. The token listed in this file will be passed through sprintf as
+//     a formatting string. If the dynamic element is a number you will usually need to use a variable
+//     replacement also as described below.
+//   c) Variable replacements are used in conjunction with complex replacements and involve the generation
+//     of a singular or plural noun depending on the number passed into the zmVlang function. See the 
+//     the zmVlang section below for a further description of this.
+//   d) Optional strings which can be used to replace the prompts and/or help text for the Options section
+//     of the web interface. These are not listed below as they are quite large and held in the database
+//     so that they can also be used by the zmconfig.pl script. However you can build up your own list
+//     quite easily from the Config table in the database if necessary.
+// 3. The tokens listed below are not used to build up phrases or sentences from single words. Therefore
+//   you can safely assume that a single word token will only be used in that context.
+// 4. In new language files, or if you are changing only a few words or phrases it makes sense from a 
+//   maintenance point of view to include the original language file and override the old definitions rather
+//   than copy all the language tokens across. To do this change the line below to whatever your base language
+//   is and uncomment it.
+// require_once( 'zm_lang_en_gb.php' );
+
+// You may need to change the character set here, if your web server does not already
+// do this by default, uncomment this if required.
+//
+// Example
+// header( "Content-Type: text/html; charset=iso-8859-1" );
+
+// 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.
+// If you do need to change your locale, be aware that the format of this function
+// is subtlely different in versions of PHP before and after 4.3.0, see
+// http://uk2.php.net/manual/en/function.setlocale.php for details.
+// Also be aware that changing the whole locale may affect some floating point or decimal 
+// arithmetic in the database, if this is the case change only the individual locale areas
+// that don't affect this rather than all at once. See the examples below.
+// Finally, depending on your setup, PHP may not enjoy have multiple locales in a shared 
+// threaded environment, if you get funny errors it may be this.
+//
+// Examples
+// setlocale( 'LC_ALL', 'en_GB' ); All locale settings pre-4.3.0
+// setlocale( LC_ALL, 'en_GB' ); All locale settings 4.3.0 and after
+// setlocale( LC_CTYPE, 'en_GB' ); Character class settings 4.3.0 and after
+// setlocale( LC_TIME, 'en_GB' ); Date and time formatting 4.3.0 and after
+
+// Simple String Replacements
+$SLANG = array(
+    '24BitColour'          => '24 bits kleuren',
+    '32BitColour'          => '32 bit colour',          // Added - 2015-04-18
+    '8BitGrey'             => '8 bits grijstinten',
+    'Action'               => 'Actie',
+    'Actual'               => 'Aktueel',
+    'AddNewControl'        => 'Nieuwe controle toevoegen',
+    'AddNewMonitor'        => 'Nieuwe monitor toevoegen',
+    'AddNewUser'           => 'Nieuwe gebruiker toevoegen',
+    'AddNewZone'           => 'Nieuw gebied toevoegen',
+    'Alarm'                => 'Alarm',
+    'AlarmBrFrames'        => 'Alarm<br/>Frames',
+    'AlarmFrame'           => 'Alarm Frame',
+    'AlarmFrameCount'      => 'Alarm Frame Aantal',
+    'AlarmLimits'          => 'Alarm Limieten',
+    'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
+    'AlarmPx'              => 'Alarm Px',
+    'AlarmRGBUnset'        => 'U moet een RGB alarm kleur keizen',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
+    'Alert'                => 'Waarschuwing',
+    'All'                  => 'Alle',
+    'Apply'                => 'Voer uit',
+    'ApplyingStateChange'  => 'Status verandering aan het uitvoeren',
+    'ArchArchived'         => 'Alleen gearchiveerd',
+    'ArchUnarchived'       => 'Alleen ongearchiveerd',
+    'Archive'              => 'Archief',
+    'Archived'             => 'Archived',
+    'Area'                 => 'Gebied',
+    'AreaUnits'            => 'Gebied (px/%)',
+    'AttrAlarmFrames'      => 'Alarm frames',
+    'AttrArchiveStatus'    => 'Archief status',
+    'AttrAvgScore'         => 'Gem. score',
+    'AttrCause'            => 'Oorzaak',
+    'AttrDate'             => 'Datum',
+    'AttrDateTime'         => 'Datum/tijd',
+    'AttrDiskBlocks'       => 'Disk Blocks',
+    'AttrDiskPercent'      => 'Disk Percent',
+    'AttrDuration'         => 'Duur',
+    'AttrFrames'           => 'Frames',
+    'AttrId'               => 'Id',
+    'AttrMaxScore'         => 'Max. Score',
+    'AttrMonitorId'        => 'Monitor Id',
+    'AttrMonitorName'      => 'Monitor Naam',
+    'AttrName'             => 'Naam',
+    'AttrNotes'            => 'Notities',
+    'AttrSystemLoad'       => 'System Belasting',
+    'AttrTime'             => 'Tijd',
+    'AttrTotalScore'       => 'Totale Score',
+    'AttrWeekday'          => 'Weekdag',
+    'Auto'                 => 'Auto',
+    'AutoStopTimeout'      => 'Auto Stop Timeout',
+    'Available'            => 'Beschikbaar',              // Added - 2009-03-31
+    'AvgBrScore'           => 'Gem.<br/>score',
+    'Background'           => 'Achtergrond',
+    'BackgroundFilter'     => 'Run filter in achtergrond',
+    'BadAlarmFrameCount'   => 'Alarm frame moet een getal zijn van 1 of meer',
+    'BadAlarmMaxFPS'       => 'Alarm Maximum FPS moet een positiev getal zijn of een floating point waarde',
+    'BadChannel'           => 'Kanaal moet een getal zijn van 1 of meer',
+    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2015-04-18
+    'BadDevice'            => 'Apparaat moet een bestaande waarde krijgen',
+    'BadFPSReportInterval' => 'FPS rapport interval buffer en aantal moet een nummer groter dan nul zijn',
+    'BadFormat'            => 'Formaat moet een nummer nul of groter zijn',
+    'BadFrameSkip'         => 'Frame skip aantal moet een nummer nul of groter zijn',
+    'BadHeight'            => 'Hoogte moet een geldige waarde zijn',
+    'BadHost'              => 'Host moet een juiste address or hostname zijn, laat http:// weg ',
+    'BadImageBufferCount'  => 'Foto buffer groote moet een nummer 10 of groter zijn',
+    'BadLabelX'            => 'Label X co-ordinate moet een nummer nul of groter zijn',
+    'BadLabelY'            => 'Label Y co-ordinate moet een nummer nul of groter zijn',
+    'BadMaxFPS'            => 'Maximum FPS moet een positieve integer of floating point waarde zijn',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
+    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters bevatten plus hyphens en underscores',
+    'BadPalette'           => 'Palette moet een geldige waarde zijn', // Added - 2009-03-31
+    'BadPath'              => 'Pad  moet een geldige waarde zijn',
+    'BadPort'              => 'Port moet een geldige nummer zijn',
+    'BadPostEventCount'    => 'Post gebeurtenis foto aantal moet een geldige waarde van nul of groter zijn',
+    'BadPreEventCount'     => 'Pre gebeurtenis aantal moe minimaal nul en lager dan de buffert grote',
+    'BadRefBlendPerc'      => 'Reference blend percentage moet een geldige waarde van nul of groter zijn',
+    'BadSectionLength'     => 'Selectie lengte moet een integer van 30 of meer zijn',
+    'BadSignalCheckColour' => 'Signaal controle kleur moet een geldige RGB waarde zijn',
+    'BadStreamReplayBuffer'=> 'Stream replay buffer moet een geldige waarde van nul of groter zijn',
+    'BadWarmupCount'       => 'Warmop frames moet een geldige waarde van nul of groter zijn',
+    'BadWebColour'         => 'Web kleur moeten een geldige webkleurwaarde bevatten',
+    'BadWidth'             => 'Breedte moet ingevuld worden',
+    'Bandwidth'            => 'Bandbreedte',
+    '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 grootte',
+    'Blobs'                => 'Blobs',
+    'Brightness'           => 'Helderheid',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
+    'Buffers'              => 'Buffers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
+    'CanAutoFocus'         => 'Can Auto Focus',
+    'CanAutoGain'          => 'Can Auto Gain',
+    'CanAutoIris'          => 'Can Auto Iris',
+    'CanAutoWhite'         => 'Can Auto White Bal.',
+    'CanAutoZoom'          => 'Can Auto Zoom',
+    'CanFocus'             => 'Can Focus',
+    'CanFocusAbs'          => 'Can Focus Absoluut',
+    'CanFocusCon'          => 'Can Focus Continue',
+    'CanFocusRel'          => 'Can Focus Relatief',
+    'CanGain'              => 'Can Gain ',
+    'CanGainAbs'           => 'Can Gain Absoluut',
+    'CanGainCon'           => 'Can Gain Continue',
+    'CanGainRel'           => 'Can Gain Relatief',
+    'CanIris'              => 'Can Iris',
+    'CanIrisAbs'           => 'Can Iris Absoluut',
+    'CanIrisCon'           => 'Can Iris Continue',
+    'CanIrisRel'           => 'Can Iris Relatief',
+    'CanMove'              => 'Can Move',
+    'CanMoveAbs'           => 'Can Move Absoluut',
+    'CanMoveCon'           => 'Can Move Continue',
+    'CanMoveDiag'          => 'Can Move Diagonaal',
+    'CanMoveMap'           => 'Can Move Mapped',
+    'CanMoveRel'           => 'Can Move Relatief',
+    'CanPan'               => 'Can Pan' ,
+    'CanReset'             => 'Can Reset',
+    'CanSetPresets'        => 'Can Set Presets',
+    'CanSleep'             => 'Can Sleep',
+    'CanTilt'              => 'Can Tilt',
+    'CanWake'              => 'Can Wake',
+    'CanWhite'             => 'Can White Balance',
+    'CanWhiteAbs'          => 'Can White Bal. Absoluut',
+    'CanWhiteBal'          => 'Can White Bal.',
+    'CanWhiteCon'          => 'Can White Bal. Continue',
+    'CanWhiteRel'          => 'Can White Bal. Relatief',
+    'CanZoom'              => 'Can Zoom',
+    'CanZoomAbs'           => 'Can Zoom Absoluut',
+    'CanZoomCon'           => 'Can Zoom Continue',
+    'CanZoomRel'           => 'Can Zoom Relatief',
+    'Cancel'               => 'Afbreken',
+    'CancelForcedAlarm'    => 'Afbreken geforceerd alarm',
+    'CaptureHeight'        => 'Opname hoogte',
+    'CaptureMethod'        => 'Opname Methode',         // Added - 2009-02-08
+    'CapturePalette'       => 'Opname pallet',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
+    'CaptureWidth'         => 'Opname breedte',
+    'Cause'                => 'Oorzaak',
+    'CheckMethod'          => 'Alarm controle Methode',
+    'ChooseDetectedCamera' => 'Kies gedetecteerde Camera', // Added - 2009-03-31
+    'ChooseFilter'         => 'Kies filter',
+    'ChooseLogFormat'      => 'Kies en log formaat',    // Added - 2011-06-17
+    'ChooseLogSelection'   => 'Kies een log selectie', // Added - 2011-06-17
+    'ChoosePreset'         => 'Kies voorkeur',
+    'Clear'                => 'Leeg',                  // Added - 2011-06-16
+    'Close'                => 'Sluit',
+    'Colour'               => 'Kleur',
+    'Command'              => 'Commando',
+    'Component'            => 'Component',              // Added - 2011-06-16
+    'Config'               => 'Configuratie',
+    'ConfiguredFor'        => 'Geconfigureerd voor',
+    'ConfirmDeleteEvents'  => 'Weet uw zeker dat uw deze gebeurtenissen wil verwijderen?',
+    'ConfirmPassword'      => 'Bevestig wachtwoord',
+    'ConjAnd'              => 'en',
+    'ConjOr'               => 'of',
+    'Console'              => 'Console',
+    'ContactAdmin'         => 'Neem A.U.B. contact op met uw beheerder voor details.',
+    'Continue'             => 'Continue',
+    'Contrast'             => 'Contrast',
+    'Control'              => 'Bestuur',
+    'ControlAddress'       => 'Bestuur adres',
+    'ControlCap'           => 'Bestuur mogelijkheid',
+    'ControlCaps'          => 'Bestuur mogelijkheden',
+    'ControlDevice'        => 'Bestuur apparaat',
+    'ControlType'          => 'Bestuur Type',
+    'Controllable'         => 'Bestuurbaar',
+    'Current'              => 'Current',                // Added - 2015-04-18
+    'Cycle'                => 'Cyclus',
+    'CycleWatch'           => 'Observeer cyclus',
+    'DateTime'             => 'Datum/Tijd',              // Added - 2011-06-16
+    'Day'                  => 'Dag',
+    'Debug'                => 'Debug',
+    'DefaultRate'          => 'Standaard Radius',
+    'DefaultScale'         => 'Standaard Schaal',
+    'DefaultView'          => 'Standaard scherm',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
+    'Delete'               => 'verwijder',
+    'DeleteAndNext'        => 'verwijder &amp; volgende',
+    'DeleteAndPrev'        => 'verwijder &amp; vorige',
+    'DeleteSavedFilter'    => 'verwijder opgeslagen filter',
+    'Description'          => 'Omschrijving',
+    'DetectedCameras'      => 'Gedetecteerde Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
+    'Device'               => 'Apparaat',                 // Added - 2009-02-08
+    'DeviceChannel'        => 'Apparaat kanaal',
+    'DeviceFormat'         => 'Apparaat formaat',
+    'DeviceNumber'         => 'Apparaat nummer',
+    'DevicePath'           => 'Apparaat pad',
+    'Devices'              => 'Apparaten',
+    'Dimensions'           => 'Afmetingen',
+    'DisableAlarms'        => 'Alarmen uitschakelen',
+    'Disk'                 => 'Schijf',
+    'Display'              => 'Weergave',                // Added - 2011-01-30
+    'Displaying'           => 'Weergaven',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection', // Added - 2015-04-18
+    'Donate'               => 'A.U.B geef ons een donatie',
+    'DonateAlready'        => 'Nee, ik heb al gedoneerd',
+    'DonateEnticement'     => 'U gebruikt Zoneminder nu voor een geruime tijd, hopelijk vindt je het een nuttige toevoeging voor u huis of werkplek beveiliging. Natuurlijk is en blijft Zoneminder gratis en open source software. Maar het kost geld om te ontwikkelen en support te onderhouden. Ik vraag u dan ook om er over na te denken om een donatie te doen om zo de ontwikkeling en support te ondersteunen. Natuurlijk bent u hier vrij in, en elke donatie hoe klein dan ook wordt erg gewaardeerd. <br><br> Als u wilt donderen geef dat hier onder dan aan of ga naar http://www.zoneminder.com/dontate.html in uw browser.<br><br>Bedankt voor het gebruiken van Zoneminder en vergeet niet om ons forum op ZoneMinder.com te bezoeken voor ondersteuning of suggesties waarmee u ZoneMinder beleving nog beter wordt.',
+    'DonateRemindDay'      => 'Nu niet, herinner mij over 1 dag hieraan',
+    'DonateRemindHour'     => 'Nu niet, herinner mij over een uur hieraan',
+    'DonateRemindMonth'    => 'Nu niet, herinner mij over een maand hieraan',
+    'DonateRemindNever'    => 'Nee, ik hiervoor wil niet doneren',
+    'DonateRemindWeek'     => 'Nu niet, herinner mij over een week hieraan',
+    'DonateYes'            => 'Ja, ik wil nu doneren',
+    'Download'             => 'Download',
+    'DuplicateMonitorName' => 'Duplicaat Monitor Naam', // Added - 2009-03-31
+    'Duration'             => 'Duur',
+    'Edit'                 => 'Bewerk',
+    'Email'                => 'Email',
+    'EnableAlarms'         => 'Enable Alarms',
+    'Enabled'              => 'Ingeschakeld',
+    'EnterNewFilterName'   => 'Voer nieuwe filter naam in',
+    'Error'                => 'Fout',
+    'ErrorBrackets'        => 'Fout, controleer of je even veel openings als afsluiting brackets hebt gebruikt',
+    'ErrorValidValue'      => 'Fout, Controleer of alle termen een geldige waarde hebben',
+    'Etc'                  => 'etc',
+    'Event'                => 'Gebeurtenis',
+    'EventFilter'          => 'Gebeurtenis filter',
+    'EventId'              => 'Gebeurtenis Id',
+    'EventName'            => 'Gebeurtenis Name',
+    'EventPrefix'          => 'Gebeurtenis Prefix',
+    'Events'               => 'Gebeurtenissen',
+    'Exclude'              => 'Sluit uit',
+    'Execute'              => 'Execute',
+    'Export'               => 'Exporteer',
+    'ExportDetails'        => 'Exporteer Gebeurtenis Details',
+    'ExportFailed'         => 'Exporteer gefaald',
+    'ExportFormat'         => 'Exporteer File Formaat',
+    'ExportFormatTar'      => 'Tar',
+    'ExportFormatZip'      => 'Zip',
+    'ExportFrames'         => 'Exporteer Frame Details',
+    'ExportImageFiles'     => 'Exporteer foto bestanden',
+    'ExportLog'            => 'Exporteer Log',             // Added - 2011-06-17
+    'ExportMiscFiles'      => 'Exporteer andere bestanden (wanneer aanwezig)',
+    'ExportOptions'        => 'Exporteer Opties',
+    'ExportSucceeded'      => 'Exporteren geslaagd',       // Added - 2009-02-08
+    'ExportVideoFiles'     => 'Exporteer Video bestanden (wanneer aanwezig)',
+    'Exporting'            => 'Exporteerd',
+    'FPS'                  => 'fps',
+    'FPSReportInterval'    => 'FPS rapportage interval',
+    'FTP'                  => 'FTP',
+    'Far'                  => 'Far',
+    'FastForward'          => 'Snel vooruit',
+    'Feed'                 => 'toevoer',
+    'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
+    'File'                 => 'Bestand',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
+    'FilterArchiveEvents'  => 'Archiveer alle overeenkomsten',
+    'FilterDeleteEvents'   => 'Verwijder alle overeenkomsten',
+    'FilterEmailEvents'    => 'Email de details van alle overeenkomsten',
+    'FilterExecuteEvents'  => 'Voer opdrachten op alle overeenkomsten uit',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
+    'FilterMessageEvents'  => 'Bericht de details van alle overeenkomsten',
+    'FilterPx'             => 'Filter px',
+    'FilterUnset'          => 'Je moet de filter hoogte en breedte opgeven',
+    'FilterUploadEvents'   => 'Verstuur alle overeenkomsten',
+    'FilterVideoEvents'    => 'Maak video voor alle matches',
+    'Filters'              => 'Filters',
+    'First'                => 'Eerste',
+    'FlippedHori'          => 'Horizontaal gedraait',
+    'FlippedVert'          => 'Vertikaal gedraait',
+    'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
+    'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
+    'Focus'                => 'Focus',
+    'ForceAlarm'           => 'Forceeer alarm',
+    'Format'               => 'Formaat',
+    'Frame'                => 'Frame',
+    'FrameId'              => 'Frame id',
+    'FrameRate'            => 'Frame rate',
+    'FrameSkip'            => 'Frame overgeslagen',
+    'Frames'               => 'Frames',
+    'Func'                 => 'Func',
+    'Function'             => 'Functie',
+    'Gain'                 => 'Gain',
+    'General'              => 'Generiek',
+    'GenerateVideo'        => 'Genereer Video',
+    'GeneratingVideo'      => 'Genereren Video',
+    'GoToZoneMinder'       => 'Ga naar ZoneMinder.com',
+    'Grey'                 => 'Grijs',
+    'Group'                => 'Groep',
+    'Groups'               => 'Groepen',
+    'HasFocusSpeed'        => 'Heeft Focus Sneldheid',
+    'HasGainSpeed'         => 'Heeft Gain Snelheid',
+    'HasHomePreset'        => 'Heeft start Voorkeuren',
+    'HasIrisSpeed'         => 'Heeft Iris Snelheid',
+    'HasPanSpeed'          => 'Heeft Pan Snelheid',
+    'HasPresets'           => 'Heeft Voorkeuren',
+    'HasTiltSpeed'         => 'Heeft Tilt Snelheid',
+    'HasTurboPan'          => 'Heeft Turbo Pan',
+    'HasTurboTilt'         => 'Heeft Turbo Tilt',
+    'HasWhiteSpeed'        => 'Heeft White Bal. Snelheid',
+    'HasZoomSpeed'         => 'Heeft Zoom Snelheid',
+    'High'                 => 'Hoog',
+    'HighBW'               => 'Hoog&nbsp;B/W',
+    'Home'                 => 'Home',
+    'Hour'                 => 'Uur',
+    'Hue'                  => 'Hue',
+    'Id'                   => 'Id',
+    'Idle'                 => 'Ongebruikt',
+    'Ignore'               => 'Negeer',
+    'Image'                => 'Foto',
+    'ImageBufferSize'      => 'Foto buffer grootte (frames)',
+    'Images'               => 'Fotos',
+    'In'                   => 'In',
+    'Include'              => 'voeg in',
+    'Inverted'             => 'Omgedraaid',
+    'Iris'                 => 'Iris',
+    'KeyString'            => 'Sleutel waarde',
+    'Label'                => 'Label',
+    'Language'             => 'Taal',
+    'Last'                 => 'Laatste',
+    'Layout'               => 'Layout',                 // Added - 2009-02-08
+    'Level'                => 'Nivo',                  // Added - 2011-06-16
+    'Libvlc'               => 'Libvlc',
+    'LimitResultsPost'     => 'resultaten;', // This is used at the end of the phrase 'Limit to first N results only'
+    'LimitResultsPre'      => 'beperk tot eerste', // This is used at the beginning of the phrase 'Limit to first N results only'
+    'Line'                 => 'Lijn',                   // Added - 2011-06-16
+    'LinkedMonitors'       => 'Gekoppelde monitoren',
+    'List'                 => 'Lijst',
+    'Load'                 => 'Belasting',
+    'Local'                => 'Lokaal',
+    'Log'                  => 'Log',                    // Added - 2011-06-16
+    'LoggedInAs'           => 'Aangemeld als',
+    'Logging'              => 'Logging',                // Added - 2011-06-16
+    'LoggingIn'            => 'Aanmelden..',
+    'Login'                => 'Aanmelden',
+    'Logout'               => 'Afmelden',
+    'Logs'                 => 'Logs',                   // Added - 2011-06-17
+    'Low'                  => 'Laag',
+    'LowBW'                => 'Laag&nbsp;B/W',
+    'Main'                 => 'Main',
+    'Man'                  => 'Man',
+    'Manual'               => 'Handmatig',
+    'Mark'                 => 'Markeer',
+    'Max'                  => 'Max',
+    'MaxBandwidth'         => 'Max Bandbreedte',
+    'MaxBrScore'           => 'Max.<br/>score',
+    'MaxFocusRange'        => 'Max Focus Bereik',
+    'MaxFocusSpeed'        => 'Max Focus Snelheid',
+    'MaxFocusStep'         => 'Max Focus Stap',
+    'MaxGainRange'         => 'Max Gain Bereik',
+    'MaxGainSpeed'         => 'Max Gain Snelheid',
+    'MaxGainStep'          => 'Max Gain Stap',
+    'MaxIrisRange'         => 'Max Iris Bereik',
+    'MaxIrisSpeed'         => 'Max Iris Snelheid',
+    'MaxIrisStep'          => 'Max Iris Stap',
+    'MaxPanRange'          => 'Max Pan Bereik',
+    'MaxPanSpeed'          => 'Max Pan Snelheid',
+    'MaxPanStep'           => 'Max Pan Stap',
+    'MaxTiltRange'         => 'Max Tilt Bereik',
+    'MaxTiltSpeed'         => 'Max Tilt Snelheid',
+    'MaxTiltStep'          => 'Max Tilt Stap',
+    'MaxWhiteRange'        => 'Max White Bal. Bereik',
+    'MaxWhiteSpeed'        => 'Max White Bal. Snelheid',
+    'MaxWhiteStep'         => 'Max White Bal. Stap',
+    'MaxZoomRange'         => 'Max Zoom Bereik',
+    'MaxZoomSpeed'         => 'Max Zoom Snelheid',
+    'MaxZoomStep'          => 'Max Zoom Stap',
+    'MaximumFPS'           => 'Maximum FPS',
+    'Medium'               => 'Medium',
+    'MediumBW'             => 'Medium&nbsp;B/W',
+    'Message'              => 'Message',                // Added - 2011-06-16
+    'MinAlarmAreaLtMax'    => 'Minimum alarm moet kleiner dan het maximum',
+    'MinAlarmAreaUnset'    => 'Specificeer het minimaal aantal alarm pixels',
+    'MinBlobAreaLtMax'     => 'minimum blob gebied moet kleiner zijn dan maximum blob gebied',
+    'MinBlobAreaUnset'     => 'Specificeer het minimaal aantal blob pixels',
+    'MinBlobLtMinFilter'   => 'Minimum blob gebied moet kleiner of gelijk aan het minimale filter gebied zijn',
+    'MinBlobsLtMax'        => 'Minimum blobs moet kleiner zijn dan maximum blobs',
+    'MinBlobsUnset'        => 'Specificeer het minimaal blob aantal',
+    'MinFilterAreaLtMax'   => 'Minimum filter gebied moet minder dan het maximum zijn',
+    'MinFilterAreaUnset'   => 'Specificeer het minimaal aantal filter pixels',
+    'MinFilterLtMinAlarm'  => 'Minimum filter gebied moet kleiner of gelijk aan het minimale alarm gebied zijn',
+    'MinFocusRange'        => 'Min Focus Bereik',
+    'MinFocusSpeed'        => 'Min Focus Snelheid',
+    'MinFocusStep'         => 'Min Focus Step',
+    'MinGainRange'         => 'Min Gain Bereik',
+    'MinGainSpeed'         => 'Min Gain Snelheid',
+    'MinGainStep'          => 'Min Gain Step',
+    'MinIrisRange'         => 'Min Iris Bereik',
+    'MinIrisSpeed'         => 'Min Iris Snelheid',
+    'MinIrisStep'          => 'Min Iris Step',
+    'MinPanRange'          => 'Min Draai Bereik',
+    'MinPanSpeed'          => 'Min Draai Snelheid',
+    'MinPanStep'           => 'Min Draai Step',
+    'MinPixelThresLtMax'   => 'Minimum pixel kleurdiepte moet kleiner zijn dan maximum pixel bereikwaarde',
+    'MinPixelThresUnset'   => 'Specificeer een minimale pixel bereikwaarde',
+    'MinTiltRange'         => 'Min Tilt Bereik',
+    'MinTiltSpeed'         => 'Min Tilt Snelheid',
+    'MinTiltStep'          => 'Min Tilt Step',
+    'MinWhiteRange'        => 'Min White Bal. Bereik',
+    'MinWhiteSpeed'        => 'Min White Bal. Snelheid',
+    'MinWhiteStep'         => 'Min White Bal. Step',
+    'MinZoomRange'         => 'Min Zoom Bereik',
+    'MinZoomSpeed'         => 'Min Zoom Snelheid',
+    'MinZoomStep'          => 'Min Zoom Step',
+    'Misc'                 => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
+    'Monitor'              => 'Monitor',
+    'MonitorIds'           => 'Monitor&nbsp;Ids',
+    'MonitorPreset'        => 'Monitor Preset',
+    'MonitorPresetIntro'   => 'Selecteer een preset uit de lijst.<br><br>let op dit overschrijft de reeds ingevoerde waarden voor deze monitor!<br><br>',
+    'MonitorProbe'         => 'Monitor Probe',          // Added - 2009-03-31
+    'MonitorProbeIntro'    => 'Deze lijst toont gedeteerde analoge en netwerk cameras en of deze al ingebruik of beschikbaar zijn.<br/><br/>Selecteer de gewenste waarde uit de lijst hier beneden.<br/><br/>Let er op dat het mogelijk is dat niet alle cameras hier worden weer gegeven, en dat alle ingevoerde waarden voor de huidige monitor worden overschreven.<br/><br/>', // Added - 2009-03-31
+    'Monitors'             => 'Monitoren',
+    'Montage'              => 'Montage',
+    'Month'                => 'Maand',
+    'More'                 => 'Meer',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
+    'Move'                 => 'Verplaats',
+    '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.
+    'MustBeGe'             => 'Moet groter zijn of gelijk aan',
+    'MustBeLe'             => 'Moet kleiner zijn of gelijk aan',
+    'MustConfirmPassword'  => 'Je moet je wachtwoord bevestigen',
+    'MustSupplyPassword'   => 'Je moet een wachtwoord geven',
+    'MustSupplyUsername'   => 'Je moet een gebruikersnaam geven',
+    'Name'                 => 'Naam',
+    'Near'                 => 'Dichtbij',
+    'Network'              => 'Netwerk',
+    'New'                  => 'Nieuw',
+    'NewGroup'             => 'Niew Groep',
+    'NewLabel'             => 'Niew Label',
+    'NewPassword'          => 'Nieuw wachtwoord',
+    'NewState'             => 'Nieuwe status',
+    'NewUser'              => 'Nieuwe gebruiker',
+    'Next'                 => 'Volgende',
+    'No'                   => 'Nee',
+    'NoDetectedCameras'    => 'Geen cameras gedeteceerd',    // Added - 2009-03-31
+    'NoFramesRecorded'     => 'Er zijn geen frames opgenomen voor deze gebeurtenis',
+    'NoGroup'              => 'Geeb Groep',
+    'NoSavedFilters'       => 'Geen Opgeslagen Filters',
+    'NoStatisticsRecorded' => 'Er zijn geen statistieken opgenomen voor deze gebeurenis',
+    'None'                 => 'Geen',
+    'NoneAvailable'        => 'Geen beschikbaar',
+    'Normal'               => 'Normaal',
+    'Notes'                => 'Notities',
+    'NumPresets'           => 'Num Voorkeuren',
+    'Off'                  => 'Uit',
+    'On'                   => 'Aan',
+    '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'                 => 'gelijk aan',
+    'OpGt'                 => 'groter dan',
+    'OpGtEq'               => 'groter dan of gelijk aan',
+    'OpIn'                 => 'in set',
+    'OpLt'                 => 'kleiner dan',
+    'OpLtEq'               => 'kleiner dan of gelijk aan',
+    'OpMatches'            => 'Komt overeen',
+    'OpNe'                 => 'niet gelijk aan',
+    'OpNotIn'              => 'niet in set',
+    'OpNotMatches'         => 'Komt niet overeen',
+    'Open'                 => 'Open',
+    'OptionHelp'           => 'OptieHelp',
+    'OptionRestartWarning' => 'Deze veranderingen passen niet aan\nals het systeem loopt. Als je\nKlaar bent met veranderen vergeet dan niet dat\nje ZoneMinder herstart.',
+    'Options'              => 'Opties',
+    'OrEnterNewName'       => 'of voer een nieuwe naam in',
+    'Order'                => 'Sorteer',
+    'Orientation'          => 'Orientatie',
+    'Out'                  => 'Uit',
+    'OverwriteExisting'    => 'Overschrijf bestaande',
+    'Paged'                => 'Paged',
+    'Pan'                  => 'Pan',
+    'PanLeft'              => 'Pan Links',
+    'PanRight'             => 'Pan Rechts',
+    'PanTilt'              => 'Pan/Tilt',
+    'Parameter'            => 'Parameter',
+    'Password'             => 'Wachtwoord',
+    'PasswordsDifferent'   => 'Het nieuwe en bevestigde wachtwoord zijn verschillend',
+    'Paths'                => 'Paden',
+    'Pause'                => 'Pause',
+    'Phone'                => 'Telefoon',
+    'PhoneBW'              => 'Telefoon&nbsp;B/W',
+    'Pid'                  => 'PID',                    // Added - 2011-06-16
+    'PixelDiff'            => 'Pixel Diff',
+    'Pixels'               => 'pixels',
+    'Play'                 => 'Speel',
+    'PlayAll'              => 'Speel Alles',
+    'PleaseWait'           => 'Wacht A.U.B.',
+    'Plugins'              => 'Plugins',                // Added - 2015-04-18
+    'Point'                => 'Punt',
+    'PostEventImageBuffer' => 'Post gebeurtenis foto Buffer',
+    'PreEventImageBuffer'  => 'Pre gebeurtenis foto Buffer',
+    'PreserveAspect'       => 'Beeld verhouding bewaren',
+    'Preset'               => 'Voorkeur',
+    'Presets'              => 'Voorkeuren',
+    'Prev'                 => 'Vorige',
+    'Probe'                => 'Scan',                  // 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',
+    'Rate'                 => 'Waardering',
+    'Real'                 => 'Echte',
+    'Record'               => 'Record',
+    'RefImageBlendPct'     => 'Referentie foto Blend %ge',
+    'Refresh'              => 'Ververs',
+    'Remote'               => 'Remote',
+    'RemoteHostName'       => 'Remote Host Naam',
+    'RemoteHostPath'       => 'Remote Host Pad',
+    'RemoteHostPort'       => 'Remote Host Poort',
+    'RemoteHostSubPath'    => 'Remote Host SubPad',    // Added - 2009-02-08
+    'RemoteImageColours'   => 'Remote foto kleuren',
+    'RemoteMethod'         => 'Remote Methode',          // Added - 2009-02-08
+    'RemoteProtocol'       => 'Remote Protocol',        // Added - 2009-02-08
+    'Rename'               => 'Hernoem',
+    'Replay'               => 'Opnieuw',
+    'ReplayAll'            => 'Alle Gebeurtenissen',
+    'ReplayGapless'        => 'Opvolgende Gebeurtenissen',
+    'ReplaySingle'         => 'Enkele Gebeurtenis',
+    'Reset'                => 'Herstel',
+    'ResetEventCounts'     => 'Herstel gebeurtenis teller',
+    'Restart'              => 'Herstart',
+    'Restarting'           => 'Herstarten',
+    'RestrictedCameraIds'  => 'Verboden Camera Ids',
+    'RestrictedMonitors'   => 'Beperkte Monitoren',
+    'ReturnDelay'          => 'Return Delay',
+    'ReturnLocation'       => 'Return Locatie',
+    'Rewind'               => 'Rewind',
+    'RotateLeft'           => 'Draai linksom',
+    'RotateRight'          => 'Draai rechtsom',
+    'RunLocalUpdate'       => 'Gebruik zmupdate.pl om up te daten', // Added - 2011-05-25
+    'RunMode'              => 'Draai Modus',
+    'RunState'             => 'Draai Status',
+    'Running'              => 'Werkend',
+    'Save'                 => 'Opslaan',
+    'SaveAs'               => 'Opslaan als',
+    'SaveFilter'           => 'Opslaan Filter',
+    'Scale'                => 'Schaal',
+    'Score'                => 'Score',
+    'Secs'                 => 'Secs',
+    'Sectionlength'        => 'Sectie lengte',
+    'Select'               => 'Selecteer',
+    'SelectFormat'         => 'Selecteer Formaat',          // Added - 2011-06-17
+    'SelectLog'            => 'Selecteer Log',             // Added - 2011-06-17
+    'SelectMonitors'       => 'Selecteer Monitoren',
+    'SelfIntersecting'     => 'Polygon randen moeten niet overlappen',
+    'Set'                  => 'Zet',
+    'SetNewBandwidth'      => 'Zet Nieuwe Bandbreedte',
+    'SetPreset'            => 'Zet Preset',
+    'Settings'             => 'Instellingen',
+    'ShowFilterWindow'     => 'Toon Filter Venster',
+    'ShowTimeline'         => 'Toon Tijdslijn',
+    'SignalCheckColour'    => 'Signaal controle kleur',
+    'Size'                 => 'Groote',
+    'SkinDescription'      => 'Wijzig standaard uiterlijk voor deze computer', // Added - 2011-01-30
+    'Sleep'                => 'Slaap',
+    'SortAsc'              => 'Opl.',
+    'SortBy'               => 'Sorteer op',
+    'SortDesc'             => 'Afl.',
+    'Source'               => 'Bron',
+    'SourceColours'        => 'Bron Colours',         // Added - 2009-02-08
+    'SourcePath'           => 'Bron Path',            // Added - 2009-02-08
+    'SourceType'           => 'Bron Type',
+    'Speed'                => 'Snelheid',
+    'SpeedHigh'            => 'Hoge Snelheid',
+    'SpeedLow'             => 'Lage Snelheid',
+    'SpeedMedium'          => 'Medium Snelheid',
+    'SpeedTurbo'           => 'Turbo Snelheid',
+    'Start'                => 'Start',
+    'State'                => 'Status',
+    'Stats'                => 'Stats',
+    'Status'               => 'Status',
+    'Step'                 => 'Stap',
+    'StepBack'             => 'Stap Terug',
+    'StepForward'          => 'Stap Vooruit',
+    'StepLarge'            => 'Groten stap',
+    'StepMedium'           => 'Medium Stap',
+    'StepNone'             => 'Geen Stap',
+    'StepSmall'            => 'Smalle Stap',
+    'Stills'               => 'Plaatjes',
+    'Stop'                 => 'Stop',
+    'Stopped'              => 'Gestopt',
+    'Stream'               => 'Stream',
+    'StreamReplayBuffer'   => 'Stream Replay foto Buffer',
+    'Submit'               => 'Verzenden',
+    'System'               => 'Systeem',
+    'SystemLog'            => 'Systeem Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
+    'Tele'                 => 'Tele',
+    'Thumbnail'            => 'Thumbnail',
+    'Tilt'                 => 'Tilt',
+    'Time'                 => 'Tijd',
+    'TimeDelta'            => 'Tijd Delta',
+    'TimeStamp'            => 'Tijdstempel',
+    'Timeline'             => 'Tijdslijn',
+    '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'            => 'Tijdstempel',
+    'TimestampLabelFormat' => 'Tijdstempel Label Format',
+    'TimestampLabelX'      => 'Tijdstempel Label X',
+    'TimestampLabelY'      => 'Tijdstempel Label Y',
+    'Today'                => 'Vandaag',
+    'Tools'                => 'Gereedschappen',
+    'Total'                => 'Totaal',                  // Added - 2011-06-16
+    'TotalBrScore'         => 'Totaal<br/>Score',
+    'TrackDelay'           => 'Track Vertraging',
+    'TrackMotion'          => 'Track Beweging',
+    'Triggers'             => 'Triggers',
+    'TurboPanSpeed'        => 'Turbo Pan Snelheid',
+    'TurboTiltSpeed'       => 'Turbo Tilt Snelheid',
+    'Type'                 => 'Type',
+    'Unarchive'            => 'Dearchiveer',
+    'Undefined'            => 'Ongedefineerd',              // Added - 2009-02-08
+    'Units'                => 'Eenheden',
+    'Unknown'              => 'Onbekend',
+    'Update'               => 'Ververs',
+    'UpdateAvailable'      => 'Een update voor ZoneMinder is beschikbaar',
+    'UpdateNotNecessary'   => 'Geen update noodzakelijk',
+    'Updated'              => 'Ververst',                // Added - 2011-06-16
+    'Upload'               => 'Upload',                 // Added - 2015-04-18
+    'UseFilter'            => 'Gebruik Filter',
+    'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressies', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'    => 'Gebruik&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'          => 'Used Plugins',           // Added - 2015-04-18
+    'User'                 => 'Gebruiker',
+    'Username'             => 'Gebruikersnaam',
+    'Users'                => 'Gebruikers',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
+    'Value'                => 'Waarde',
+    'Version'              => 'Versie',
+    'VersionIgnore'        => 'Negeer deze versie',
+    'VersionRemindDay'     => 'Herinner mij na 1 dag',
+    'VersionRemindHour'    => 'Herinner mij na 1 uur',
+    'VersionRemindNever'   => 'Herinner mij niet aan nieuwe versies',
+    'VersionRemindWeek'    => 'Herinner mij na 1 week',
+    'Video'                => 'Video',
+    'VideoFormat'          => 'Video Formaat',
+    'VideoGenFailed'       => 'Video Generatie mislukt!',
+    'VideoGenFiles'        => 'Bestaande video bestanden',
+    'VideoGenNoFiles'      => 'Geen video bestanden gevonden',
+    'VideoGenParms'        => 'Video Generatie Parameters',
+    'VideoGenSucceeded'    => 'Video Generatie voltooid!',
+    'VideoSize'            => 'Video grootte',
+    'View'                 => 'Bekijk',
+    'ViewAll'              => 'Bekijk Alles',
+    'ViewEvent'            => 'Bekijk Gebeurtenis',
+    'ViewPaged'            => 'Bekijk Pagina',
+    'Wake'                 => 'Wakker',
+    'WarmupFrames'         => 'Warmop Frames',
+    'Watch'                => 'Observeer',
+    'Web'                  => 'Web',
+    'WebColour'            => 'Web Kleur',
+    'Week'                 => 'Week',
+    'White'                => 'Wit',
+    'WhiteBalance'         => 'Wit Balance',
+    'Wide'                 => 'Wijd',
+    'X'                    => 'X',
+    'X10'                  => 'X10',
+    'X10ActivationString'  => 'X10 Activatie Waarde',
+    'X10InputAlarmString'  => 'X10 Input Alarm Waarde',
+    'X10OutputAlarmString' => 'X10 Output Alarm Waarde',
+    'Y'                    => 'Y',
+    'Yes'                  => 'Ja',
+    'YouNoPerms'           => 'U heeft niet de rechten om toegang te krijgen tot deze bronnen.',
+    'Zone'                 => 'Zone',
+    'ZoneAlarmColour'      => 'Alarm Kleur (Rood/Groen/Blauw)',
+    'ZoneArea'             => 'Zone Gebied',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
+    'ZoneFilterSize'       => 'Filter Hoogte/Breedte (pixels)',
+    'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmeer Gebied',
+    'ZoneMinMaxBlobArea'   => 'Min/Max Blob Gebied',
+    'ZoneMinMaxBlobs'      => 'Min/Max Blobs',
+    'ZoneMinMaxFiltArea'   => 'Min/Max Gefilterd Gebied',
+    'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
+    'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
+    'ZoneOverloadFrames'   => 'Overload Frame negeer aantal',
+    'Zones'                => 'Zones',
+    'Zoom'                 => 'Zoom',
+    'ZoomIn'               => 'Zoom In',
+    'ZoomOut'              => 'Zoom Uit',
+);
+
+// Complex replacements with formatting and/or placements, must be passed through sprintf
+$CLANG = array(
+    'CurrentLogin'         => 'huidige login is \'%1$s\'',
+    'EventCount'           => '%1$s %2$s', // Als voorbeeld '37 gebeurtenissen' (from Vlang below)
+    'LastEvents'           => 'Last %1$s %2$s', // Als voorbeeld 'Laatste 37 gebeurtenissen' (from Vlang below)
+    'LatestRelease'        => 'de laatste release is v%1$s, jij hebt v%2$s.',
+    'MonitorCount'         => '%1$s %2$s', // Als voorbeeld '4 Monitoren' (from Vlang below)
+    'MonitorFunction'      => 'Monitor %1$s Functie',
+    'RunningRecentVer'     => 'U draait al met de laatste versie van ZoneMinder, v%s.',
+    'VersionMismatch'      => 'Versie verschil, systeem is versie %1$s, database is %2$s.', // Added - 2011-05-25
+);
+
+// The next section allows you to describe a series of word ending and counts used to 
+// generate the correctly conjugated forms of words depending on a count that is associated
+// with that word.
+// This intended to allow phrases such a '0 potatoes', '1 potato', '2 potatoes' etc to
+// conjugate correctly with the associated count.
+// In some languages such as English this is fairly simple and can be expressed by assigning
+// a count with a singular or plural form of a word and then finding the nearest (lower) value.
+// So '0' of something generally ends in 's', 1 of something is singular and has no extra
+// ending and 2 or more is a plural and ends in 's' also. So to find the ending for '187' of
+// something you would find the nearest lower count (2) and use that ending.
+//
+// So examples of this would be
+// $zmVlangPotato = array( 0=>'Potatoes', 1=>'Potato', 2=>'Potatoes' );
+// $zmVlangSheep = array( 0=>'Sheep' );
+//
+// where you can have as few or as many entries in the array as necessary
+// If your language is similar in form to this then use the same format and choose the
+// appropriate zmVlang function below.
+// If however you have a language with a different format of plural endings then another
+// approach is required . For instance in Russian the word endings change continuously
+// depending on the last digit (or digits) of the numerator. In this case then zmVlang
+// arrays could be written so that the array index just represents an arbitrary 'type'
+// and the zmVlang function does the calculation about which version is appropriate.
+//
+// So an example in Russian might be (using English words, and made up endings as I
+// don't know any Russian!!)
+// $zmVlangPotato = array( 1=>'Potati', 2=>'Potaton', 3=>'Potaten' );
+//
+// and the zmVlang function decides that the first form is used for counts ending in
+// 0, 5-9 or 11-19 and the second form when ending in 1 etc.
+//
+
+// Variable arrays expressing plurality, see the zmVlang description above
+$VLANG = array(
+    'Event'                => array( 0=>'gebeurtenissen', 1=>'gebeurtenis', 2=>'gebeurtenissen' ),
+    'Monitor'              => array( 0=>'Monitoren', 1=>'Monitor', 2=>'Monitoren' ),
+);
+
+// You will need to choose or write a function that can correlate the plurality string arrays
+// with variable counts. This is used to conjugate the Vlang arrays above with a number passed
+// in to generate the correct noun form.
+//
+// In languages such as English this is fairly simple 
+// Note this still has to be used with printf etc to get the right formating
+function zmVlang( $langVarArray, $count )
+{
+    krsort( $langVarArray );
+    foreach ( $langVarArray as $key=>$value )
+    {
+        if ( abs($count) >= $key )
+        {
+            return( $value );
+        }
+    }
+    die( 'Error, unable to correlate variable language string' );
+}
+
+// This is an version that could be used in the Russian example above
+// The rules are that the first word form is used if the count ends in
+// 0, 5-9 or 11-19. The second form is used then the count ends in 1
+// (not including 11 as above) and the third form is used when the 
+// count ends in 2-4, again excluding any values ending in 12-14.
+// 
+// function zmVlang( $langVarArray, $count )
+// {
+//  $secondlastdigit = substr( $count, -2, 1 );
+//  $lastdigit = substr( $count, -1, 1 );
+//  // or
+//  // $secondlastdigit = ($count/10)%10;
+//  // $lastdigit = $count%10;
+// 
+//  // Get rid of the special cases first, the teens
+//  if ( $secondlastdigit == 1 && $lastdigit != 0 )
+//  {
+//      return( $langVarArray[1] );
+//  }
+//  switch ( $lastdigit )
+//  {
+//      case 0 :
+//      case 5 :
+//      case 6 :
+//      case 7 :
+//      case 8 :
+//      case 9 :
+//      {
+//          return( $langVarArray[1] );
+//          break;
+//      }
+//      case 1 :
+//      {
+//          return( $langVarArray[2] );
+//          break;
+//      }
+//      case 2 :
+//      case 3 :
+//      case 4 :
+//      {
+//          return( $langVarArray[3] );
+//          break;
+//      }
+//  }
+//  die( 'Error, unable to correlate variable language string' );
+// }
+
+// This is an example of how the function is used in the code which you can uncomment and 
+// use to test your custom function.
+//$monitors = array();
+//$monitors[] = 1; // Choose any number
+//echo sprintf( $zmClangMonitorCount, count($monitors), zmVlang( $zmVlangMonitor, count($monitors) ) );
+
+// In this section you can override the default prompt and help texts for the options area
+// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
+// So for example, to override the help text for ZM_LANG_DEFAULT do
+$OLANG = array(
+	'OPTIONS_FFMPEG' => array(
+		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		          "Examples (do not enter quotes)~~~~".
+		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
+		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
+		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+	),
+	'OPTIONS_LIBVLC' => array(
+		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		          "Examples (do not enter quotes)~~~~".
+		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
+		          "\"--verbose=2\" Set verbosity of libVLC"
+	),
+	
+//    'LANG_DEFAULT' => array(
+//        'Prompt' => "This is a new prompt for this option",
+//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//    ),
+);
+
+?>
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index 9ba171fcb..71c4bbac6 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Gotowosc',
     'All'                  => 'Wszystko',
     'Apply'                => 'Zastosuj',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Nazwy mog� zawiera� tylko litery, cyfry oraz my�lnik i podkre�lenie',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'            => 'Rozmiary plamek',
     'Blobs'                => 'Plamki',
     'Brightness'           => 'Jaskrawo��',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Bufory',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Wysoko�� obrazu',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Paleta kolor�w obrazu',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Szeroko�� obrazu',
     'Cause'                => 'Cause',
     'CheckMethod'          => 'Metoda sprawdzenia alarmu',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => 'Cykl podgl�du',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Usu�',
     'DeleteAndNext'        => 'Usu� &amp; nast�pny',
     'DeleteAndPrev'        => 'Usu� &amp; poprzedni',
     'DeleteSavedFilter'    => 'Usu� zapisany filtr',
     'Description'          => 'Opis',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Numer wej�cia w urz�dzeniu',
     'DeviceFormat'         => 'System TV',
@@ -257,6 +265,7 @@ $SLANG = array(
     'Disk'                 => 'Dysk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Czas trwania',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                 => 'Dostarcz',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archiwizuj wszystkie pasuj�ce',
     'FilterDeleteEvents'   => 'Usuwaj wszystkie pasuj�ce',
     'FilterEmailEvents'    => 'Wysy�aj poczt� wszystkie pasuj�ce',
     'FilterExecuteEvents'  => 'Wywo�uj komend� na wszystkie pasuj�ce',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Wy�wietlaj komunikat na wszystkie pasuj�ce',
     'FilterPx'             => 'Filtr Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                => 'Pierwszy',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'Wymu� alarm',
     'Format'               => 'Format',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'              => 'Nr ramki',
     'FrameRate'            => 'Tempo ramek',
     'FrameSkip'            => 'Pomi� ramk�',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Ramek',
     'Func'                 => 'Funkcja',
     'Function'             => 'Funkcja',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Inne',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Numery&nbsp;monitor�w',
     'MonitorPreset'        => 'Monitor Preset',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'              => 'Monta�',
     'Month'                => 'Miesi�c',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'musi by� wi�ksze lub r�wne od',
     'MustBeLe'             => 'musi by� mniejsze lub r�wne od',
     'MustConfirmPassword'  => 'Musisz potwierdzi� has�o',
@@ -506,6 +517,9 @@ $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
+    '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'                 => 'r�wny',
     'OpGt'                 => 'wi�ksze od',
     'OpGtEq'               => 'wi�ksze lub r�wne od',
@@ -552,6 +566,9 @@ $SLANG = array(
     'Presets'              => 'Presets',
     'Prev'                 => 'Poprzedni',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Tempo',
     'Real'                 => 'Rzeczywiste',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Nie jest wymagane uaktualnienie',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'U�yj filtru',
     'UseFilterExprsPost'   => '&nbsp;wyra�enie&nbsp;filtru', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'U�yj&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'U�ytkownik',
     'Username'             => 'Nazwa u�ytkownika',
     'Users'                => 'U�ytkownicy',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Warto��',
     'Version'              => 'Wersja',
     'VersionIgnore'        => 'Zignoruj t� wersj�',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                 => 'Strefa',
     'ZoneAlarmColour'      => 'Kolor alarmu (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Strefy',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index 91830ebf4..d079db359 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -28,6 +28,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Pixel de Alarme',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Alerta',
     'All'                  => 'Tudo',
     'Apply'                => 'Aplicar',
@@ -72,13 +73,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Nomes devem ser caracteres alfanum�ricos mais h�fen e underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -98,7 +99,9 @@ $SLANG = array(
     'BlobSizes'            => 'Tam Blob',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Brilho',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffers',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -142,6 +145,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Altura da Captura',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Paleta de Captura',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'Largura de Captura',
     'Cause'                => 'Cause',
     'CheckMethod'          => 'Metodo marcar por alarme',
@@ -172,6 +176,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => 'Ciclo Monitor',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -180,12 +185,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Deletar',
     'DeleteAndNext'        => 'Deletar &amp; Pr�x',
     'DeleteAndPrev'        => 'Deletar &amp; Ant',
     'DeleteSavedFilter'    => 'Deletar Filtros Salvos',
     'Description'          => 'Descri��o',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Canal do Dispositivo',
     'DeviceFormat'         => 'Formato do Dispos.',
@@ -197,6 +205,7 @@ $SLANG = array(
     'Disk'                 => 'Disco',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -206,7 +215,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Dura��o',
@@ -249,10 +257,12 @@ $SLANG = array(
     'Feed'                 => 'Alimentar',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Arquivar resultados',
     'FilterDeleteEvents'   => 'Apagar resultados',
     'FilterEmailEvents'    => 'Enviar e-mail com detalhes dos resultados',
     'FilterExecuteEvents'  => 'Executar comando p/ resultados',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Enviar Mensagem dos resultados',
     'FilterPx'             => 'Px de Filtro',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -262,12 +272,12 @@ $SLANG = array(
     'First'                => 'Primeiro',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => 'For�ar Alarme',
     'Format'               => 'Format',
@@ -275,7 +285,6 @@ $SLANG = array(
     'FrameId'              => 'Id de Imagem',
     'FrameRate'            => 'Velocidade de Imagem',
     'FrameSkip'            => 'Salto de Imagem',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Imagens',
     'Func'                 => 'Func',
     'Function'             => 'Fun��o',
@@ -402,6 +411,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => 'Misc',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Ids&nbsp;de Monitor',
     'MonitorPreset'        => 'Monitor Preset',
@@ -412,12 +422,13 @@ $SLANG = array(
     'Montage'              => 'Montagem',
     'Month'                => 'M�s',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'deve ser maior ou igual a',
     'MustBeLe'             => 'deve ser menor ou igual a',
     'MustConfirmPassword'  => 'Voce deve Confirmar a senha',
@@ -446,6 +457,9 @@ $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
+    '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'                 => 'igual a',
     'OpGt'                 => 'maior que',
     'OpGtEq'               => 'maior que ou igual a',
@@ -492,6 +506,9 @@ $SLANG = array(
     'Presets'              => 'Presets',
     'Prev'                 => 'Ant.',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Vel.',
     'Real'                 => 'Real',
@@ -579,6 +596,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => 'Sistema',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -613,13 +631,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'N�o � necess�rio update.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Use Filtro',
     'UseFilterExprsPost'   => '&nbsp;express�es&nbsp;de&nbsp;filtragem', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Usu�rio',
     'Username'             => 'Nome de Usu�rio',
     'Users'                => 'Usu�rios',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Valor',
     'Version'              => 'Vers�o',
     'VersionIgnore'        => 'Ignorar esta vers�o',
@@ -659,6 +680,7 @@ $SLANG = array(
     'Zone'                 => 'Zona',
     'ZoneAlarmColour'      => 'Cor de Alarme (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -667,7 +689,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zonas',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 74da43406..1b1bcb6dc 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -59,6 +59,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => 'Alarm Px',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Alert',
     'All'                  => 'Toate',
     'Apply'                => 'Accept',
@@ -103,13 +104,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Denumirea poate contine doar caractere alfanumerice, cratima si underline.',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -129,7 +130,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blob Sizes',
     'Blobs'                => 'Blobs',
     'Brightness'           => 'Luminozitate',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Zon&#259;&nbsp;tampon',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Focalizare automat&#259;',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -173,6 +176,7 @@ $SLANG = array(
     'CaptureHeight'        => '&#206n&#259;l&#355;ime captur&#259;',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'Palet&#259; captur&#259;',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'L&#259;&#355;ime captur&#259;',
     'Cause'                => 'Cauza',
     'CheckMethod'          => 'Alarm Check Method',
@@ -203,6 +207,7 @@ $SLANG = array(
     'ControlDevice'        => 'Dispozitiv control',
     'ControlType'          => 'Tip control',
     'Controllable'         => 'Controlabil',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Ciclu',
     'CycleWatch'           => 'Vizual. ciclu',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -211,12 +216,15 @@ $SLANG = array(
     'DefaultRate'          => 'Default Rate',
     'DefaultScale'         => 'Default Scale',
     'DefaultView'          => 'Default View',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => '&#350;terge',
     'DeleteAndNext'        => '&#350;terge &amp; Urm&#259;tor',
     'DeleteAndPrev'        => '&#350;terge &amp; Precedent',
     'DeleteSavedFilter'    => '&#350;terge filtrul salvat',
     'Description'          => 'Descriere',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Canal dispozitiv',
     'DeviceFormat'         => 'Format dispozitiv',
@@ -228,6 +236,7 @@ $SLANG = array(
     'Disk'                 => 'Disc',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -237,7 +246,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Durata',
@@ -280,10 +288,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Arhiveaz&#259; toate rezultatele',
     'FilterDeleteEvents'   => '&#350;terge toate rezultatele',
     'FilterEmailEvents'    => 'Trimite email ale tuturor rezultatelor',
     'FilterExecuteEvents'  => 'Execut&#259; comanda pentru toate rezultatele',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Trimite mesaj pentru toate rezultatele',
     'FilterPx'             => 'Filter Px',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -293,12 +303,12 @@ $SLANG = array(
     'First'                => 'First',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focalizare',
     'ForceAlarm'           => 'Alarm&#259; for&#355;at&#259;',
     'Format'               => 'Format',
@@ -306,7 +316,6 @@ $SLANG = array(
     'FrameId'              => 'Nr. cadru',
     'FrameRate'            => 'Frecv. cadre',
     'FrameSkip'            => 'Omite cadre',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Cadre',
     'Func'                 => 'Func',
     'Function'             => 'Func&#355;ie',
@@ -433,6 +442,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Vitez&#259; zoom min',
     'MinZoomStep'          => 'Pas zoom min',
     'Misc'                 => 'Divers',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Monitor',
     'MonitorIds'           => 'Nr.&nbsp;Monitor',
     'MonitorPreset'        => 'Monitor Preset',
@@ -443,12 +453,13 @@ $SLANG = array(
     'Montage'              => 'Montage',
     'Month'                => 'Luna',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Mi&#351;care',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'trebuie sa fie mai mare sau egal cu',
     'MustBeLe'             => 'trebuie sa fie mai mic sau egal cu',
     'MustConfirmPassword'  => 'Trebuie sa confirmati parola',
@@ -477,6 +488,9 @@ $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
+    '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'                 => 'egal cu',
     'OpGt'                 => 'mai mare ca',
     'OpGtEq'               => 'mai mare sau egal cu',
@@ -523,6 +537,9 @@ $SLANG = array(
     'Presets'              => 'Preset&#259;ri',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => 'Rate',
     'Real'                 => 'Real',
@@ -610,6 +627,7 @@ $SLANG = array(
     'Submit'               => 'Trimite',
     'System'               => 'Sistem',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Miniatur&#259;',
     'Tilt'                 => '&#206;nclinare',
@@ -644,13 +662,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Actulizarea nu este necesar&#259;.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Folose&#351;te filtru',
     'UseFilterExprsPost'   => '&nbsp;expresii&nbsp;de&nbsp;filtrare ', 
     'UseFilterExprsPre'    => 'Folose&#351;te&nbsp;', 
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Utilizator',
     'Username'             => 'Nume',
     'Users'                => 'Utilizatori',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'Valoare',
     'Version'              => 'Versiune',
     'VersionIgnore'        => 'Ignor&#259; aceast&#259; versiune',
@@ -690,6 +711,7 @@ $SLANG = array(
     'Zone'                 => 'Zone',
     'ZoneAlarmColour'      => 'Alarm Colour (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -698,7 +720,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zona',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
@@ -1144,14 +1165,6 @@ $OLANG = array(
         'Prompt' => "Op&#355;iuni adi&#355;ionale pentru ffmpeg",
         'Help' => "Ffmpeg suport&#259; multe op&#355;iuni pentru controlul calit&#259;&#355;ii secven&#355;ei video produse. Aceast&#259; op&#355;iune v&#259; permite s&#259; specifica&#355;i propriile op&#355;iuni. Citi&#355;i documenta&#355;ia ffmpeg pentru mai multe detalii."
     ),
-    'OPT_NETPBM' => array(
-        'Prompt' => "Sunt instalate utilitarele Netpbm (op&#355;ional)",
-        'Help' => "&#206;n cazul la&#355;imii de band&#259; redus&#259; ZoneMinder va miniaturiza imaginile &#238;nainte de a le direc&#355;iona spre browser pentru a reduce traficul. Pentru aceasta folose&#351;te pachetul Netpbm; aceast&#259; op&#355;iune ar trebuie s&#259; direc&#355;ioneze ZoneMinder spre binarele pachetului. Dac&#259; nu ave&#355;i pachetul Netpbm instalat imaginilor vor fi &#238;ntotdeauna trimise la scar&#259; real&#259; &#351;i redimensionate &#238;n browser."
-    ),
-    'PATH_NETPBM' => array(
-        'Prompt' => "Cale la utilitarele Netpbm (op&#355;ional)",
-        'Help' => "Calea la utilitarele Netpbm (op&#355;ional)"
-    ),
     'OPT_TRIGGERS' => array(
         'Prompt' => "Interac&#355;ioneaz&#259; cu declan&#351;atoare externe via socket sau fi&#351;ierele dispozitivelor",
         'Help' => "ZoneMinder poate interac&#355;iona cu sisteme externe care ac&#355;ioneaz&#259; sau revoc&#259; o alarm&#259;. Acest lucru este realizat prin intermediului script-ului zmtrigger.pl. Aceast&#259; op&#355;iune indic&#259; folosirea declan&#351;atoarelor externe, majoritatea vor alege nu aici."
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 0c4bfbf3b..7c98e4f48 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -88,6 +88,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Alarm Maximum FPS',
     'AlarmPx'              => '���&nbsp;����.',
     'AlarmRGBUnset'        => 'You must set an alarm RGB colour',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => '���������',
     'All'                  => '���',
     'Apply'                => '���������',
@@ -132,13 +133,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
     'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
@@ -158,7 +159,9 @@ $SLANG = array(
     'BlobSizes'            => '������ ��������',
     'Blobs'                => '���-�� ��������',
     'Brightness'           => '�������',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => '������',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Can Auto Focus',
     'CanAutoGain'          => 'Can Auto Gain',
     'CanAutoIris'          => 'Can Auto Iris',
@@ -202,6 +205,7 @@ $SLANG = array(
     'CaptureHeight'        => '������ �� Y',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => '����� �������',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => '������ �� X',
     'Cause'                => 'Cause',
     'CheckMethod'          => '����� �������� �������',
@@ -232,6 +236,7 @@ $SLANG = array(
     'ControlDevice'        => 'Control Device',
     'ControlType'          => 'Control Type',
     'Controllable'         => 'Controllable',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Cycle',
     'CycleWatch'           => '����������� ��������',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -240,12 +245,15 @@ $SLANG = array(
     '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'          => '��������',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => '�����',
     'DeviceFormat'         => '������',
@@ -257,6 +265,7 @@ $SLANG = array(
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Please Donate',
     '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 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.',
@@ -266,7 +275,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'No, I don\'t want to donate, never remind',
     'DonateRemindWeek'     => 'Not yet, remind again in 1 week',
     'DonateYes'            => 'Yes, I\'d like to donate now',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Download',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => '������������',
@@ -309,10 +317,12 @@ $SLANG = array(
     'Feed'                 => 'Feed',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'File',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Archive all matches',
     'FilterDeleteEvents'   => 'Delete all matches',
     'FilterEmailEvents'    => 'Email details of all matches',
     'FilterExecuteEvents'  => 'Execute command on all matches',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Message details of all matches',
     'FilterPx'             => '��� �������',
     'FilterUnset'          => 'You must specify a filter width and height',
@@ -322,12 +332,12 @@ $SLANG = array(
     'First'                => '������',
     'FlippedHori'          => 'Flipped Horizontally',
     'FlippedVert'          => 'Flipped Vertically',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Focus',
     'ForceAlarm'           => '�������� �������',
     'Format'               => 'Format',
@@ -335,7 +345,6 @@ $SLANG = array(
     'FrameId'              => 'Id �����',
     'FrameRate'            => '��������',
     'FrameSkip'            => '���������� �����',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => '�����',
     'Func'                 => '����.',
     'Function'             => '�������',
@@ -462,6 +471,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min Zoom Speed',
     'MinZoomStep'          => 'Min Zoom Step',
     'Misc'                 => '������',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => '�������',
     'MonitorIds'           => 'Id&nbsp;���������',
     'MonitorPreset'        => 'Monitor Preset',
@@ -472,12 +482,13 @@ $SLANG = array(
     'Montage'              => 'Montage',
     'Month'                => '�����',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Move',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => '������ ���� ������ ��� �����',
     'MustBeLe'             => '������ ���� ������ ��� �����',
     'MustConfirmPassword'  => '�� ������ ����������� ������',
@@ -506,6 +517,9 @@ $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
+    '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'                 => '������',
     'OpGtEq'               => '������ ���� �����',
@@ -552,6 +566,9 @@ $SLANG = array(
     'Presets'              => '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protocol',
     'Rate'                 => '��������',
     'Real'                 => '��������',
@@ -639,6 +656,7 @@ $SLANG = array(
     'Submit'               => 'Submit',
     'System'               => '�������',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Thumbnail',
     'Tilt'                 => 'Tilt',
@@ -673,13 +691,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => '���������� �� ���������',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => '������������ ������',
     'UseFilterExprsPost'   => '&nbsp;���������&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',
     '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'        => '������������ ��� ������',
@@ -719,6 +740,7 @@ $SLANG = array(
     'Zone'                 => '����',
     'ZoneAlarmColour'      => '���� ������� (Red/Green/Blue)',
     'ZoneArea'             => 'Zone Area',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filter Width/Height (pixels)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max Alarmed Area',
     'ZoneMinMaxBlobArea'   => 'Min/Max Blob Area',
@@ -727,7 +749,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max Pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => '����',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zoom In',
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index 968804fed..ca4f05254 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -89,6 +89,7 @@ $SLANG = array(
     'AlarmMaximumFPS'      => 'Max. ramar/s f�r larm',
     'AlarmPx'              => 'Larmpunkter',
     'AlarmRGBUnset'        => 'Du m�ste s�tta en f�rg f�r RGB-larm',
+    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
     'Alert'                => 'Varning',
     'All'                  => 'Alla',
     'Apply'                => 'L�gg till',
@@ -133,13 +134,13 @@ $SLANG = array(
     'BadFPSReportInterval' => 'Buffern f�r ramintervallrapporten m�ste vara ett heltal p� minst 0 eller h�gre',
     'BadFormat'            => 'Formatet m�ste vara ett heltal, noll eller h�gre',
     'BadFrameSkip'         => 'V�rdet f�r ram�verhopp m�ste vara ett heltal p� 0 eller h�gre',
-    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'H�jden m�ste s�ttas till ett giltigt v�rde',
     'BadHost'              => 'Detta f�lt ska inneh�lla en giltig ip-adress eller v�rdnamn, inkludera inte http://',
     'BadImageBufferCount'  => 'Bufferstorleken f�r avbilden m�ste vara ett heltal p� minst 10 eller h�gre',
     'BadLabelX'            => 'Etiketten f�r X koordinaten m�ste s�ttas till ett heltal, 0 eller h�gre',
     'BadLabelY'            => 'Etiketten f�r Y koordinaten m�ste s�ttas till ett heltal, 0 eller h�gre',
     'BadMaxFPS'            => 'Max. ramar/s m�ste vara ett positivt heltal eller ett flyttal',
+    'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
     'BadNameChars'         => 'Namn kan endast inneh�lla alfanumeriska tecken, bindestreck och understreck',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'S�kv�gen m�ste inneh�lla ett giltigt v�rde',
@@ -159,7 +160,9 @@ $SLANG = array(
     'BlobSizes'            => 'Blobstorlek',
     'Blobs'                => 'Blobbar',
     'Brightness'           => 'Ljusstyrka',
+    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
     'Buffers'              => 'Buffrar',
+    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
     'CanAutoFocus'         => 'Har autofokus',
     'CanAutoGain'          => 'Har autoniv�',
     'CanAutoIris'          => 'Har autoiris',
@@ -203,6 +206,7 @@ $SLANG = array(
     'CaptureHeight'        => 'F�ngsth�jd',
     'CaptureMethod'        => 'Capture Method',         // Added - 2009-02-08
     'CapturePalette'       => 'F�ngstpalett',
+    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
     'CaptureWidth'         => 'F�ngstbredd',
     'Cause'                => 'Orsak',
     'CheckMethod'          => 'Larmkontrollmetod',
@@ -233,6 +237,7 @@ $SLANG = array(
     'ControlDevice'        => 'Kontrollenhet',
     'ControlType'          => 'Kontrolltyp',
     'Controllable'         => 'Kontrollerbar',
+    'Current'              => 'Current',                // Added - 2015-04-18
     'Cycle'                => 'Period',
     'CycleWatch'           => 'Cycle Watch',
     'DateTime'             => 'Date/Time',              // Added - 2011-06-16
@@ -241,12 +246,15 @@ $SLANG = array(
     'DefaultRate'          => 'Standardhastighet',
     'DefaultScale'         => 'Standardskala',
     'DefaultView'          => 'Standardvy',
+    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
+    'Delay'                => 'Delay',                  // Added - 2015-04-18
     'Delete'               => 'Radera',
     'DeleteAndNext'        => 'Radera &amp; N�sta',
     'DeleteAndPrev'        => 'Radera &amp; F�reg.',
     'DeleteSavedFilter'    => 'Radera sparade filter',
     'Description'          => 'Beskrivning',
     'DetectedCameras'      => 'Detected Cameras',       // Added - 2009-03-31
+    'DetectedProfiles'     => 'Detected Profiles',      // Added - 2015-04-18
     'Device'               => 'Device',                 // Added - 2009-02-08
     'DeviceChannel'        => 'Enhetskanal',
     'DeviceFormat'         => 'Enhetsformat',
@@ -258,6 +266,7 @@ $SLANG = array(
     'Disk'                 => 'Disk',
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Displaying',             // Added - 2011-06-16
+    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Donate'               => 'Var v�nlig och donera',
     'DonateAlready'        => 'Nej, Jag har redan donerat',
     'DonateEnticement'     => 'Du har k�rt ZoneMinder ett tag nu och f�rhoppningsvis har du sett att det fungerar bra hemma eller p� ditt f�retag. �ven om ZoneMinder �r, och kommer att vara, fri programvara och �ppen kallkod, s� kostar det pengar att utveckla och underh�lla. Om du vill hj�lpa till med framtida utveckling och nya funktioner s� var vanlig och bidrag med en slant. Bidragen �r naturligtvis en option men mycket uppskattade och du kan bidra med precis hur mycket du vill.<br><br>Om du vill ge ett bidrag v�ljer du nedan eller surfar till http://www.zoneminder.com/donate.html.<br><br>Tack f�r att du anv�nder ZoneMinder, gl�m inte att bes�ka forumen p� ZoneMinder.com f�r support och f�rslag om hur du f�r din ZoneMinder att fungera lite b�ttre.',
@@ -267,7 +276,6 @@ $SLANG = array(
     'DonateRemindNever'    => 'Nej, Jag vill inte donera, p�minn mig inte mer',
     'DonateRemindWeek'     => 'Inte �n, p�minn om 1 vecka',
     'DonateYes'            => 'Ja, jag vill g�rna donera nu',
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'             => 'Ladda ner',
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'L�ngd',
@@ -310,10 +318,12 @@ $SLANG = array(
     'Feed'                 => 'Matning',
     'Ffmpeg'               => 'Ffmpeg',                 // Added - 2009-02-08
     'File'                 => 'Fil',
+    'Filter'               => 'Filter',                 // Added - 2015-04-18
     'FilterArchiveEvents'  => 'Arkivera alla tr�ffar',
     'FilterDeleteEvents'   => 'Radera alla tr�ffar',
     'FilterEmailEvents'    => 'Skicka e-post med detaljer om alla tr�ffar',
     'FilterExecuteEvents'  => 'Utf�r kommando p� alla tr�ffar',
+    'FilterLog'            => 'Filter log',             // Added - 2015-04-18
     'FilterMessageEvents'  => 'Meddela detaljer om alla tr�ffar',
     'FilterPx'             => 'Filter Px',
     'FilterUnset'          => 'Du m�ste specificera filtrets bredd och h�jd',
@@ -323,12 +333,12 @@ $SLANG = array(
     'First'                => 'F�rst',
     'FlippedHori'          => 'V�nd horisontellt',
     'FlippedVert'          => 'V�nd vertikalt',
-    'FnNone'                => 'None',            // Added 2013.08.16.
-    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
-    'FnModect'              => 'Modect',            // Added 2013.08.16.
-    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
     'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'FnNone'                => 'None',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
     'Focus'                => 'Fokus',
     'ForceAlarm'           => 'Tvinga larm',
     'Format'               => 'Format',
@@ -336,7 +346,6 @@ $SLANG = array(
     'FrameId'              => 'Ram id',
     'FrameRate'            => 'Ram hastighet',
     'FrameSkip'            => 'Hoppa �ver ram',
-    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Frames'               => 'Ramar',
     'Func'                 => 'Funk',
     'Function'             => 'Funktion',
@@ -463,6 +472,7 @@ $SLANG = array(
     'MinZoomSpeed'         => 'Min zoomhastighet',
     'MinZoomStep'          => 'Min zoomsteg',
     'Misc'                 => '�vrigt',
+    'Mode'                 => 'Mode',                   // Added - 2015-04-18
     'Monitor'              => 'Bevakning',
     'MonitorIds'           => 'Bevakningsnr',
     'MonitorPreset'        => 'F�rinst�lld bevakning',
@@ -473,12 +483,13 @@ $SLANG = array(
     'Montage'              => 'Montera',
     'Month'                => 'M�nad',
     'More'                 => 'More',                   // Added - 2011-06-16
+    'MotionFrameSkip'      => 'Motion Frame Skip',
     'Move'                 => 'Flytta',
-    'MtgDefault'           => 'Default',              // Added 2013.08.15.
     'Mtg2widgrd'           => '2-wide grid',              // Added 2013.08.15.
     'Mtg3widgrd'           => '3-wide grid',              // Added 2013.08.15.
-    'Mtg4widgrd'           => '4-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.
     'MustBeGe'             => 'm�ste vara st�rre �n eller lika med',
     'MustBeLe'             => 'm�ste vara mindre �n eller lika med',
     'MustConfirmPassword'  => 'Du m�ste bekr�fta l�senordet',
@@ -507,6 +518,9 @@ $SLANG = array(
     'NumPresets'           => 'Antal f�rinst�llningar',
     'Off'                  => 'Av',
     'On'                   => 'P�',
+    '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'                 => 'lika med',
     'OpGt'                 => 'st�rre �n',
     'OpGtEq'               => 'st�rre �n eller lika med',
@@ -553,6 +567,9 @@ $SLANG = array(
     'Presets'              => 'F�rinst�llningar',
     'Prev'                 => 'F�reg.',
     '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
+    'Progress'             => 'Progress',               // Added - 2015-04-18
     'Protocol'             => 'Protokol',
     'Rate'                 => 'Hastighet',
     'Real'                 => 'Verklig',
@@ -640,6 +657,7 @@ $SLANG = array(
     'Submit'               => 'Skicka',
     'System'               => 'System',
     'SystemLog'            => 'System Log',             // Added - 2011-06-16
+    'TargetColorspace'     => 'Target colorspace',      // Added - 2015-04-18
     'Tele'                 => 'Tele',
     'Thumbnail'            => 'Miniatyrer',
     'Tilt'                 => 'Tilt',
@@ -674,13 +692,16 @@ $SLANG = array(
     'UpdateNotNecessary'   => 'Ingen uppdatering beh�vs.',
     'Updated'              => 'Updated',                // Added - 2011-06-16
     'Upload'               => 'Upload',                 // Added - 2011-08-23
-    'UsedPlugins'	   => 'Used Plugins',
     'UseFilter'            => 'Anv�nd filter',
     'UseFilterExprsPost'   => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
     'UseFilterExprsPre'    => 'Anv�nd&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UsedPlugins'	   => 'Used Plugins',
     'User'                 => 'Anv�ndare',
     'Username'             => 'Anv�ndarnamn',
     'Users'                => 'Anv�ndare',
+    'V4L'                  => 'V4L',                    // Added - 2015-04-18
+    'V4LCapturesPerFrame'  => 'Captures Per Frame',     // Added - 2015-04-18
+    'V4LMultiBuffer'       => 'Multi Buffering',        // Added - 2015-04-18
     'Value'                => 'V�rde',
     'Version'              => 'Version',
     'VersionIgnore'        => 'Ignorera denna version',
@@ -720,6 +741,7 @@ $SLANG = array(
     'Zone'                 => 'Zon',
     'ZoneAlarmColour'      => 'Larmf�rg (R�d/Gr�n/Bl�)',
     'ZoneArea'             => 'Zonarea',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'ZoneFilterSize'       => 'Filterbredd/h�jd (pixlar)',
     'ZoneMinMaxAlarmArea'  => 'Min/Max larmarea',
     'ZoneMinMaxBlobArea'   => 'Min/Max blobbarea',
@@ -728,7 +750,6 @@ $SLANG = array(
     'ZoneMinMaxPixelThres' => 'Min/Max pixel Threshold (0-255)',
     'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
     'ZoneOverloadFrames'   => 'Overload Frame Ignore Count',
-    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
     'Zones'                => 'Zoner',
     'Zoom'                 => 'Zoom',
     'ZoomIn'               => 'Zooma in',
diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php
index 9599c6112..d586f90c8 100644
--- a/web/skins/classic/includes/config.php
+++ b/web/skins/classic/includes/config.php
@@ -25,7 +25,7 @@ $rates = array(
     "1000" => "10x",
     "400" => "4x",
     "200" => "2x",
-    "100" => $SLANG['Real'],
+    "100" => translate('Real'),
     "50" => "1/2x",
     "25" => "1/4x",
 );
@@ -35,7 +35,7 @@ $scales = array(
     "300" => "3x",
     "200" => "2x",
     "150" => "1.5x",
-    "100" => $SLANG['Actual'],
+    "100" => translate('Actual'),
     "75" => "3/4x",
     "50" => "1/2x",
     "33" => "1/3x",
@@ -43,9 +43,9 @@ $scales = array(
 );
 
 $bwArray = array(
-    "high" => $SLANG['High'],
-    "medium" => $SLANG['Medium'],
-    "low" => $SLANG['Low']
+    "high" => translate('High'),
+    "medium" => translate('Medium'),
+    "low" => translate('Low')
 );
 
 switch ( $_COOKIE['zmBandwidth'] )
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index 6fc2cd72b..b09a53138 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -137,22 +137,20 @@ function getControlCommands( $monitor )
 
 function controlFocus( $monitor, $cmds )
 {
-    global $SLANG;
-
     ob_start();
 ?>
 <div class="arrowControl focusControls">
-  <div class="arrowLabel"><?php echo $SLANG['Near'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Near') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['FocusNear'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanFocusCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo $SLANG['Focus'] ?></div>
+  <div class="arrowCenter"<?php if ( $monitor['CanFocusCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo translate('Focus') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['FocusFar'] ?>',event,0,1)"></div>
-  <div class="arrowLabel"><?php echo $SLANG['Far'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Far') ?></div>
 <?php
     if ( $monitor['CanAutoFocus'] )
     {
 ?>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"/>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['FocusMan'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Man') ?>" onclick="controlCmd('<?php echo $cmds['FocusMan'] ?>')"/>
 <?php
     }
 ?>
@@ -168,17 +166,17 @@ function controlZoom( $monitor, $cmds )
     ob_start();
 ?>
 <div class="arrowControl zoomControls">
-  <div class="arrowLabel"><?php echo $SLANG['Tele'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Tele') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['ZoomTele'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanZoomCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo $SLANG['Zoom'] ?></div>
+  <div class="arrowCenter"<?php if ( $monitor['CanZoomCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo translate('Zoom') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['ZoomWide'] ?>',event,0,1)"></div>
-  <div class="arrowLabel"><?php echo $SLANG['Wide'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Wide') ?></div>
 <?php
     if ( $monitor['CanAutoZoom'] )
     {
 ?>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"/>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['ZoomMan'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Man') ?>" onclick="controlCmd('<?php echo $cmds['ZoomMan'] ?>')"/>
 <?php
     }
 ?>
@@ -193,17 +191,17 @@ function controlIris( $monitor, $cmds )
     ob_start();
 ?>
 <div class="arrowControl irisControls">
-  <div class="arrowLabel"><?php echo $SLANG['Open'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Open') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['IrisOpen'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanIrisCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo $SLANG['Iris'] ?></div>
+  <div class="arrowCenter"<?php if ( $monitor['CanIrisCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo translate('Iris') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['IrisClose'] ?>',event,0,1)"></div>
-  <div class="arrowLabel"><?php echo $SLANG['Close'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Close') ?></div>
 <?php
     if ( $monitor['CanAutoIris'] )
     {
 ?>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"/>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['IrisMan'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Man') ?>" onclick="controlCmd('<?php echo $cmds['IrisMan'] ?>')"/>
 <?php
     }
 ?>
@@ -219,17 +217,17 @@ function controlWhite( $monitor, $cmds )
     ob_start();
 ?>
 <div class="arrowControl whiteControls">
-  <div class="arrowLabel"><?php echo $SLANG['In'] ?></div>
+  <div class="arrowLabel"><?php echo translate('In') ?></div>
   <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['WhiteIn'] ?>',event,0,-1)"></div>
-  <div class="arrowCenter"<?php if ( $monitor['CanWhiteCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo $SLANG['White'] ?></div>
+  <div class="arrowCenter"<?php if ( $monitor['CanWhiteCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo translate('White') ?></div>
   <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['WhiteOut'] ?>',event,0,1)"></div>
-  <div class="arrowLabel"><?php echo $SLANG['Out'] ?></div>
+  <div class="arrowLabel"><?php echo translate('Out') ?></div>
 <?php
     if ( $monitor['CanAutoWhite'] )
     {
 ?>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"/>
-  <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['WhiteMan'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Auto') ?>" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"/>
+  <input type="button" class="ptzTextBtn" value="<?php echo translate('Man') ?>" onclick="controlCmd('<?php echo $cmds['WhiteMan'] ?>')"/>
 <?php
     }
 ?>
@@ -245,7 +243,7 @@ function controlPanTilt( $monitor, $cmds )
     ob_start();
 ?>
 <div class="pantiltControls">
-  <div class="pantilLabel"><?php echo $SLANG['PanTilt'] ?></div>
+  <div class="pantilLabel"><?php echo translate('PanTilt') ?></div>
   <div class="pantiltButtons">
 <?php
     $hasPan = $monitor['CanPan'];
@@ -285,7 +283,7 @@ function controlPresets( $monitor, $cmds )
     ob_start();
 ?>
 <div class="presetControls">
-  <!--<div><?php echo $SLANG['Presets'] ?></div>-->
+  <!--<div><?php echo translate('Presets') ?></div>-->
   <div>
 <?php
     for ( $i = 1; $i <= $monitor['NumPresets']; $i++ )
@@ -303,13 +301,13 @@ function controlPresets( $monitor, $cmds )
     if ( $monitor['HasHomePreset'] )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Home'] ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Home') ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
 <?php
     }
     if ( canEdit( 'Monitors') && $monitor['CanSetPresets'] )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Set'] ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmPreset', 'preset' );"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Set') ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmPreset', 'preset' );"/>
 <?php
     }
 ?>
@@ -326,25 +324,25 @@ function controlPower( $monitor, $cmds )
     ob_start();
 ?>
 <div class="powerControls">
-  <div class="powerLabel"><?php echo $SLANG['Control'] ?></div>
+  <div class="powerLabel"><?php echo translate('Control') ?></div>
   <div>
 <?php
     if ( $monitor['CanWake'] )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Wake'] ?>" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Wake') ?>" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"/>
 <?php
     }
     if ( $monitor['CanSleep'] )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Sleep'] ?>" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Sleep') ?>" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"/>
 <?php
     }
     if ( $monitor['CanReset'] )
     {
 ?>
-    <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Reset'] ?>" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"/>
+    <input type="button" class="ptzTextBtn" value="<?php echo translate('Reset') ?>" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"/>
 <?php
     }
 ?>
diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 42b03a8da..e604536e8 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -71,7 +71,7 @@ html ul.tabs li.active, html ul.tabs li.active a:hover  {
 }
   -->
   </style>
-   <script type="text/javascript" src="<?php echo ZM_SKIN_PATH; ?>/js/jquery-1.4.2.min.js"></script>
+   <script type="text/javascript" src="<?php echo ZM_SKIN_PATH; ?>/js/jquery.js"></script>
   <script type="text/javascript" language="javascript" charset="utf-8">
 
   /*==========[tab code]==========*/
@@ -103,14 +103,12 @@ html ul.tabs li.active, html ul.tabs li.active a:hover  {
 
 function exportEventDetail( $event, $exportFrames, $exportImages )
 {
-    global $SLANG;
-
     ob_start();
-    exportHeader( $SLANG['Event']." ".$event['Id'] );
+    exportHeader( translate('Event')." ".$event['Id'] );
 	
 	$otherlinks = '';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.$SLANG['Frames'].'</a>,';
-	if( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.$SLANG['Images'].'</a>,';
+	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);
 
 
@@ -118,21 +116,21 @@ function exportEventDetail( $event, $exportFrames, $exportImages )
 <body>
   <div id="page">
     <div id="content">
-		<h2><?php echo $SLANG['Event'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		<h2><?php echo translate('Event') ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
       <table id="eventDetail">
-        <tr><th scope="row"><?php echo $SLANG['Id'] ?></th><td><?php echo $event['Id'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Name'] ?></th><td><?php echo validHtmlStr($event['Name']) ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Monitor'] ?></th><td><?php echo validHtmlStr($event['MonitorName']) ?> (<?php echo $event['MonitorId'] ?>)</td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Cause'] ?></th><td><?php echo validHtmlStr($event['Cause']) ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Notes'] ?></th><td><?php echo validHtmlStr($event['Notes']) ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Time'] ?></th><td><?php echo strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime']) ) ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Duration'] ?></th><td><?php echo $event['Length'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Frames'] ?></th><td><?php echo $event['Frames'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['AttrAlarmFrames'] ?></th><td><?php echo $event['AlarmFrames'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['AttrTotalScore'] ?></th><td><?php echo $event['TotScore'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['AttrAvgScore'] ?></th><td><?php echo $event['AvgScore'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['AttrMaxScore'] ?></th><td><?php echo $event['MaxScore'] ?></td></tr>
-        <tr><th scope="row"><?php echo $SLANG['Archived'] ?></th><td><?php echo $event['Archived']?$SLANG['Yes']:$SLANG['No'] ?></td></tr>
+        <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('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('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>
       </table>
     </div>
   </div>
@@ -150,30 +148,30 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
     $frames = dbFetchAll( $sql, NULL, array( $event['Id'] ) );
 
     ob_start();
-    exportHeader( $SLANG['Frames']." ".$event['Id'] );
+    exportHeader( translate('Frames')." ".$event['Id'] );
 	
 	$otherlinks = '';
-	if( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.$SLANG['Event'].'</a>,';
-	if( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.$SLANG['Images'].'</a>,';
+	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 $SLANG['Frames'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		<h2><?php echo translate('Frames') ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
       <table id="eventFrames">
         <tr>
-          <th><?php echo $SLANG['FrameId'] ?></th>
-          <th><?php echo $SLANG['Type'] ?></th>
-          <th><?php echo $SLANG['TimeStamp'] ?></th>
-          <th><?php echo $SLANG['TimeDelta'] ?></th>
-          <th><?php echo $SLANG['Score'] ?></th>
+          <th><?php echo translate('FrameId') ?></th>
+          <th><?php echo translate('Type') ?></th>
+          <th><?php echo translate('TimeStamp') ?></th>
+          <th><?php echo translate('TimeDelta') ?></th>
+          <th><?php echo translate('Score') ?></th>
 <?php
     if ( $exportImages )
     {
 ?>
-          <th><?php echo $SLANG['Image'] ?></th>
+          <th><?php echo translate('Image') ?></th>
 <?php
     }
 ?>
@@ -181,7 +179,7 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
 <?php
     if ( count($frames) )
     {
-        $eventPath = mygetEventPath( $event );
+        $eventPath = ZM_DIR_EVENTS.'/'.mygetEventPath( $event );
         foreach ( $frames as $frame )
         {
             $imageFile = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
@@ -216,7 +214,7 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
     {
 ?>
         <tr>
-          <td class="monoRow" colspan="<?php echo $exportImages?6:5 ?>"><?php echo $SLANG['NoFramesRecorded'] ?></td>
+          <td class="monoRow" colspan="<?php echo $exportImages?6:5 ?>"><?php echo translate('NoFramesRecorded') ?></td>
         </tr>
 <?php
     }
@@ -235,11 +233,11 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
     global $SLANG;
 
     ob_start();
-    exportHeader( $SLANG['Images']." ".$event['Id'] );
+    exportHeader( translate('Images')." ".$event['Id'] );
 	
 	$otherlinks = '';
-	if( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.$SLANG['Event'].'</a>,';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.$SLANG['Frames'].'</a>,';
+	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);
@@ -259,7 +257,7 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
 .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 $SLANG['Images'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+<h2><?php echo translate('Images') ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
 
 <ilayer id="slidensmain" width=&{slidewidth}; height=&{slideheight}; bgColor=&{slidebgcolor}; visibility=hide>
 <layer id="slidenssub" width=&{slidewidth}; left=auto top=auto></layer>
@@ -593,16 +591,20 @@ function exportEventImagesMaster( $eids )
 {
     global $SLANG;
     ob_start();
-    exportHeader( $SLANG['Images'].' Master' );
+    exportHeader( translate('Images').' Master' );
 ?>
 <body>
-<h2><?php echo $SLANG['Images'] ?> Master</h2>
+<h2><?php echo translate('Images') ?> Master</h2>
 <?php
 	foreach ($eids as $eid) {
 		//get monitor id and event id
-		$sql = 'SELECT E.MonitorId FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE E.Id = ?';
+		$sql = 'SELECT E.MonitorId, E.StartTime, E.Id
+			FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId)
+			WHERE E.Id = ?
+		';
 		$event = dbFetchOne( $sql, NULL, array( $eid ) );
 		$eventMonitorId[$eid] = $event['MonitorId'];
+		$eventPath[$eid] = mygetEventPath( $event );
 	}
 	
 	$monitors = array_values(array_flip(array_flip($eventMonitorId))); //unique monitors and reindex the array
@@ -644,7 +646,7 @@ function exportEventImagesMaster( $eids )
 	<?php foreach($eids as $eid) 
 	{
 	?>
-		<div><a href="javascript:switchevent('<?php echo   $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?php echo$eid?></a></div>
+		<div><a href="javascript:switchevent('<?php echo   $eventPath[$eid]; ?>/zmEventImages.html');"><?php echo$eid?></a></div>
 		<?php
 	} 
 	?>
@@ -660,7 +662,7 @@ function exportEventImagesMaster( $eids )
 				if ($eventMonitorId[$eid] == $monitor)
 				{
 				?>	
-				<div><a href="javascript:switchevent('<?php echo   $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?php echo$eid?></a></div>	
+				<div><a href="javascript:switchevent('<?php echo   $eventPath[$eid]; ?>/zmEventImages.html');"><?php echo$eid?></a></div>
 				<?php
 				}
 			}
@@ -763,7 +765,7 @@ function exportFileList( $eid, $exportDetail, $exportFrames, $exportImages, $exp
     {
         $sql = 'SELECT E.Id,E.MonitorId,M.Name AS MonitorName,M.Width,M.Height,E.Name,E.Cause,E.Notes,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE E.Id = ?';
         $event = dbFetchOne( $sql, NULL, array( $eid ) );
-		$eventPath =  mygetEventPath( $event );
+		$eventPath =  ZM_DIR_EVENTS.'/'.mygetEventPath( $event );
         $files = array();
         if ( $dir = opendir( $eventPath ) )
         {
@@ -956,8 +958,8 @@ function exportEvents( $eids, $exportDetail, $exportFrames, $exportImages, $expo
 function mygetEventPath( $event )
 {
     if ( ZM_USE_DEEP_STORAGE )
-        $eventPath = ZM_DIR_EVENTS.'/'.$event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
+        $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
     else
-        $eventPath = ZM_DIR_EVENTS.'/'.$event['MonitorId'].'/'.$event['Id'];
+        $eventPath = $event['MonitorId'].'/'.$event['Id'];
     return( $eventPath );
 }
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index f949cf4b6..683f1a270 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -26,6 +26,7 @@ function xhtmlHeaders( $file, $title )
 
     $skinJsFile = getSkinFile( 'js/skin.js' );
     $skinJsPhpFile = getSkinFile( 'js/skin.js.php' );
+    $cssJsFile = getSkinFile( 'js/'.$css.'.js' );
 
     $basename = basename( $file, '.php' );
     $viewCssFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css' );
@@ -98,7 +99,10 @@ function xhtmlHeaders( $file, $title )
   </script>
 <?php
     }
+	if ( $cssJsFile ) {
 ?>
+  <script type="text/javascript" src="<?php echo $cssJsFile ?>"></script>
+<?php } ?>
   <script type="text/javascript" src="<?php echo $skinJsFile ?>"></script>
 <?php
     if ( $viewJsFile )
diff --git a/web/skins/classic/js/Makefile.am b/web/skins/classic/js/Makefile.am
index 22f944d9e..8ae05c93b 100644
--- a/web/skins/classic/js/Makefile.am
+++ b/web/skins/classic/js/Makefile.am
@@ -4,4 +4,6 @@ webdir = @WEB_PREFIX@/skins/classic/js
 
 dist_web_DATA = \
 	skin.js \
+	classic.js \
+	flat.js \
 	skin.js.php
diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
new file mode 100644
index 000000000..8868c8ce7
--- /dev/null
+++ b/web/skins/classic/js/classic.js
@@ -0,0 +1,71 @@
+//
+// ZoneMinder base static javascript 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+//
+// This file should only contain static JavaScript and no php.
+// Use skin.js.php for JavaScript that need pre-processing
+//
+
+// Javascript window sizes
+var popupSizes = {
+    'bandwidth':    { 'width': 300, 'height': 120 },
+    'console':      { 'width': 750, 'height': 312 },
+    'control':      { 'width': 380, 'height': 480 },
+    'controlcaps':  { 'width': 780, 'height': 320 },
+    'controlcap':   { 'width': 400, 'height': 400 },
+    'cycle':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 62 },
+    'device':       { 'width': 260, 'height': 150 },
+    'devices':      { 'width': 400, 'height': 240 },
+    'donate':       { 'width': 500, 'height': 280 },
+    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
+    'eventdetail':  { 'width': 600, 'height': 220 },
+    'events':       { 'width': 960, 'height': 780 },
+    'export':       { 'width': 400, 'height': 340 },
+    'filter':       { 'width': 720, 'height': 360 },
+    'filtersave':   { 'width': 610, 'height': 120 },
+    'frame':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 100 },
+    'frames':       { 'width': 500, 'height': 600 },
+    'function':     { 'width': 300, 'height': 92 },
+    'group':        { 'width': 360, 'height': 180 },
+    'groups':       { 'width': 440, 'height': 220 },
+    'image':        { 'addWidth': 48, 'addHeight': 80 },
+    'log':          { 'width': 1080, 'height': 720 },
+    'login':        { 'width': 720, 'height': 480 },
+    'logout':       { 'width': 260, 'height': 100 },
+    'monitor':      { 'width': 450, 'height': 440 },
+    'monitorpreset':{ 'width': 440, 'height': 200 },
+    'monitorprobe': { 'width': 500, 'height': 240 },
+    'monitorselect':{ 'width': 160, 'height': 200 },
+    'montage':      { 'width': -1, 'height': -1 },
+    'onvifprobe':   { 'width': 500, 'height': 300 },
+    'optionhelp':   { 'width': 400, 'height': 320 },
+    'options':      { 'width': 1000, 'height': 660 },
+    'preset':       { 'width': 300, 'height': 120 },
+    'settings':     { 'width': 220, 'height': 225 },
+    'state':        { 'width': 370, 'height': 134 },
+    'stats':        { 'width': 840, 'height': 200 },
+    'timeline':     { 'width': 760, 'height': 540 },
+    'user':         { 'width': 360, 'height': 420 },
+    'version':      { 'width': 360, 'height': 140 },
+    'video':        { 'width': 420, 'height': 360 },
+    'videoview':    { 'addWidth': 48, 'addHeight': 80 },
+    'watch':        { 'addWidth': 96, 'minWidth': 420, 'addHeight': 384 },
+    'zone':         { 'addWidth': 450, 'addHeight': 200, 'minHeight': 450 },
+    'zones':        { 'addWidth': 72, 'addHeight': 232 }
+};
diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js
new file mode 100644
index 000000000..4e43ce170
--- /dev/null
+++ b/web/skins/classic/js/flat.js
@@ -0,0 +1,71 @@
+//
+// ZoneMinder base static javascript 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+//
+// This file should only contain static JavaScript and no php.
+// Use skin.js.php for JavaScript that need pre-processing
+//
+
+// Javascript window sizes
+var popupSizes = {
+    'bandwidth':    { 'width': 300, 'height': 120 },
+    'console':      { 'width': 750, 'height': 312 },
+    'control':      { 'width': 380, 'height': 480 },
+    'controlcaps':  { 'width': 780, 'height': 320 },
+    'controlcap':   { 'width': 400, 'height': 400 },
+    'cycle':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 62 },
+    'device':       { 'width': 260, 'height': 150 },
+    'devices':      { 'width': 400, 'height': 240 },
+    'donate':       { 'width': 500, 'height': 280 },
+    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
+    'eventdetail':  { 'width': 600, 'height': 220 },
+    'events':       { 'width': 960, 'height': 780 },
+    'export':       { 'width': 400, 'height': 340 },
+    'filter':       { 'width': 720, 'height': 360 },
+    'filtersave':   { 'width': 610, 'height': 120 },
+    'frame':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 100 },
+    'frames':       { 'width': 500, 'height': 600 },
+    'function':     { 'width': 300, 'height': 140 },
+    'group':        { 'width': 360, 'height': 180 },
+    'groups':       { 'width': 440, 'height': 220 },
+    'image':        { 'addWidth': 48, 'addHeight': 80 },
+    'log':          { 'width': 1080, 'height': 720 },
+    'login':        { 'width': 720, 'height': 480 },
+    'logout':       { 'width': 260, 'height': 100 },
+    'monitor':      { 'width': 450, 'height': 440 },
+    'monitorpreset':{ 'width': 440, 'height': 200 },
+    'monitorprobe': { 'width': 500, 'height': 240 },
+    'monitorselect':{ 'width': 160, 'height': 200 },
+    'montage':      { 'width': -1, 'height': -1 },
+    'onvifprobe':   { 'width': 500, 'height': 300 },
+    'optionhelp':   { 'width': 400, 'height': 320 },
+    'options':      { 'width': 1000, 'height': 660 },
+    'preset':       { 'width': 300, 'height': 120 },
+    'settings':     { 'width': 220, 'height': 225 },
+    'state':        { 'width': 400, 'height': 170 },
+    'stats':        { 'width': 840, 'height': 200 },
+    'timeline':     { 'width': 760, 'height': 540 },
+    'user':         { 'width': 360, 'height': 420 },
+    'version':      { 'width': 360, 'height': 140 },
+    'video':        { 'width': 420, 'height': 360 },
+    'videoview':    { 'addWidth': 48, 'addHeight': 80 },
+    'watch':        { 'addWidth': 96, 'minWidth': 420, 'addHeight': 384 },
+    'zone':         { 'addWidth': 450, 'addHeight': 200, 'minHeight': 450 },
+    'zones':        { 'addWidth': 72, 'addHeight': 232 }
+};
diff --git a/web/skins/classic/js/jquery-1.4.2.min.js b/web/skins/classic/js/jquery-1.4.2.min.js
deleted file mode 100644
index 7c2430802..000000000
--- a/web/skins/classic/js/jquery-1.4.2.min.js
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.2
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Feb 13 22:33:48 2010 -0500
- */
-(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o<i;o++)e(a[o],b,f?d.call(a[o],o,e(a[o],b)):d,j);return a}return i?
-e(a[0],b):w}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function na(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function oa(a){var b,d=[],f=[],e=arguments,j,i,o,k,n,r;i=c.data(this,"events");if(!(a.liveFired===this||!i||!i.live||a.button&&a.type==="click")){a.liveFired=this;var u=i.live.slice(0);for(k=0;k<u.length;k++){i=u[k];i.origType.replace(O,"")===a.type?f.push(i.selector):u.splice(k--,1)}j=c(a.target).closest(f,a.currentTarget);n=0;for(r=
-j.length;n<r;n++)for(k=0;k<u.length;k++){i=u[k];if(j[n].selector===i.selector){o=j[n].elem;f=null;if(i.preType==="mouseenter"||i.preType==="mouseleave")f=c(a.relatedTarget).closest(i.selector)[0];if(!f||f!==o)d.push({elem:o,handleObj:i})}}n=0;for(r=d.length;n<r;n++){j=d[n];a.currentTarget=j.elem;a.data=j.handleObj.data;a.handleObj=j.handleObj;if(j.handleObj.origHandler.apply(j.elem,e)===false){b=false;break}}return b}}function pa(a,b){return"live."+(a&&a!=="*"?a+".":"")+b.replace(/\./g,"`").replace(/ /g,
-"&")}function qa(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function ra(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var j in f)for(var i in f[j])c.event.add(this,j,f[j][i],f[j][i].data)}}})}function sa(a,b,d){var f,e,j;b=b&&b[0]?b[0].ownerDocument||b[0]:s;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===s&&!ta.test(a[0])&&(c.support.checkClone||!ua.test(a[0]))){e=
-true;if(j=c.fragments[a[0]])if(j!==1)f=j}if(!f){f=b.createDocumentFragment();c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=j?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(va.concat.apply([],va.slice(0,b)),function(){d[this]=a});return d}function wa(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Ra=A.jQuery,Sa=A.$,s=A.document,T,Ta=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
-Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
-(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
-a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
-"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
-function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(j in e){i=a[j];o=e[j];if(a!==o)if(f&&o&&(c.isPlainObject(o)||c.isArray(o))){i=i&&(c.isPlainObject(i)||
-c.isArray(i))?i:c.isArray(o)?[]:{};a[j]=c.extend(f,i,o)}else if(o!==w)a[j]=o}return a};c.extend({noConflict:function(a){A.$=Sa;if(a)A.jQuery=Ra;return c},isReady:false,ready:function(){if(!c.isReady){if(!s.body)return setTimeout(c.ready,13);c.isReady=true;if(Q){for(var a,b=0;a=Q[b++];)a.call(s,c);Q=null}c.fn.triggerHandler&&c(s).triggerHandler("ready")}},bindReady:function(){if(!xa){xa=true;if(s.readyState==="complete")return c.ready();if(s.addEventListener){s.addEventListener("DOMContentLoaded",
-L,false);A.addEventListener("load",c.ready,false)}else if(s.attachEvent){s.attachEvent("onreadystatechange",L);A.attachEvent("onload",c.ready);var a=false;try{a=A.frameElement==null}catch(b){}s.documentElement.doScroll&&a&&ma()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,
-"isPrototypeOf"))return false;var b;for(b in a);return b===w||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;a=c.trim(a);if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return A.JSON&&A.JSON.parse?A.JSON.parse(a):(new Function("return "+
-a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Va.test(a)){var b=s.getElementsByTagName("head")[0]||s.documentElement,d=s.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(s.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,j=a.length,i=j===w||c.isFunction(a);if(d)if(i)for(f in a){if(b.apply(a[f],
-d)===false)break}else for(;e<j;){if(b.apply(a[e++],d)===false)break}else if(i)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=a[0];e<j&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Wa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===
-a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==w;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,j=a.length;e<j;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,j=0,i=a.length;j<i;j++){e=b(a[j],j,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=w}else if(b&&
-!c.isFunction(b)){d=b;b=w}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});P=c.uaMatch(P);if(P.browser){c.browser[P.browser]=true;c.browser.version=P.version}if(c.browser.webkit)c.browser.safari=
-true;if(ya)c.inArray=function(a,b){return ya.call(b,a)};T=c(s);if(s.addEventListener)L=function(){s.removeEventListener("DOMContentLoaded",L,false);c.ready()};else if(s.attachEvent)L=function(){if(s.readyState==="complete"){s.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=s.documentElement,b=s.createElement("script"),d=s.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected,
-parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n=
-s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,
-applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando];
-else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,
-a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===
-w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i,
-cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className){for(var j=" "+e.className+" ",
-i=e.className,o=0,k=b.length;o<k;o++)if(j.indexOf(" "+b[o]+" ")<0)i+=" "+b[o];e.className=c.trim(i)}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(k){var n=c(this);n.removeClass(a.call(this,k,n.attr("class")))});if(a&&typeof a==="string"||a===w)for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var j=(" "+e.className+" ").replace(Aa," "),i=0,o=b.length;i<o;i++)j=j.replace(" "+b[i]+" ",
-" ");e.className=c.trim(j)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var j=c(this);j.toggleClass(a.call(this,e,j.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,j=0,i=c(this),o=b,k=a.split(ca);e=k[j++];){o=f?o:!i.hasClass(e);i[o?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=
-this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(Aa," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j<d;j++){var i=
-e[j];if(i.selected){a=c(i).val();if(b)return a;f.push(a)}}return f}if(Ba.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Za,"")}return w}var o=c.isFunction(a);return this.each(function(k){var n=c(this),r=a;if(this.nodeType===1){if(o)r=a.call(this,k,n.val());if(typeof r==="number")r+="";if(c.isArray(r)&&Ba.test(this.type))this.checked=c.inArray(n.val(),r)>=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
-c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
-a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
-function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
-k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
-C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B<r.length;B++){u=r[B];if(d.guid===u.guid){if(i||k.test(u.namespace)){f==null&&r.splice(B--,1);n.remove&&n.remove.call(a,u)}if(f!=
-null)break}}if(r.length===0||f!=null&&r.length===1){if(!n.teardown||n.teardown.call(a,o)===false)Ca(a,e,z.handle);delete C[e]}}else for(var B=0;B<r.length;B++){u=r[B];if(i||k.test(u.namespace)){c.event.remove(a,n,u.handler,B);r.splice(B--,1)}}}if(c.isEmptyObject(C)){if(b=z.handle)b.elem=null;delete z.events;delete z.handle;c.isEmptyObject(z)&&c.removeData(a)}}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=
-e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
-f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
-if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e<j;e++){var i=d[e];if(b||f.test(i.namespace)){a.handler=i.handler;a.data=i.data;a.handleObj=i;i=i.handler.apply(this,arguments);if(i!==w){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||s;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=s.documentElement;d=s.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==w)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,a.origType,c.extend({},a,{handler:oa}))},remove:function(a){var b=true,d=a.origType.replace(O,"");c.each(c.data(this,
-"events").live||[],function(){if(d===this.origType.replace(O,""))return b=false});b&&c.event.remove(this,a.origType,oa)}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};var Ca=s.removeEventListener?function(a,b,d){a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=
-a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,
-isImmediatePropagationStopped:Y};var Da=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},Ea=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ea:Da,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ea:Da)}}});if(!c.support.submitBubbles)c.event.special.submit=
-{setup:function(){if(this.nodeName.toLowerCase()!=="form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length)return na("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13)return na("submit",this,arguments)})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};
-if(!c.support.changeBubbles){var da=/textarea|input|select/i,ea,Fa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
-e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
-"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
-d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j<o;j++)c.event.add(this[j],d,i,f)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&
-!a.preventDefault)for(var d in a)this.unbind(d,a[d]);else{d=0;for(var f=this.length;d<f;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,f){return this.live(b,d,f,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},
-toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Ga={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e,j){var i,o=0,k,n,r=j||this.selector,
-u=j?this:c(this.context);if(c.isFunction(f)){e=f;f=w}for(d=(d||"").split(" ");(i=d[o++])!=null;){j=O.exec(i);k="";if(j){k=j[0];i=i.replace(O,"")}if(i==="hover")d.push("mouseenter"+k,"mouseleave"+k);else{n=i;if(i==="focus"||i==="blur"){d.push(Ga[i]+k);i+=k}else i=(Ga[i]||i)+k;b==="live"?u.each(function(){c.event.add(this,pa(i,r),{data:f,selector:r,handler:e,origType:i,origHandler:e,preType:n})}):u.unbind(pa(i,r),e)}}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),
-function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});A.attachEvent&&!A.addEventListener&&A.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});(function(){function a(g){for(var h="",l,m=0;g[m];m++){l=g[m];if(l.nodeType===3||l.nodeType===4)h+=l.nodeValue;else if(l.nodeType!==8)h+=a(l.childNodes)}return h}function b(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];
-if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=l;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}m[q]=y}}}function d(g,h,l,m,q,p){q=0;for(var v=m.length;q<v;q++){var t=m[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===l){y=m[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=l;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(k.filter(h,[t]).length>0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
-t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
-g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};k.matches=function(g,h){return k(g,null,null,h)};k.find=function(g,h,l){var m,q;if(!g)return[];
-for(var p=0,v=n.order.length;p<v;p++){var t=n.order[p];if(q=n.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");m=n.find[t](q,h,l);if(m!=null){g=g.replace(n.match[t],"");break}}}}m||(m=h.getElementsByTagName("*"));return{set:m,expr:g}};k.filter=function(g,h,l,m){for(var q=g,p=[],v=h,t,y,S=h&&h[0]&&x(h[0]);g&&h.length;){for(var H in n.filter)if((t=n.leftMatch[H].exec(g))!=null&&t[2]){var M=n.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-
-1)!=="\\"){if(v===p)p=[];if(n.preFilter[H])if(t=n.preFilter[H](t,v,l,p,m,S)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=v[U])!=null;U++)if(D){I=M(D,t,U,v);var Ha=m^!!I;if(l&&I!=null)if(Ha)y=true;else v[U]=false;else if(Ha){p.push(D);y=true}}if(I!==w){l||(v=p);g=g.replace(n.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)k.error(g);else break;q=g}return v};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var n=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,
-CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},
-relative:{"+":function(g,h){var l=typeof h==="string",m=l&&!/\W/.test(h);l=l&&!m;if(m)h=h.toLowerCase();m=0;for(var q=g.length,p;m<q;m++)if(p=g[m]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[m]=l||p&&p.nodeName.toLowerCase()===h?p||false:p===h}l&&k.filter(h,g,true)},">":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m<q;m++){var p=g[m];if(p){l=p.parentNode;g[m]=l.nodeName.toLowerCase()===h?l:false}}}else{m=0;for(q=g.length;m<q;m++)if(p=g[m])g[m]=
-l?p.parentNode:p.parentNode===h;l&&k.filter(h,g,true)}},"":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("parentNode",h,m,g,p,l)},"~":function(g,h,l){var m=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,m,g,p,l)}},find:{ID:function(g,h,l){if(typeof h.getElementById!=="undefined"&&!l)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var l=[];
-h=h.getElementsByName(g[1]);for(var m=0,q=h.length;m<q;m++)h[m].getAttribute("name")===g[1]&&l.push(h[m]);return l.length===0?null:l}},TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,l,m,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var v;(v=h[p])!=null;p++)if(v)if(q^(v.className&&(" "+v.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
-CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
-g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
-text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
-setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return h<l[3]-0},gt:function(g,h,l){return h>l[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
-h[3];l=0;for(m=h.length;l<m;l++)if(h[l]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+q)},CHILD:function(g,h){var l=h[1],m=g;switch(l){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(l==="first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":l=h[2];var q=h[3];if(l===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var v=0;for(m=p.firstChild;m;m=
-m.nextSibling)if(m.nodeType===1)m.nodeIndex=++v;p.sizcache=h}g=g.nodeIndex-q;return l===0?g===0:g%l===0&&g/l>=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
-"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
-h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l<m;l++)h.push(g[l]);else for(l=0;g[l];l++)h.push(g[l]);return h}}var B;if(s.documentElement.compareDocumentPosition)B=function(g,h){if(!g.compareDocumentPosition||
-!h.compareDocumentPosition){if(g==h)i=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===h?0:1;if(g===0)i=true;return g};else if("sourceIndex"in s.documentElement)B=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)i=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)i=true;return g};else if(s.createRange)B=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)i=true;return g.ownerDocument?-1:1}var l=g.ownerDocument.createRange(),m=
-h.ownerDocument.createRange();l.setStart(g,0);l.setEnd(g,0);m.setStart(h,0);m.setEnd(h,0);g=l.compareBoundaryPoints(Range.START_TO_END,m);if(g===0)i=true;return g};(function(){var g=s.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&&
-q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML="<a href='#'></a>";
-if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
-(function(){var g=s.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
-function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)k(g,h[q],l);return k.filter(m,l)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=a;c.isXMLDoc=x;c.contains=E})();var eb=/Until$/,fb=/^(?:parents|prevUntil|prevAll)/,
-gb=/,/;R=Array.prototype.slice;var Ia=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,j){return!!b.call(e,j,e)===d});else if(b.nodeType)return c.grep(a,function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Ua.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;
-c.find(a,this[f],b);if(f>0)for(var j=d;j<b.length;j++)for(var i=0;i<d;i++)if(b[i]===b[j]){b.splice(j--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ia(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ia(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
-{},i;if(f&&a.length){e=0;for(var o=a.length;e<o;e++){i=a[e];j[i]||(j[i]=c.expr.match.POS.test(i)?c(i,b||this.context):i)}for(;f&&f.ownerDocument&&f!==b;){for(i in j){e=j[i];if(e.jquery?e.index(f)>-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
-"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
-d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
-a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
-1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/<tbody/i,jb=/<|&#?\w+;/,ta=/<script|<object|<embed|<option|<style/i,ua=/checked\s*(?:[^=]|=\s*.checked.)/i,Ma=function(a,b,d){return hb.test(d)?
-a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
-""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var j=c(this),i=j.html();j.empty().append(function(){return a.call(this,e,i)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&
-this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,b,f))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(u){return c.nodeName(u,"table")?u.getElementsByTagName("tbody")[0]||
-u.appendChild(u.ownerDocument.createElement("tbody")):u}var e,j,i=a[0],o=[],k;if(!c.support.checkClone&&arguments.length===3&&typeof i==="string"&&ua.test(i))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(i))return this.each(function(u){var z=c(this);a[0]=i.call(this,u,b?z.html():w);z.domManip(a,b,d)});if(this[0]){e=i&&i.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:sa(a,this,o);k=e.fragment;if(j=k.childNodes.length===
-1?(k=k.firstChild):k.firstChild){b=b&&c.nodeName(j,"tr");for(var n=0,r=this.length;n<r;n++)d.call(b?f(this[n],j):this[n],n>0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
-return this}else{e=0;for(var j=d.length;e<j;e++){var i=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
-""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]==="<table>"&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
-c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
-c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
-function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
-Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
-"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
-a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
-a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/<script(.|\s)*?\/script>/gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
-"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("<div />").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
-serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
-function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
-global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
-e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
-"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
-false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
-false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
-c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
-d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
-g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
-1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
-"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
-if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");
-this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(la[d])f=la[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],
-"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},
-animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var j=c.extend({},e),i,o=this.nodeType===1&&c(this).is(":hidden"),k=this;for(i in a){var n=i.replace(ia,ja);if(i!==n){a[n]=a[i];delete a[i];i=n}if(a[i]==="hide"&&o||a[i]==="show"&&!o)return j.complete.call(this);if((i==="height"||i==="width")&&this.style){j.display=c.css(this,"display");j.overflow=this.style.overflow}if(c.isArray(a[i])){(j.specialEasing=
-j.specialEasing||{})[i]=a[i][1];a[i]=a[i][0]}}if(j.overflow!=null)this.style.overflow="hidden";j.curAnim=c.extend({},a);c.each(a,function(r,u){var z=new c.fx(k,j,r);if(Ab.test(u))z[u==="toggle"?o?"show":"hide":u](a);else{var C=Bb.exec(u),B=z.cur(true)||0;if(C){u=parseFloat(C[2]);var E=C[3]||"px";if(E!=="px"){k.style[r]=(u||1)+E;B=(u||1)/z.cur(true)*B;k.style[r]=B+E}if(C[1])u=(C[1]==="-="?-1:1)*u+B;z.custom(B,u,E)}else z.custom(B,u,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);
-this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
-"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
-c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
-this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
-this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
-e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||
-c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in s.documentElement?
-function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=
-this[0];if(a)return this.each(function(r){c.offset.setOffset(this,a,r)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=b,e=b.ownerDocument,j,i=e.documentElement,o=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var k=b.offsetTop,n=b.offsetLeft;(b=b.parentNode)&&b!==o&&b!==i;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;j=e?e.getComputedStyle(b,null):b.currentStyle;
-k-=b.scrollTop;n-=b.scrollLeft;if(b===d){k+=b.offsetTop;n+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&j.overflow!=="visible"){k+=parseFloat(j.borderTopWidth)||0;n+=parseFloat(j.borderLeftWidth)||0}f=j}if(f.position==="relative"||f.position==="static"){k+=o.offsetTop;n+=o.offsetLeft}if(c.offset.supportsFixedPosition&&
-f.position==="fixed"){k+=Math.max(i.scrollTop,o.scrollTop);n+=Math.max(i.scrollLeft,o.scrollLeft)}return{top:k,left:n}};c.offset={initialize:function(){var a=s.body,b=s.createElement("div"),d,f,e,j=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
-c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
-d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
-"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
-e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/web/skins/classic/js/jquery-1.7.2.js b/web/skins/classic/js/jquery-1.7.2.js
new file mode 100644
index 000000000..3774ff986
--- /dev/null
+++ b/web/skins/classic/js/jquery-1.7.2.js
@@ -0,0 +1,9404 @@
+/*!
+ * jQuery JavaScript Library v1.7.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Mar 21 12:46:34 2012 -0700
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+	navigator = window.navigator,
+	location = window.location;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Matches dashed string for camelizing
+	rdashAlpha = /-([a-z]|[0-9])/ig,
+	rmsPrefix = /^-ms-/,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return ( letter + "" ).toUpperCase();
+	},
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = quickExpr.exec( selector );
+			}
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = ( context ? context.ownerDocument || context : document );
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.7.2",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = this.constructor();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// Add the callback
+		readyList.add( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		i = +i;
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// Either a released hold or an DOMready/load event and not yet ready
+		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			readyList.fireWith( document, [ jQuery ] );
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).off( "ready" );
+			}
+		}
+	},
+
+	bindReady: function() {
+		if ( readyList ) {
+			return;
+		}
+
+		readyList = jQuery.Callbacks( "once memory" );
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	isWindow: function( obj ) {
+		return obj != null && obj == obj.window;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
+
+			return ( new Function( "return " + data ) )();
+
+		}
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+		var xml, tmp;
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction( object );
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type( array );
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array, i ) {
+		var len;
+
+		if ( array ) {
+			if ( indexOf ) {
+				return indexOf.call( array, elem, i );
+			}
+
+			len = array.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in array && array[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value, key, ret = [],
+			i = 0,
+			length = elems.length,
+			// jquery objects are treated as arrays
+			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( key in elems ) {
+				value = callback( elems[ key ], key, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		if ( typeof context === "string" ) {
+			var tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		var args = slice.call( arguments, 2 ),
+			proxy = function() {
+				return fn.apply( context, args.concat( slice.call( arguments ) ) );
+			};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
+		var exec,
+			bulk = key == null,
+			i = 0,
+			length = elems.length;
+
+		// Sets many values
+		if ( key && typeof key === "object" ) {
+			for ( i in key ) {
+				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
+			}
+			chainable = 1;
+
+		// Sets one value
+		} else if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = pass === undefined && jQuery.isFunction( value );
+
+			if ( bulk ) {
+				// Bulk operations only iterate when executing function values
+				if ( exec ) {
+					exec = fn;
+					fn = function( elem, key, value ) {
+						return exec.call( jQuery( elem ), value );
+					};
+
+				// Otherwise they run against the entire set
+				} else {
+					fn.call( elems, value );
+					fn = null;
+				}
+			}
+
+			if ( fn ) {
+				for (; i < length; i++ ) {
+					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+				}
+			}
+
+			chainable = 1;
+		}
+
+		return chainable ?
+			elems :
+
+			// Gets
+			bulk ?
+				fn.call( elems ) :
+				length ? fn( elems[0], key ) : emptyGet;
+	},
+
+	now: function() {
+		return ( new Date() ).getTime();
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	sub: function() {
+		function jQuerySub( selector, context ) {
+			return new jQuerySub.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySub, this );
+		jQuerySub.superclass = this;
+		jQuerySub.fn = jQuerySub.prototype = this();
+		jQuerySub.fn.constructor = jQuerySub;
+		jQuerySub.sub = this.sub;
+		jQuerySub.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+				context = jQuerySub( context );
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		};
+		jQuerySub.fn.init.prototype = jQuerySub.fn;
+		var rootjQuerySub = jQuerySub(document);
+		return jQuerySub;
+	},
+
+	browser: {}
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+return jQuery;
+
+})();
+
+
+// String to Object flags format cache
+var flagsCache = {};
+
+// Convert String-formatted flags into Object-formatted ones and store in cache
+function createFlags( flags ) {
+	var object = flagsCache[ flags ] = {},
+		i, length;
+	flags = flags.split( /\s+/ );
+	for ( i = 0, length = flags.length; i < length; i++ ) {
+		object[ flags[i] ] = true;
+	}
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	flags:	an optional list of space-separated flags that will change how
+ *			the callback list behaves
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible flags:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( flags ) {
+
+	// Convert flags from String-formatted to Object-formatted
+	// (we check in cache first)
+	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
+
+	var // Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = [],
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list was already fired
+		fired,
+		// Flag to know if list is currently firing
+		firing,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// Add one or several callbacks to the list
+		add = function( args ) {
+			var i,
+				length,
+				elem,
+				type,
+				actual;
+			for ( i = 0, length = args.length; i < length; i++ ) {
+				elem = args[ i ];
+				type = jQuery.type( elem );
+				if ( type === "array" ) {
+					// Inspect recursively
+					add( elem );
+				} else if ( type === "function" ) {
+					// Add if not in unique mode and callback is not in
+					if ( !flags.unique || !self.has( elem ) ) {
+						list.push( elem );
+					}
+				}
+			}
+		},
+		// Fire callbacks
+		fire = function( context, args ) {
+			args = args || [];
+			memory = !flags.memory || [ context, args ];
+			fired = true;
+			firing = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
+					memory = true; // Mark as halted
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( !flags.once ) {
+					if ( stack && stack.length ) {
+						memory = stack.shift();
+						self.fireWith( memory[ 0 ], memory[ 1 ] );
+					}
+				} else if ( memory === true ) {
+					self.disable();
+				} else {
+					list = [];
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					var length = list.length;
+					add( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away, unless previous
+					// firing was halted (stopOnFalse)
+					} else if ( memory && memory !== true ) {
+						firingStart = length;
+						fire( memory[ 0 ], memory[ 1 ] );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					var args = arguments,
+						argIndex = 0,
+						argLength = args.length;
+					for ( ; argIndex < argLength ; argIndex++ ) {
+						for ( var i = 0; i < list.length; i++ ) {
+							if ( args[ argIndex ] === list[ i ] ) {
+								// Handle firingIndex and firingLength
+								if ( firing ) {
+									if ( i <= firingLength ) {
+										firingLength--;
+										if ( i <= firingIndex ) {
+											firingIndex--;
+										}
+									}
+								}
+								// Remove the element
+								list.splice( i--, 1 );
+								// If we have some unicity property then
+								// we only need to do this once
+								if ( flags.unique ) {
+									break;
+								}
+							}
+						}
+					}
+				}
+				return this;
+			},
+			// Control if a given callback is in the list
+			has: function( fn ) {
+				if ( list ) {
+					var i = 0,
+						length = list.length;
+					for ( ; i < length; i++ ) {
+						if ( fn === list[ i ] ) {
+							return true;
+						}
+					}
+				}
+				return false;
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory || memory === true ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( stack ) {
+					if ( firing ) {
+						if ( !flags.once ) {
+							stack.push( [ context, args ] );
+						}
+					} else if ( !( flags.once && memory ) ) {
+						fire( context, args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!fired;
+			}
+		};
+
+	return self;
+};
+
+
+
+
+var // Static reference to slice
+	sliceDeferred = [].slice;
+
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var doneList = jQuery.Callbacks( "once memory" ),
+			failList = jQuery.Callbacks( "once memory" ),
+			progressList = jQuery.Callbacks( "memory" ),
+			state = "pending",
+			lists = {
+				resolve: doneList,
+				reject: failList,
+				notify: progressList
+			},
+			promise = {
+				done: doneList.add,
+				fail: failList.add,
+				progress: progressList.add,
+
+				state: function() {
+					return state;
+				},
+
+				// Deprecated
+				isResolved: doneList.fired,
+				isRejected: failList.fired,
+
+				then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
+					deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
+					return this;
+				},
+				always: function() {
+					deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
+					return this;
+				},
+				pipe: function( fnDone, fnFail, fnProgress ) {
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( {
+							done: [ fnDone, "resolve" ],
+							fail: [ fnFail, "reject" ],
+							progress: [ fnProgress, "notify" ]
+						}, function( handler, data ) {
+							var fn = data[ 0 ],
+								action = data[ 1 ],
+								returned;
+							if ( jQuery.isFunction( fn ) ) {
+								deferred[ handler ](function() {
+									returned = fn.apply( this, arguments );
+									if ( returned && jQuery.isFunction( returned.promise ) ) {
+										returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
+									} else {
+										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
+									}
+								});
+							} else {
+								deferred[ handler ]( newDefer[ action ] );
+							}
+						});
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					if ( obj == null ) {
+						obj = promise;
+					} else {
+						for ( var key in promise ) {
+							obj[ key ] = promise[ key ];
+						}
+					}
+					return obj;
+				}
+			},
+			deferred = promise.promise({}),
+			key;
+
+		for ( key in lists ) {
+			deferred[ key ] = lists[ key ].fire;
+			deferred[ key + "With" ] = lists[ key ].fireWith;
+		}
+
+		// Handle state
+		deferred.done( function() {
+			state = "resolved";
+		}, failList.disable, progressList.lock ).fail( function() {
+			state = "rejected";
+		}, doneList.disable, progressList.lock );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( firstParam ) {
+		var args = sliceDeferred.call( arguments, 0 ),
+			i = 0,
+			length = args.length,
+			pValues = new Array( length ),
+			count = length,
+			pCount = length,
+			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
+				firstParam :
+				jQuery.Deferred(),
+			promise = deferred.promise();
+		function resolveFunc( i ) {
+			return function( value ) {
+				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				if ( !( --count ) ) {
+					deferred.resolveWith( deferred, args );
+				}
+			};
+		}
+		function progressFunc( i ) {
+			return function( value ) {
+				pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				deferred.notifyWith( promise, pValues );
+			};
+		}
+		if ( length > 1 ) {
+			for ( ; i < length; i++ ) {
+				if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
+					args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( deferred, args );
+			}
+		} else if ( deferred !== firstParam ) {
+			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
+		}
+		return promise;
+	}
+});
+
+
+
+
+jQuery.support = (function() {
+
+	var support,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		fragment,
+		tds,
+		events,
+		eventName,
+		i,
+		isSupported,
+		div = document.createElement( "div" ),
+		documentElement = document.documentElement;
+
+	// Preliminary tests
+	div.setAttribute("className", "t");
+	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	all = div.getElementsByTagName( "*" );
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return {};
+	}
+
+	// First batch of supports tests
+	select = document.createElement( "select" );
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName( "input" )[ 0 ];
+
+	support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: ( a.getAttribute("href") === "/a" ),
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: ( input.value === "on" ),
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
+		// Tests for enctype support on a form(#6743)
+		enctype: !!document.createElement("form").enctype,
+
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
+		deleteExpando: true,
+		noCloneEvent: true,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true,
+		pixelMargin: true
+	};
+
+	// jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
+	jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent( "onclick", function() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			support.noCloneEvent = false;
+		});
+		div.cloneNode( true ).fireEvent( "onclick" );
+	}
+
+	// Check if a radio maintains its value
+	// after being appended to the DOM
+	input = document.createElement("input");
+	input.value = "t";
+	input.setAttribute("type", "radio");
+	support.radioValue = input.value === "t";
+
+	input.setAttribute("checked", "checked");
+
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( div.lastChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	fragment.removeChild( input );
+	fragment.appendChild( div );
+
+	// Technique from Juriy Zaytsev
+	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
+	// We only care about the case where non-standard event systems
+	// are used, namely in IE. Short-circuiting here helps us to
+	// avoid an eval call (in setAttribute) which can cause CSP
+	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+	if ( div.attachEvent ) {
+		for ( i in {
+			submit: 1,
+			change: 1,
+			focusin: 1
+		}) {
+			eventName = "on" + i;
+			isSupported = ( eventName in div );
+			if ( !isSupported ) {
+				div.setAttribute( eventName, "return;" );
+				isSupported = ( typeof div[ eventName ] === "function" );
+			}
+			support[ i + "Bubbles" ] = isSupported;
+		}
+	}
+
+	fragment.removeChild( div );
+
+	// Null elements to avoid leaks in IE
+	fragment = select = opt = div = input = null;
+
+	// Run tests that need a body at doc ready
+	jQuery(function() {
+		var container, outer, inner, table, td, offsetSupport,
+			marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight,
+			paddingMarginBorderVisibility, paddingMarginBorder,
+			body = document.getElementsByTagName("body")[0];
+
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
+
+		conMarginTop = 1;
+		paddingMarginBorder = "padding:0;margin:0;border:";
+		positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;";
+		paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;";
+		style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;";
+		html = "<div " + style + "display:block;'><div style='" + paddingMarginBorder + "0;display:block;overflow:hidden;'></div></div>" +
+			"<table " + style + "' cellpadding='0' cellspacing='0'>" +
+			"<tr><td></td></tr></table>";
+
+		container = document.createElement("div");
+		container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
+		body.insertBefore( container, body.firstChild );
+
+		// Construct the test element
+		div = document.createElement("div");
+		container.appendChild( div );
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		div.innerHTML = "<table><tr><td style='" + paddingMarginBorder + "0;display:none'></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName( "td" );
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE <= 8 fail this test)
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Check if div with explicit width and no margin-right incorrectly
+		// gets computed margin-right based on width of container. For more
+		// info see bug #3333
+		// Fails in WebKit before Feb 2011 nightlies
+		// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+		if ( window.getComputedStyle ) {
+			div.innerHTML = "";
+			marginDiv = document.createElement( "div" );
+			marginDiv.style.width = "0";
+			marginDiv.style.marginRight = "0";
+			div.style.width = "2px";
+			div.appendChild( marginDiv );
+			support.reliableMarginRight =
+				( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
+		}
+
+		if ( typeof div.style.zoom !== "undefined" ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.innerHTML = "";
+			div.style.width = div.style.padding = "1px";
+			div.style.border = 0;
+			div.style.overflow = "hidden";
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "block";
+			div.style.overflow = "visible";
+			div.innerHTML = "<div style='width:5px;'></div>";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+		}
+
+		div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility;
+		div.innerHTML = html;
+
+		outer = div.firstChild;
+		inner = outer.firstChild;
+		td = outer.nextSibling.firstChild.firstChild;
+
+		offsetSupport = {
+			doesNotAddBorder: ( inner.offsetTop !== 5 ),
+			doesAddBorderForTableAndCells: ( td.offsetTop === 5 )
+		};
+
+		inner.style.position = "fixed";
+		inner.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
+		inner.style.position = inner.style.top = "";
+
+		outer.style.overflow = "hidden";
+		outer.style.position = "relative";
+
+		offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
+		offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
+
+		if ( window.getComputedStyle ) {
+			div.style.marginTop = "1%";
+			support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%";
+		}
+
+		if ( typeof container.style.zoom !== "undefined" ) {
+			container.style.zoom = 1;
+		}
+
+		body.removeChild( container );
+		marginDiv = div = container = null;
+
+		jQuery.extend( support, offsetSupport );
+	});
+
+	return support;
+})();
+
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var privateCache, thisCache, ret,
+			internalKey = jQuery.expando,
+			getByName = typeof name === "string",
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey,
+			isEvents = name === "events";
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ internalKey ] = id = ++jQuery.uuid;
+			} else {
+				id = internalKey;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// Avoids exposing jQuery metadata on plain JS objects when the object
+			// is serialized using JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ] = jQuery.extend( cache[ id ], name );
+			} else {
+				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+			}
+		}
+
+		privateCache = thisCache = cache[ id ];
+
+		// jQuery data() is stored in a separate object inside the object's internal data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data.
+		if ( !pvt ) {
+			if ( !thisCache.data ) {
+				thisCache.data = {};
+			}
+
+			thisCache = thisCache.data;
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ jQuery.camelCase( name ) ] = data;
+		}
+
+		// Users should not attempt to inspect the internal events object using jQuery.data,
+		// it is undocumented and subject to change. But does anyone listen? No.
+		if ( isEvents && !thisCache[ name ] ) {
+			return privateCache.events;
+		}
+
+		// Check for both converted-to-camel and non-converted data property names
+		// If a data property was specified
+		if ( getByName ) {
+
+			// First Try to find as-is property data
+			ret = thisCache[ name ];
+
+			// Test for null|undefined property data
+			if ( ret == null ) {
+
+				// Try to find the camelCased property
+				ret = thisCache[ jQuery.camelCase( name ) ];
+			}
+		} else {
+			ret = thisCache;
+		}
+
+		return ret;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var thisCache, i, l,
+
+			// Reference to internal data cache key
+			internalKey = jQuery.expando,
+
+			isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ internalKey ] : internalKey;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+
+			thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+			if ( thisCache ) {
+
+				// Support array or space separated string names for data keys
+				if ( !jQuery.isArray( name ) ) {
+
+					// try the string as a key before any manipulation
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+
+						// split the camel cased version by spaces unless a key with the spaces exists
+						name = jQuery.camelCase( name );
+						if ( name in thisCache ) {
+							name = [ name ];
+						} else {
+							name = name.split( " " );
+						}
+					}
+				}
+
+				for ( i = 0, l = name.length; i < l; i++ ) {
+					delete thisCache[ name[i] ];
+				}
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( !pvt ) {
+			delete cache[ id ].data;
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		// Ensure that `cache` is not a window object #10080
+		if ( jQuery.support.deleteExpando || !cache.setInterval ) {
+			delete cache[ id ];
+		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the cache and need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ internalKey ];
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( internalKey );
+			} else {
+				elem[ internalKey ] = null;
+			}
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var parts, part, attr, name, l,
+			elem = this[0],
+			i = 0,
+			data = null;
+
+		// Gets all values
+		if ( key === undefined ) {
+			if ( this.length ) {
+				data = jQuery.data( elem );
+
+				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+					attr = elem.attributes;
+					for ( l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = jQuery.camelCase( name.substring(5) );
+
+							dataAttr( elem, name, data[ name ] );
+						}
+					}
+					jQuery._data( elem, "parsedAttrs", true );
+				}
+			}
+
+			return data;
+		}
+
+		// Sets multiple values
+		if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		parts = key.split( ".", 2 );
+		parts[1] = parts[1] ? "." + parts[1] : "";
+		part = parts[1] + "!";
+
+		return jQuery.access( this, function( value ) {
+
+			if ( value === undefined ) {
+				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
+
+				// Try to fetch any internally stored data first
+				if ( data === undefined && elem ) {
+					data = jQuery.data( elem, key );
+					data = dataAttr( elem, key, data );
+				}
+
+				return data === undefined && parts[1] ?
+					this.data( parts[0] ) :
+					data;
+			}
+
+			parts[1] = value;
+			this.each(function() {
+				var self = jQuery( this );
+
+				self.triggerHandler( "setData" + part, parts );
+				jQuery.data( this, key, value );
+				self.triggerHandler( "changeData" + part, parts );
+			});
+		}, null, value, arguments.length > 1, null, false );
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				jQuery.isNumeric( data ) ? +data :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+function handleQueueMarkDefer( elem, type, src ) {
+	var deferDataKey = type + "defer",
+		queueDataKey = type + "queue",
+		markDataKey = type + "mark",
+		defer = jQuery._data( elem, deferDataKey );
+	if ( defer &&
+		( src === "queue" || !jQuery._data(elem, queueDataKey) ) &&
+		( src === "mark" || !jQuery._data(elem, markDataKey) ) ) {
+		// Give room for hard-coded callbacks to fire first
+		// and eventually mark/queue something else on the element
+		setTimeout( function() {
+			if ( !jQuery._data( elem, queueDataKey ) &&
+				!jQuery._data( elem, markDataKey ) ) {
+				jQuery.removeData( elem, deferDataKey, true );
+				defer.fire();
+			}
+		}, 0 );
+	}
+}
+
+jQuery.extend({
+
+	_mark: function( elem, type ) {
+		if ( elem ) {
+			type = ( type || "fx" ) + "mark";
+			jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 );
+		}
+	},
+
+	_unmark: function( force, elem, type ) {
+		if ( force !== true ) {
+			type = elem;
+			elem = force;
+			force = false;
+		}
+		if ( elem ) {
+			type = type || "fx";
+			var key = type + "mark",
+				count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 );
+			if ( count ) {
+				jQuery._data( elem, key, count );
+			} else {
+				jQuery.removeData( elem, key, true );
+				handleQueueMarkDefer( elem, type, "mark" );
+			}
+		}
+	},
+
+	queue: function( elem, type, data ) {
+		var q;
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			q = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !q || jQuery.isArray(data) ) {
+					q = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					q.push( data );
+				}
+			}
+			return q || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift(),
+			hooks = {};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			jQuery._data( elem, type + ".run", hooks );
+			fn.call( elem, function() {
+				jQuery.dequeue( elem, type );
+			}, hooks );
+		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue " + type + ".run", true );
+			handleQueueMarkDefer( elem, type, "queue" );
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		var setter = 2;
+
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+			setter--;
+		}
+
+		if ( arguments.length < setter ) {
+			return jQuery.queue( this[0], type );
+		}
+
+		return data === undefined ?
+			this :
+			this.each(function() {
+				var queue = jQuery.queue( this, type, data );
+
+				if ( type === "fx" && queue[0] !== "inprogress" ) {
+					jQuery.dequeue( this, type );
+				}
+			});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, object ) {
+		if ( typeof type !== "string" ) {
+			object = type;
+			type = undefined;
+		}
+		type = type || "fx";
+		var defer = jQuery.Deferred(),
+			elements = this,
+			i = elements.length,
+			count = 1,
+			deferDataKey = type + "defer",
+			queueDataKey = type + "queue",
+			markDataKey = type + "mark",
+			tmp;
+		function resolve() {
+			if ( !( --count ) ) {
+				defer.resolveWith( elements, [ elements ] );
+			}
+		}
+		while( i-- ) {
+			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
+					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
+						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
+					jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) {
+				count++;
+				tmp.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise( object );
+	}
+});
+
+
+
+
+var rclass = /[\n\t\r]/g,
+	rspace = /\s+/,
+	rreturn = /\r/g,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute,
+	nodeHook, boolHook, fixSpecified;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classNames, i, l, elem,
+			setClass, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			classNames = value.split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className && classNames.length === 1 ) {
+						elem.className = value;
+
+					} else {
+						setClass = " " + elem.className + " ";
+
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
+								setClass += classNames[ c ] + " ";
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classNames, i, l, elem, className, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			classNames = ( value || "" ).split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						className = (" " + elem.className + " ").replace( rclass, " " );
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[ c ] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspace );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var self = jQuery(this), val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, i, max, option,
+					index = elem.selectedIndex,
+					values = [],
+					options = elem.options,
+					one = elem.type === "select-one";
+
+				// Nothing was selected
+				if ( index < 0 ) {
+					return null;
+				}
+
+				// Loop through all the selected options
+				i = one ? index : 0;
+				max = one ? index + 1 : options.length;
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// Don't return options that are disabled or in a disabled optgroup
+					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+				if ( one && !values.length && options.length ) {
+					return jQuery( options[ index ] ).val();
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+
+	attr: function( elem, name, value, pass ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery( elem )[ name ]( value );
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( notxml ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, "" + value );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			ret = elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret === null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var propName, attrNames, name, l, isBool,
+			i = 0;
+
+		if ( value && elem.nodeType === 1 ) {
+			attrNames = value.toLowerCase().split( rspace );
+			l = attrNames.length;
+
+			for ( ; i < l; i++ ) {
+				name = attrNames[ i ];
+
+				if ( name ) {
+					propName = jQuery.propFix[ name ] || name;
+					isBool = rboolean.test( name );
+
+					// See #9699 for explanation of this approach (setting first, then removal)
+					// Do not do this for boolean attributes (see #10870)
+					if ( !isBool ) {
+						jQuery.attr( elem, name, "" );
+					}
+					elem.removeAttribute( getSetAttribute ? name : propName );
+
+					// Set corresponding property to false for boolean attributes
+					if ( isBool && propName in elem ) {
+						elem[ propName ] = false;
+					}
+				}
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to it's default in case type is set after value
+					// This is for element creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		},
+		// Use the value property for back compat
+		// Use the nodeHook for button elements in IE6/7 (#1954)
+		value: {
+			get: function( elem, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.get( elem, name );
+				}
+				return name in elem ?
+					elem.value :
+					null;
+			},
+			set: function( elem, value, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.set( elem, value, name );
+				}
+				// Does not return so that setAttribute is also used
+				elem.value = value;
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return ( elem[ name ] = value );
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabindex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
+
+// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
+jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		// Align boolean attributes with corresponding properties
+		// Fall back to attribute presence where some booleans are not supported
+		var attrNode,
+			property = jQuery.prop( elem, name );
+		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		var propName;
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			// value is true since we know at this point it's type boolean and not false
+			// Set boolean attributes to the same name and set the DOM property
+			propName = jQuery.propFix[ name ] || name;
+			if ( propName in elem ) {
+				// Only set the IDL specifically if it already exists on the element
+				elem[ propName ] = true;
+			}
+
+			elem.setAttribute( name, name.toLowerCase() );
+		}
+		return name;
+	}
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	fixSpecified = {
+		name: true,
+		id: true,
+		coords: true
+	};
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret;
+			ret = elem.getAttributeNode( name );
+			return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ?
+				ret.nodeValue :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				ret = document.createAttribute( name );
+				elem.setAttributeNode( ret );
+			}
+			return ( ret.nodeValue = value + "" );
+		}
+	};
+
+	// Apply the nodeHook to tabindex
+	jQuery.attrHooks.tabindex.set = nodeHook.set;
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		get: nodeHook.get,
+		set: function( elem, value, name ) {
+			if ( value === "" ) {
+				value = "false";
+			}
+			nodeHook.set( elem, value, name );
+		}
+	};
+}
+
+
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = "" + value );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	});
+});
+
+
+
+
+var rformElems = /^(?:textarea|input|select)$/i,
+	rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
+	rhoverHack = /(?:^|\s)hover(\.\S+)?\b/,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
+	quickParse = function( selector ) {
+		var quick = rquickIs.exec( selector );
+		if ( quick ) {
+			//   0  1    2   3
+			// [ _, tag, id, class ]
+			quick[1] = ( quick[1] || "" ).toLowerCase();
+			quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" );
+		}
+		return quick;
+	},
+	quickIs = function( elem, m ) {
+		var attrs = elem.attributes || {};
+		return (
+			(!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
+			(!m[2] || (attrs.id || {}).value === m[2]) &&
+			(!m[3] || m[3].test( (attrs[ "class" ] || {}).value ))
+		);
+	},
+	hoverHack = function( events ) {
+		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+	};
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	add: function( elem, types, handler, data, selector ) {
+
+		var elemData, eventHandle, events,
+			t, tns, type, namespaces, handleObj,
+			handleObjIn, quick, handlers, special;
+
+		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
+		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+			selector = handleObjIn.selector;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		events = elemData.events;
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+		eventHandle = elemData.handle;
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = jQuery.trim( hoverHack(types) ).split( " " );
+		for ( t = 0; t < types.length; t++ ) {
+
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = tns[1];
+			namespaces = ( tns[2] || "" ).split( "." ).sort();
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: tns[1],
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				quick: selector && quickParse( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			handlers = events[ type ];
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+
+		var elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
+			t, tns, type, origType, namespaces, origCount,
+			j, events, special, handle, eventType, handleObj;
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
+		for ( t = 0; t < types.length; t++ ) {
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tns[1];
+			namespaces = tns[2];
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector? special.delegateType : special.bindType ) || type;
+			eventType = events[ type ] || [];
+			origCount = eventType.length;
+			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+
+			// Remove matching events
+			for ( j = 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					 ( !handler || handler.guid === handleObj.guid ) &&
+					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
+					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					eventType.splice( j--, 1 );
+
+					if ( handleObj.selector ) {
+						eventType.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( eventType.length === 0 && origCount !== eventType.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery.removeData( elem, [ "events", "handle" ], true );
+		}
+	},
+
+	// Events that are safe to short-circuit if no handlers are attached.
+	// Native DOM events should not be added, they may have inline handlers.
+	customEvent: {
+		"getData": true,
+		"setData": true,
+		"changeData": true
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		// Don't do events on text and comment nodes
+		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
+			return;
+		}
+
+		// Event object or event type
+		var type = event.type || event,
+			namespaces = [],
+			cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf( "!" ) >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
+
+		if ( type.indexOf( "." ) >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+
+		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+			// No jQuery handlers for this event type, and it can't have inline handlers
+			return;
+		}
+
+		// Caller can pass in an Event, Object, or just an event type string
+		event = typeof event === "object" ?
+			// jQuery.Event object
+			event[ jQuery.expando ] ? event :
+			// Object literal
+			new jQuery.Event( type, event ) :
+			// Just the event type (string)
+			new jQuery.Event( type );
+
+		event.type = type;
+		event.isTrigger = true;
+		event.exclusive = exclusive;
+		event.namespace = namespaces.join( "." );
+		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
+
+		// Handle a global trigger
+		if ( !elem ) {
+
+			// TODO: Stop taunting the data cache; remove global events and always attach to document
+			cache = jQuery.cache;
+			for ( i in cache ) {
+				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
+					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
+				}
+			}
+			return;
+		}
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		eventPath = [[ elem, special.bindType || type ]];
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
+			old = null;
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push([ cur, bubbleType ]);
+				old = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( old && old === elem.ownerDocument ) {
+				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
+			}
+		}
+
+		// Fire handlers on the event path
+		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
+
+			cur = eventPath[i][0];
+			event.type = eventPath[i][1];
+
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+			// Note that this is a bare JS function and not a jQuery handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				// IE<9 dies on focus/blur to hidden element (#1486)
+				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					old = elem[ ontype ];
+
+					if ( old ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					elem[ type ]();
+					jQuery.event.triggered = undefined;
+
+					if ( old ) {
+						elem[ ontype ] = old;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event || window.event );
+
+		var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
+			delegateCount = handlers.delegateCount,
+			args = [].slice.call( arguments, 0 ),
+			run_all = !event.exclusive && !event.namespace,
+			special = jQuery.event.special[ event.type ] || {},
+			handlerQueue = [],
+			i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Call the preDispatch hook for the mapped type, and let it bail if desired
+		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+			return;
+		}
+
+		// Determine handlers that should run if there are delegated events
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && !(event.button && event.type === "click") ) {
+
+			// Pregenerate a single jQuery object for reuse with .is()
+			jqcur = jQuery(this);
+			jqcur.context = this.ownerDocument || this;
+
+			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
+
+				// Don't process events on disabled elements (#6911, #8165)
+				if ( cur.disabled !== true ) {
+					selMatch = {};
+					matches = [];
+					jqcur[0] = cur;
+					for ( i = 0; i < delegateCount; i++ ) {
+						handleObj = handlers[ i ];
+						sel = handleObj.selector;
+
+						if ( selMatch[ sel ] === undefined ) {
+							selMatch[ sel ] = (
+								handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
+							);
+						}
+						if ( selMatch[ sel ] ) {
+							matches.push( handleObj );
+						}
+					}
+					if ( matches.length ) {
+						handlerQueue.push({ elem: cur, matches: matches });
+					}
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( handlers.length > delegateCount ) {
+			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
+		}
+
+		// Run delegates first; they may want to stop propagation beneath us
+		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
+			matched = handlerQueue[ i ];
+			event.currentTarget = matched.elem;
+
+			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
+				handleObj = matched.matches[ j ];
+
+				// Triggered event must either 1) be non-exclusive and have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
+		return event.result;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
+	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var eventDoc, doc, body,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop,
+			originalEvent = event,
+			fixHook = jQuery.event.fixHooks[ event.type ] || {},
+			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = jQuery.Event( originalEvent );
+
+		for ( i = copy.length; i; ) {
+			prop = copy[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Target should not be a text node (#504, Safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
+		if ( event.metaKey === undefined ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady
+		},
+
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+
+		focus: {
+			delegateType: "focusin"
+		},
+		blur: {
+			delegateType: "focusout"
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{ type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+// Some plugins are using, but it's undocumented/deprecated and will be removed.
+// The 1.7 special event interface should provide all the hooks needed now.
+jQuery.event.handle = jQuery.event.dispatch;
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj,
+				selector = handleObj.selector,
+				ret;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !form._submit_attached ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						event._submit_bubble = true;
+					});
+					form._submit_attached = true;
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+		
+		postDispatch: function( event ) {
+			// If form was submitted by the user, bubble the event up the tree
+			if ( event._submit_bubble ) {
+				delete event._submit_bubble;
+				if ( this.parentNode && !event.isTrigger ) {
+					jQuery.event.simulate( "submit", this.parentNode, event, true );
+				}
+			}
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+							jQuery.event.simulate( "change", this, event, true );
+						}
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					elem._change_attached = true;
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) { // && selector != null
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on( types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			var handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( var type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	live: function( types, data, fn ) {
+		jQuery( this.context ).on( types, this.selector, data, fn );
+		return this;
+	},
+	die: function( types, fn ) {
+		jQuery( this.context ).off( types, this.selector || "**", fn );
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn );
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			return jQuery.event.trigger( type, data, this[0], true );
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
+
+		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
+		while ( i < args.length ) {
+			args[ i++ ].guid = guid;
+		}
+
+		return this.click( toggler );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+
+	if ( rkeyEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
+	}
+
+	if ( rmouseEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+	}
+});
+
+
+
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	expando = "sizcache" + (Math.random() + '').replace('.', ''),
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rReturn = /\r\n/g,
+	rNonWord = /\W/;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+
+			parts.push( m[1] );
+
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context, seed );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+
+				set = posProcess( selector, set, seed );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set, i, len, match, type, left;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( i = 0, len = Expr.order.length; i < len; i++ ) {
+		type = Expr.order[i];
+
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace( rBackslash, "" );
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		type, found, item, filter, left,
+		i, pass,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				filter = Expr.filter[ type ];
+				left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							pass = not ^ found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Utility function for retreiving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+var getText = Sizzle.getText = function( elem ) {
+    var i, node,
+		nodeType = elem.nodeType,
+		ret = "";
+
+	if ( nodeType ) {
+		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+			// Use textContent || innerText for elements
+			if ( typeof elem.textContent === 'string' ) {
+				return elem.textContent;
+			} else if ( typeof elem.innerText === 'string' ) {
+				// Replace IE's carriage returns
+				return elem.innerText.replace( rReturn, '' );
+			} else {
+				// Traverse it's children
+				for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {
+					ret += getText( elem );
+				}
+			}
+		} else if ( nodeType === 3 || nodeType === 4 ) {
+			return elem.nodeValue;
+		}
+	} else {
+
+		// If no nodeType, this is expected to be an array
+		for ( i = 0; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			if ( node.nodeType !== 8 ) {
+				ret += getText( node );
+			}
+		}
+	}
+	return ret;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !rNonWord.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
+
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			var attr = elem.getAttribute( "type" ), type = elem.type;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
+		},
+
+		radio: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
+		},
+
+		password: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && "button" === elem.type || name === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		},
+
+		focus: function( elem ) {
+			return elem === elem.ownerDocument.activeElement;
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var first, last,
+				doneName, parent, cache,
+				count, diff,
+				type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) ) {
+						if ( node.nodeType === 1 ) {
+							return false;
+						}
+					}
+
+					if ( type === "first" ) {
+						return true;
+					}
+
+					node = elem;
+
+					/* falls through */
+				case "last":
+					while ( (node = node.nextSibling) ) {
+						if ( node.nodeType === 1 ) {
+							return false;
+						}
+					}
+
+					return true;
+
+				case "nth":
+					first = match[2];
+					last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+
+					doneName = match[0];
+					parent = elem.parentNode;
+
+					if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
+						count = 0;
+
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						}
+
+						parent[ expando ] = doneName;
+					}
+
+					diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
+		},
+
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Sizzle.attr ?
+					Sizzle.attr( elem, name ) :
+					Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				!type && Sizzle.attr ?
+				result != null :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+// Expose origPOS
+// "global" as in regardless of relation to brackets/parens
+Expr.match.globalPOS = origPOS;
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Fallback to using sourceIndex (in IE) if it's available on both nodes
+		} else if ( a.sourceIndex && b.sourceIndex ) {
+			return a.sourceIndex - b.sourceIndex;
+		}
+
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
+
+	if ( matches ) {
+		// Check to see if it's possible to do matchesSelector
+		// on a disconnected node (IE 9 fails this)
+		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
+			pseudoWorks = false;
+
+		try {
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( document.documentElement, "[test!='']:sizzle" );
+
+		} catch( pseudoError ) {
+			pseudoWorks = true;
+		}
+
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try {
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						var ret = matches.call( node, expr );
+
+						// IE 9's matchesSelector returns false on disconnected nodes
+						if ( ret || !disconnectedMatch ||
+								// As well, disconnected nodes are said to be in a document
+								// fragment in IE 9, so check for that
+								node.document && node.document.nodeType !== 11 ) {
+							return ret;
+						}
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem[ expando ] === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem[ expando ] = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem[ expando ] === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem[ expando ] = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context, seed ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet, seed );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+Sizzle.selectors.attrMap = {};
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.globalPOS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var self = this,
+			i, l;
+
+		if ( typeof selector !== "string" ) {
+			return jQuery( selector ).filter(function() {
+				for ( i = 0, l = self.length; i < l; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			});
+		}
+
+		var ret = this.pushStack( "", "find", selector ),
+			length, n, r;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && (
+			typeof selector === "string" ?
+				// If this is a positional selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				POS.test( selector ) ?
+					jQuery( selector, this.context ).index( this[0] ) >= 0 :
+					jQuery.filter( selector, this ).length > 0 :
+				this.filter( selector ).length > 0 );
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		// Array (deprecated as of jQuery 1.7)
+		if ( jQuery.isArray( selectors ) ) {
+			var level = 1;
+
+			while ( cur && cur.ownerDocument && cur !== context ) {
+				for ( i = 0; i < selectors.length; i++ ) {
+
+					if ( jQuery( cur ).is( selectors[ i ] ) ) {
+						ret.push({ selector: selectors[ i ], elem: cur, level: level });
+					}
+				}
+
+				cur = cur.parentNode;
+				level++;
+			}
+
+			return ret;
+		}
+
+		// String
+		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, slice.call( arguments ).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return ( elem === qualifier ) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+	});
+}
+
+
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+	safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style)/i,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /\/(java|ecma)script/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	},
+	safeFragment = createSafeFragment( document );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( value ) {
+		return jQuery.access( this, function( value ) {
+			return value === undefined ?
+				jQuery.text( this ) :
+				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+		}, null, value, arguments.length );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery.clean( arguments );
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery.clean(arguments) );
+			return set;
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
+
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					null;
+			}
+
+
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+
+				value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+				try {
+					for (; i < l; i++ ) {
+						// Remove element nodes and prevent memory leaks
+						elem = this[i] || {};
+						if ( elem.nodeType === 1 ) {
+							jQuery.cleanData( elem.getElementsByTagName( "*" ) );
+							elem.innerHTML = value;
+						}
+					}
+
+					elem = 0;
+
+				// If using innerHTML throws an exception, use the fallback method
+				} catch(e) {}
+			}
+
+			if ( elem ) {
+				this.empty().append( value );
+			}
+		}, null, value, arguments.length );
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.length ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+
+			fragment = results.fragment;
+
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || ( l > 1 && i < lastIndex ) ?
+							jQuery.clone( fragment, true, true ) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, function( i, elem ) {
+					if ( elem.src ) {
+						jQuery.ajax({
+							type: "GET",
+							global: false,
+							url: elem.src,
+							async: false,
+							dataType: "script"
+						});
+					} else {
+						jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
+					}
+
+					if ( elem.parentNode ) {
+						elem.parentNode.removeChild( elem );
+					}
+				});
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function cloneFixAttributes( src, dest ) {
+	var nodeName;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	if ( dest.clearAttributes ) {
+		dest.clearAttributes();
+	}
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	if ( dest.mergeAttributes ) {
+		dest.mergeAttributes( src );
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+
+	// IE blanks contents when cloning scripts
+	} else if ( nodeName === "script" && dest.text !== src.text ) {
+		dest.text = src.text;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+
+	// Clear flags for bubbling special change/submit events, they must
+	// be reattached when the newly cloned events are first activated
+	dest.removeAttribute( "_submit_attached" );
+	dest.removeAttribute( "_change_attached" );
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults, doc,
+	first = args[ 0 ];
+
+	// nodes may contain either an explicit document object,
+	// a jQuery collection or context object.
+	// If nodes[0] contains a valid object to assign to doc
+	if ( nodes && nodes[0] ) {
+		doc = nodes[0].ownerDocument || nodes[0];
+	}
+
+	// Ensure that an attr object doesn't incorrectly stand in as a document object
+	// Chrome and Firefox seem to allow this to occur and will throw exception
+	// Fixes #8950
+	if ( !doc.createDocumentFragment ) {
+		doc = document;
+	}
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
+	if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
+		first.charAt(0) === "<" && !rnocache.test( first ) &&
+		(jQuery.support.checkClone || !rchecked.test( first )) &&
+		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
+
+		cacheable = true;
+
+		cacheresults = jQuery.fragments[ first ];
+		if ( cacheresults && cacheresults !== 1 ) {
+			fragment = cacheresults;
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ first ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = ( i > 0 ? this.clone(true) : this ).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( typeof elem.getElementsByTagName !== "undefined" ) {
+		return elem.getElementsByTagName( "*" );
+
+	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( elem.type === "checkbox" || elem.type === "radio" ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+// Finds all inputs and passes them to fixDefaultChecked
+function findInputs( elem ) {
+	var nodeName = ( elem.nodeName || "" ).toLowerCase();
+	if ( nodeName === "input" ) {
+		fixDefaultChecked( elem );
+	// Skip scripts, get other children
+	} else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) {
+		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+	}
+}
+
+// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
+function shimCloneNode( elem ) {
+	var div = document.createElement( "div" );
+	safeFragment.appendChild( div );
+
+	div.innerHTML = elem.outerHTML;
+	return div.firstChild;
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var srcElements,
+			destElements,
+			i,
+			// IE<=8 does not properly clone detached, unknown element nodes
+			clone = jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ?
+				elem.cloneNode( true ) :
+				shimCloneNode( elem );
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					cloneFixAttributes( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		srcElements = destElements = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	clean: function( elems, context, fragment, scripts ) {
+		var checkScriptType, script, j,
+				ret = [];
+
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" ) {
+				if ( !rhtml.test( elem ) ) {
+					elem = context.createTextNode( elem );
+				} else {
+					// Fix "XHTML"-style tags in all browsers
+					elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+					// Trim whitespace, otherwise indexOf won't work as expected
+					var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
+						wrap = wrapMap[ tag ] || wrapMap._default,
+						depth = wrap[0],
+						div = context.createElement("div"),
+						safeChildNodes = safeFragment.childNodes,
+						remove;
+
+					// Append wrapper element to unknown element safe doc fragment
+					if ( context === document ) {
+						// Use the fragment we've already created for this document
+						safeFragment.appendChild( div );
+					} else {
+						// Use a fragment created with the owner document
+						createSafeFragment( context ).appendChild( div );
+					}
+
+					// Go to html and back, then peel off extra wrappers
+					div.innerHTML = wrap[1] + elem + wrap[2];
+
+					// Move to the right depth
+					while ( depth-- ) {
+						div = div.lastChild;
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						var hasBody = rtbody.test(elem),
+							tbody = tag === "table" && !hasBody ?
+								div.firstChild && div.firstChild.childNodes :
+
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !hasBody ?
+									div.childNodes :
+									[];
+
+						for ( j = tbody.length - 1; j >= 0 ; --j ) {
+							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							}
+						}
+					}
+
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					}
+
+					elem = div.childNodes;
+
+					// Clear elements from DocumentFragment (safeFragment or otherwise)
+					// to avoid hoarding elements. Fixes #11356
+					if ( div ) {
+						div.parentNode.removeChild( div );
+
+						// Guard against -1 index exceptions in FF3.6
+						if ( safeChildNodes.length > 0 ) {
+							remove = safeChildNodes[ safeChildNodes.length - 1 ];
+
+							if ( remove && remove.parentNode ) {
+								remove.parentNode.removeChild( remove );
+							}
+						}
+					}
+				}
+			}
+
+			// Resets defaultChecked for any radios and checkboxes
+			// about to be appended to the DOM in IE 6/7 (#8060)
+			var len;
+			if ( !jQuery.support.appendChecked ) {
+				if ( elem[0] && typeof (len = elem.length) === "number" ) {
+					for ( j = 0; j < len; j++ ) {
+						findInputs( elem[j] );
+					}
+				} else {
+					findInputs( elem );
+				}
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			checkScriptType = function( elem ) {
+				return !elem.type || rscriptType.test( elem.type );
+			};
+			for ( i = 0; ret[i]; i++ ) {
+				script = ret[i];
+				if ( scripts && jQuery.nodeName( script, "script" ) && (!script.type || rscriptType.test( script.type )) ) {
+					scripts.push( script.parentNode ? script.parentNode.removeChild( script ) : script );
+
+				} else {
+					if ( script.nodeType === 1 ) {
+						var jsTags = jQuery.grep( script.getElementsByTagName( "script" ), checkScriptType );
+
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+					}
+					fragment.appendChild( script );
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems ) {
+		var data, id,
+			cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+
+			if ( id ) {
+				data = cache[ id ];
+
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						// This is a shortcut to avoid jQuery.event.remove's overhead
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
+				}
+
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	// fixed for IE9, see #8346
+	rupper = /([A-Z]|^ms)/g,
+	rnum = /^[\-+]?(?:\d*\.)?\d+$/i,
+	rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
+	rrelNum = /^([\-+])=([\-+.\de]+)/,
+	rmargin = /^margin/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+
+	// order is important!
+	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+
+	curCSS,
+
+	getComputedStyle,
+	currentStyle;
+
+jQuery.fn.css = function( name, value ) {
+	return jQuery.access( this, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	}, name, value, arguments.length > 1 );
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		var ret, hooks;
+
+		// Make sure that we're working with the right name
+		name = jQuery.camelCase( name );
+		hooks = jQuery.cssHooks[ name ];
+		name = jQuery.cssProps[ name ] || name;
+
+		// cssFloat needs a special treatment
+		if ( name === "cssFloat" ) {
+			name = "float";
+		}
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {},
+			ret, name;
+
+		// Remember the old values, and insert the new ones
+		for ( name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		ret = callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+
+		return ret;
+	}
+});
+
+// DEPRECATED in 1.3, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, name ) {
+		var ret, defaultView, computedStyle, width,
+			style = elem.style;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( (defaultView = elem.ownerDocument.defaultView) &&
+				(computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		// A tribute to the "awesome hack by Dean Edwards"
+		// WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
+		// which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+		if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) {
+			width = style.width;
+			style.width = ret;
+			ret = computedStyle.width;
+			style.width = width;
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left, rsLeft, uncomputed,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret == null && style && (uncomputed = style[ name ]) ) {
+			ret = uncomputed;
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( rnumnonpx.test( ret ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ret;
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWidthOrHeight( elem, name, extra ) {
+
+	// Start with offset property
+	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		i = name === "width" ? 1 : 0,
+		len = 4;
+
+	if ( val > 0 ) {
+		if ( extra !== "border" ) {
+			for ( ; i < len; i += 2 ) {
+				if ( !extra ) {
+					val -= parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
+				}
+				if ( extra === "margin" ) {
+					val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
+				} else {
+					val -= parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+				}
+			}
+		}
+
+		return val + "px";
+	}
+
+	// Fall back to computed then uncomputed css if necessary
+	val = curCSS( elem, name );
+	if ( val < 0 || val == null ) {
+		val = elem.style[ name ];
+	}
+
+	// Computed unit is not pixels. Stop here and return.
+	if ( rnumnonpx.test(val) ) {
+		return val;
+	}
+
+	// Normalize "", auto, and prepare for extra
+	val = parseFloat( val ) || 0;
+
+	// Add padding, border, margin
+	if ( extra ) {
+		for ( ; i < len; i += 2 ) {
+			val += parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
+			if ( extra !== "padding" ) {
+				val += parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+			}
+			if ( extra === "margin" ) {
+				val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ]) ) || 0;
+			}
+		}
+	}
+
+	return val + "px";
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					return getWidthOrHeight( elem, name, extra );
+				} else {
+					return jQuery.swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, name, extra );
+					});
+				}
+			}
+		},
+
+		set: function( elem, value ) {
+			return rnum.test( value ) ?
+				value + "px" :
+				value;
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( parseFloat( RegExp.$1 ) / 100 ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there there is no filter style applied in a css rule, we are done
+				if ( currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery(function() {
+	// This hook cannot be added until DOM ready because the support test
+	// for it is not run until after DOM ready
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				return jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						return curCSS( elem, "margin-right" );
+					} else {
+						return elem.style.marginRight;
+					}
+				});
+			}
+		};
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+	margin: "",
+	padding: "",
+	border: "Width"
+}, function( prefix, suffix ) {
+
+	jQuery.cssHooks[ prefix + suffix ] = {
+		expand: function( value ) {
+			var i,
+
+				// assumes a single number if not a string
+				parts = typeof value === "string" ? value.split(" ") : [ value ],
+				expanded = {};
+
+			for ( i = 0; i < 4; i++ ) {
+				expanded[ prefix + cssExpand[ i ] + suffix ] =
+					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+			}
+
+			return expanded;
+		}
+	};
+});
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts,
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = ["*/"] + ["*"];
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for ( ; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+}
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf( " " );
+		if ( off >= 0 ) {
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = undefined;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
+				// If successful, inject the HTML into all the matched elements
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [ responseText, status, jqXHR ] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.on( o, f );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+});
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		if ( settings ) {
+			// Building a settings object
+			ajaxExtend( target, jQuery.ajaxSettings );
+		} else {
+			// Extending ajaxSettings
+			settings = target;
+			target = jQuery.ajaxSettings;
+		}
+		ajaxExtend( target, settings );
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": allTypes
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			context: true,
+			url: true
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						var lname = name.toLowerCase();
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, nativeStatusText, responses, headers ) {
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			var isSuccess,
+				success,
+				error,
+				statusText = nativeStatusText,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = "" + ( nativeStatusText || statusText );
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.add;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for ( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
+
+		// Determine if a cross-domain request is in order
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefilter, stop there
+		if ( state === 2 ) {
+			return false;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
+		}
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[ prefix ], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
+		// Serialize object item.
+		for ( var name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for ( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for ( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for ( key in s.converters ) {
+				if ( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if ( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for ( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|\?\?/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var inspectData = ( typeof s.data === "string" ) && /^application\/x\-www\-form\-urlencoded/.test( s.contentType );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				inspectData && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2";
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( inspectData ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
+			}
+		}
+
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Clean-up function
+		jqXHR.always(function() {
+			// Set callback back to previous value
+			window[ jsonpCallback ] = previous;
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( previous ) ) {
+				window[ jsonpCallback ]( responseContainer[ 0 ] );
+			}
+		});
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject ? function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	} : false,
+	xhrId = 0,
+	xhrCallbacks;
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+	jQuery.extend( jQuery.support, {
+		ajax: !!xhr,
+		cors: !!xhr && ( "withCredentials" in xhr )
+	});
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+
+									// When requesting binary data, IE6-9 will throw an exception
+									// on any attempt to access responseText (#11426)
+									try {
+										responses.text = xhr.responseText;
+									} catch( _ ) {
+									}
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
+var elemdisplay = {},
+	iframe, iframeDoc,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	],
+	fxNow;
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback );
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					// Reset the inline display of this element to learn if it is
+					// being hidden by cascaded rules or not
+					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+						display = elem.style.display = "";
+					}
+
+					// Set elements which have been overridden with display: none
+					// in a stylesheet to whatever the default browser style is
+					// for such an element
+					if ( (display === "" && jQuery.css(elem, "display") === "none") ||
+						!jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+						jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+					}
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					if ( display === "" || display === "none" ) {
+						elem.style.display = jQuery._data( elem, "olddisplay" ) || "";
+					}
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			var elem, display,
+				i = 0,
+				j = this.length;
+
+			for ( ; i < j; i++ ) {
+				elem = this[i];
+				if ( elem.style ) {
+					display = jQuery.css( elem, "display" );
+
+					if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) {
+						jQuery._data( elem, "olddisplay", display );
+					}
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				if ( this[i].style ) {
+					this[i].style.display = "none";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed( speed, easing, callback );
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete, [ false ] );
+		}
+
+		// Do not change referenced properties as per-property easing will be lost
+		prop = jQuery.extend( {}, prop );
+
+		function doAnimation() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			if ( optall.queue === false ) {
+				jQuery._mark( this );
+			}
+
+			var opt = jQuery.extend( {}, optall ),
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				name, val, p, e, hooks, replace,
+				parts, start, end, unit,
+				method;
+
+			// will store per property easing and be used to determine when an animation is complete
+			opt.animatedProperties = {};
+
+			// first pass over propertys to expand / normalize
+			for ( p in prop ) {
+				name = jQuery.camelCase( p );
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+				}
+
+				if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) {
+					replace = hooks.expand( prop[ name ] );
+					delete prop[ name ];
+
+					// not quite $.extend, this wont overwrite keys already present.
+					// also - reusing 'p' from above because we have the correct "name"
+					for ( p in replace ) {
+						if ( ! ( p in prop ) ) {
+							prop[ p ] = replace[ p ];
+						}
+					}
+				}
+			}
+
+			for ( name in prop ) {
+				val = prop[ name ];
+				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+				if ( jQuery.isArray( val ) ) {
+					opt.animatedProperties[ name ] = val[ 1 ];
+					val = prop[ name ] = val[ 0 ];
+				} else {
+					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
+				}
+
+				if ( val === "hide" && hidden || val === "show" && !hidden ) {
+					return opt.complete.call( this );
+				}
+
+				if ( isElement && ( name === "height" || name === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+
+						// inline-level elements accept inline-block;
+						// block-level elements need to be inline with layout
+						if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) {
+							this.style.display = "inline-block";
+
+						} else {
+							this.style.zoom = 1;
+						}
+					}
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			for ( p in prop ) {
+				e = new jQuery.fx( this, opt, p );
+				val = prop[ p ];
+
+				if ( rfxtypes.test( val ) ) {
+
+					// Tracks whether to show or hide based on private
+					// data attached to the element
+					method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 );
+					if ( method ) {
+						jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" );
+						e[ method ]();
+					} else {
+						e[ val ]();
+					}
+
+				} else {
+					parts = rfxnum.exec( val );
+					start = e.cur();
+
+					if ( parts ) {
+						end = parseFloat( parts[2] );
+						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( this, p, (end || 1) + unit);
+							start = ( (end || 1) / e.cur() ) * start;
+							jQuery.style( this, p, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			}
+
+			// For JS strict compliance
+			return true;
+		}
+
+		return optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+
+	stop: function( type, clearQueue, gotoEnd ) {
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var index,
+				hadTimers = false,
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			// clear marker counters if we know they won't be
+			if ( !gotoEnd ) {
+				jQuery._unmark( true, this );
+			}
+
+			function stopQueue( elem, data, index ) {
+				var hooks = data[ index ];
+				jQuery.removeData( elem, index, true );
+				hooks.stop( gotoEnd );
+			}
+
+			if ( type == null ) {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) {
+						stopQueue( this, data, index );
+					}
+				}
+			} else if ( data[ index = type + ".run" ] && data[ index ].stop ){
+				stopQueue( this, data, index );
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					if ( gotoEnd ) {
+
+						// force the next step to be the last
+						timers[ index ]( true );
+					} else {
+						timers[ index ].saveState();
+					}
+					hadTimers = true;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( !( gotoEnd && hadTimers ) ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	}
+
+});
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout( clearFxNow, 0 );
+	return ( fxNow = jQuery.now() );
+}
+
+function clearFxNow() {
+	fxNow = undefined;
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx( "show", 1 ),
+	slideUp: genFx( "hide", 1 ),
+	slideToggle: genFx( "toggle", 1 ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+		// normalize opt.queue - true/undefined/null -> "fx"
+		if ( opt.queue == null || opt.queue === true ) {
+			opt.queue = "fx";
+		}
+
+		// Queueing
+		opt.old = opt.complete;
+
+		opt.complete = function( noUnmark ) {
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+
+			if ( opt.queue ) {
+				jQuery.dequeue( this, opt.queue );
+			} else if ( noUnmark !== false ) {
+				jQuery._unmark( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p ) {
+			return p;
+		},
+		swing: function( p ) {
+			return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		options.orig = options.orig || {};
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = fxNow || createFxNow();
+		this.end = to;
+		this.now = this.start = from;
+		this.pos = this.state = 0;
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
+
+		function t( gotoEnd ) {
+			return self.step( gotoEnd );
+		}
+
+		t.queue = this.options.queue;
+		t.elem = this.elem;
+		t.saveState = function() {
+			if ( jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
+				if ( self.options.hide ) {
+					jQuery._data( self.elem, "fxshow" + self.prop, self.start );
+				} else if ( self.options.show ) {
+					jQuery._data( self.elem, "fxshow" + self.prop, self.end );
+				}
+			}
+		};
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval( fx.tick, fx.interval );
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		var dataShow = jQuery._data( this.elem, "fxshow" + this.prop );
+
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any flash of content
+		if ( dataShow !== undefined ) {
+			// This show is picking up where a previous hide or show left off
+			this.custom( this.cur(), dataShow );
+		} else {
+			this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() );
+		}
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom( this.cur(), 0 );
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var p, n, complete,
+			t = fxNow || createFxNow(),
+			done = true,
+			elem = this.elem,
+			options = this.options;
+
+		if ( gotoEnd || t >= options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			options.animatedProperties[ this.prop ] = true;
+
+			for ( p in options.animatedProperties ) {
+				if ( options.animatedProperties[ p ] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+
+					jQuery.each( [ "", "X", "Y" ], function( index, value ) {
+						elem.style[ "overflow" + value ] = options.overflow[ index ];
+					});
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( options.hide ) {
+					jQuery( elem ).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( options.hide || options.show ) {
+					for ( p in options.animatedProperties ) {
+						jQuery.style( elem, p, options.orig[ p ] );
+						jQuery.removeData( elem, "fxshow" + p, true );
+						// Toggle data is no longer needed
+						jQuery.removeData( elem, "toggle" + p, true );
+					}
+				}
+
+				// Execute the complete function
+				// in the event that the complete function throws an exception
+				// we must ensure it won't be called twice. #5684
+
+				complete = options.complete;
+				if ( complete ) {
+
+					options.complete = false;
+					complete.call( elem );
+				}
+			}
+
+			return false;
+
+		} else {
+			// classical easing cannot be used with an Infinity duration
+			if ( options.duration == Infinity ) {
+				this.now = t;
+			} else {
+				n = t - this.startTime;
+				this.state = n / options.duration;
+
+				// Perform the easing function, defaults to swing
+				this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration );
+				this.now = this.start + ( (this.end - this.start) * this.pos );
+			}
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timer,
+			timers = jQuery.timers,
+			i = 0;
+
+		for ( ; i < timers.length; i++ ) {
+			timer = timers[ i ];
+			// Checks the timer has not already been removed
+			if ( !timer() && timers[ i ] === timer ) {
+				timers.splice( i--, 1 );
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+// Ensure props that can't be negative don't go there on undershoot easing
+jQuery.each( fxAttrs.concat.apply( [], fxAttrs ), function( i, prop ) {
+	// exclude marginTop, marginLeft, marginBottom and marginRight from this list
+	if ( prop.indexOf( "margin" ) ) {
+		jQuery.fx.step[ prop ] = function( fx ) {
+			jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
+		};
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+// Try to restore the default display value of an element
+function defaultDisplay( nodeName ) {
+
+	if ( !elemdisplay[ nodeName ] ) {
+
+		var body = document.body,
+			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
+			display = elem.css( "display" );
+		elem.remove();
+
+		// If the simple way fails,
+		// get element's real default display by attaching it to a temp iframe
+		if ( display === "none" || display === "" ) {
+			// No iframe to use yet, so create it
+			if ( !iframe ) {
+				iframe = document.createElement( "iframe" );
+				iframe.frameBorder = iframe.width = iframe.height = 0;
+			}
+
+			body.appendChild( iframe );
+
+			// Create a cacheable copy of the iframe document on first call.
+			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+			// document to it; WebKit & Firefox won't allow reusing the iframe document.
+			if ( !iframeDoc || !iframe.createElement ) {
+				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+				iframeDoc.write( ( jQuery.support.boxModel ? "<!doctype html>" : "" ) + "<html><body>" );
+				iframeDoc.close();
+			}
+
+			elem = iframeDoc.createElement( nodeName );
+
+			iframeDoc.body.appendChild( elem );
+
+			display = jQuery.css( elem, "display" );
+			body.removeChild( iframe );
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var getOffset,
+	rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	getOffset = function( elem, doc, docElem, box ) {
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow( doc ),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
+			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	getOffset = function( elem, doc, docElem ) {
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.fn.offset = function( options ) {
+	if ( arguments.length ) {
+		return options === undefined ?
+			this :
+			this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+	}
+
+	var elem = this[0],
+		doc = elem && elem.ownerDocument;
+
+	if ( !doc ) {
+		return null;
+	}
+
+	if ( elem === doc.body ) {
+		return jQuery.offset.bodyOffset( elem );
+	}
+
+	return getOffset( elem, doc, doc.documentElement );
+};
+
+jQuery.offset = {
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+	var top = /Y/.test( prop );
+
+	jQuery.fn[ method ] = function( val ) {
+		return jQuery.access( this, function( elem, method, val ) {
+			var win = getWindow( elem );
+
+			if ( val === undefined ) {
+				return win ? (prop in win) ? win[ prop ] :
+					jQuery.support.boxModel && win.document.documentElement[ method ] ||
+						win.document.body[ method ] :
+					elem[ method ];
+			}
+
+			if ( win ) {
+				win.scrollTo(
+					!top ? val : jQuery( win ).scrollLeft(),
+					 top ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				elem[ method ] = val;
+			}
+		}, method, val, arguments.length, null );
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+	var clientProp = "client" + name,
+		scrollProp = "scroll" + name,
+		offsetProp = "offset" + name;
+
+	// innerHeight and innerWidth
+	jQuery.fn[ "inner" + name ] = function() {
+		var elem = this[0];
+		return elem ?
+			elem.style ?
+			parseFloat( jQuery.css( elem, type, "padding" ) ) :
+			this[ type ]() :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn[ "outer" + name ] = function( margin ) {
+		var elem = this[0];
+		return elem ?
+			elem.style ?
+			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
+			this[ type ]() :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( value ) {
+		return jQuery.access( this, function( elem, type, value ) {
+			var doc, docElemProp, orig, ret;
+
+			if ( jQuery.isWindow( elem ) ) {
+				// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+				doc = elem.document;
+				docElemProp = doc.documentElement[ clientProp ];
+				return jQuery.support.boxModel && docElemProp ||
+					doc.body && doc.body[ clientProp ] || docElemProp;
+			}
+
+			// Get document width or height
+			if ( elem.nodeType === 9 ) {
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+				doc = elem.documentElement;
+
+				// when a window > document, IE6 reports a offset[Width/Height] > client[Width/Height]
+				// so we can't use max, as it'll choose the incorrect offset[Width/Height]
+				// instead we use the correct client[Width/Height]
+				// support:IE6
+				if ( doc[ clientProp ] >= doc[ scrollProp ] ) {
+					return doc[ clientProp ];
+				}
+
+				return Math.max(
+					elem.body[ scrollProp ], doc[ scrollProp ],
+					elem.body[ offsetProp ], doc[ offsetProp ]
+				);
+			}
+
+			// Get width or height on the element
+			if ( value === undefined ) {
+				orig = jQuery.css( elem, type );
+				ret = parseFloat( orig );
+				return jQuery.isNumeric( ret ) ? ret : orig;
+			}
+
+			// Set the width or height on the element
+			jQuery( elem ).css( type, value );
+		}, type, value, arguments.length, null );
+	};
+});
+
+
+
+
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
+
+
+})( window );
diff --git a/web/skins/classic/js/jquery.js b/web/skins/classic/js/jquery.js
new file mode 120000
index 000000000..7fd8dd581
--- /dev/null
+++ b/web/skins/classic/js/jquery.js
@@ -0,0 +1 @@
+jquery-1.7.2.js
\ No newline at end of file
diff --git a/web/skins/classic/js/jquery.url b/web/skins/classic/js/jquery.url
new file mode 100644
index 000000000..71bd33d91
--- /dev/null
+++ b/web/skins/classic/js/jquery.url
@@ -0,0 +1 @@
+http://code.jquery.com/jquery-1.7.2.js
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index c6b106ade..26b44c427 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -22,54 +22,6 @@
 // Use skin.js.php for JavaScript that need pre-processing
 //
 
-// Javascript window sizes
-var popupSizes = {
-    'bandwidth':    { 'width': 300, 'height': 120 },
-    'console':      { 'width': 750, 'height': 312 },
-    'control':      { 'width': 380, 'height': 480 },
-    'controlcaps':  { 'width': 780, 'height': 320 },
-    'controlcap':   { 'width': 400, 'height': 400 },
-    'cycle':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 62 },
-    'device':       { 'width': 260, 'height': 150 },
-    'devices':      { 'width': 400, 'height': 240 },
-    'donate':       { 'width': 500, 'height': 280 },
-    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
-    'eventdetail':  { 'width': 600, 'height': 220 },
-    'events':       { 'width': 960, 'height': 780 },
-    'export':       { 'width': 400, 'height': 340 },
-    'filter':       { 'width': 720, 'height': 360 },
-    'filtersave':   { 'width': 610, 'height': 120 },
-    'frame':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 100 },
-    'frames':       { 'width': 500, 'height': 600 },
-    'function':     { 'width': 300, 'height': 92 },
-    'group':        { 'width': 360, 'height': 180 },
-    'groups':       { 'width': 440, 'height': 220 },
-    'image':        { 'addWidth': 48, 'addHeight': 80 },
-    'log':          { 'width': 1080, 'height': 720 },
-    'login':        { 'width': 720, 'height': 480 },
-    'logout':       { 'width': 260, 'height': 100 },
-    'monitor':      { 'width': 450, 'height': 440 },
-    'monitorpreset':{ 'width': 440, 'height': 200 },
-    'monitorprobe': { 'width': 500, 'height': 240 },
-    'monitorselect':{ 'width': 160, 'height': 200 },
-    'montage':      { 'width': -1, 'height': -1 },
-    'onvifprobe':   { 'width': 500, 'height': 300 },
-    'optionhelp':   { 'width': 400, 'height': 320 },
-    'options':      { 'width': 1000, 'height': 660 },
-    'preset':       { 'width': 300, 'height': 120 },
-    'settings':     { 'width': 220, 'height': 225 },
-    'state':        { 'width': 370, 'height': 134 },
-    'stats':        { 'width': 840, 'height': 200 },
-    'timeline':     { 'width': 760, 'height': 540 },
-    'user':         { 'width': 360, 'height': 420 },
-    'version':      { 'width': 360, 'height': 140 },
-    'video':        { 'width': 420, 'height': 360 },
-    'videoview':    { 'addWidth': 48, 'addHeight': 80 },
-    'watch':        { 'addWidth': 96, 'minWidth': 420, 'addHeight': 384 },
-    'zone':         { 'addWidth': 450, 'addHeight': 200, 'minHeight': 450 },
-    'zones':        { 'addWidth': 72, 'addHeight': 232 }
-};
-
 var popupOptions = "resizable,scrollbars,status=no";
 
 function checkSize() {
diff --git a/web/skins/classic/views/bandwidth.php b/web/skins/classic/views/bandwidth.php
index ce741e167..e0526311a 100644
--- a/web/skins/classic/views/bandwidth.php
+++ b/web/skins/classic/views/bandwidth.php
@@ -35,21 +35,21 @@ if ( $user && !empty($user['MaxBandwidth']) )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Bandwidth'] );
+xhtmlHeaders(__FILE__, translate('Bandwidth') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Bandwidth'] ?></h2>
+      <h2><?php echo translate('Bandwidth') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="action" value="bandwidth"/>
-        <p><?php echo $SLANG['SetNewBandwidth'] ?></p>
+        <p><?php echo translate('SetNewBandwidth') ?></p>
         <p><?php echo buildSelect( "newBandwidth", $bwArray ) ?></p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 024cb18d7..bf33802d9 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -20,14 +20,14 @@
 
 $eventCounts = array(
     array(
-        "title" => $SLANG['Events'],
+        "title" => translate('Events'),
         "filter" => array(
             "terms" => array(
             )
         ),
     ),
     array(
-        "title" => $SLANG['Hour'],
+        "title" => translate('Hour'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
@@ -35,7 +35,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Day'],
+        "title" => translate('Day'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
@@ -43,7 +43,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Week'],
+        "title" => translate('Week'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
@@ -51,7 +51,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Month'],
+        "title" => translate('Month'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
@@ -59,7 +59,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Archived'],
+        "title" => translate('Archived'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "1" ),
@@ -69,7 +69,7 @@ $eventCounts = array(
 );
 
 $running = daemonCheck();
-$status = $running?$SLANG['Running']:$SLANG['Stopped'];
+$status = $running?translate('Running'):translate('Stopped');
 
 $group = NULL;
 if ( ! empty($_COOKIE['zmGroup']) ) {
@@ -178,7 +178,7 @@ $seqDownFile = getSkinFile( 'graphics/seq-d.gif' );
 
 $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
 
-xhtmlHeaders( __FILE__, $SLANG['Console'] );
+xhtmlHeaders( __FILE__, translate('Console') );
 ?>
 <body>
   <div id="page">
@@ -187,28 +187,28 @@ xhtmlHeaders( __FILE__, $SLANG['Console'] );
     <input type="hidden" name="action" value=""/>
     <div id="header">
       <h3 id="systemTime"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG ) ?></h3>
-      <h3 id="systemStats"><?php echo $SLANG['Load'] ?>: <?php echo getLoad() ?> / <?php echo $SLANG['Disk'] ?>: <?php echo getDiskPercent() ?>%</h3>
-      <h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?php echo $SLANG['Console'] ?> - <?php echo makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2>
+      <h3 id="systemStats"><?php echo translate('Load') ?>: <?php echo getLoad() ?> / <?php echo translate('Disk') ?>: <?php echo getDiskPercent() ?>%</h3>
+      <h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?php echo translate('Console') ?> - <?php echo makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2>
       <div class="clear"></div>
-      <div id="monitorSummary"><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', 'Group: ' . ($group?' ('.$group['Name'].')':'All').': '. sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ) ); ?></div>
+      <div id="monitorSummary"><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', translate('Group') . ': ' . ($group?' ('.$group['Name'].')':'All').': '. sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ) ); ?></div>
 <?php
 if ( ZM_OPT_X10 && canView( 'Devices' ) )
 {
 ?>
-      <div id="devices"><?php echo makePopupLink( '?view=devices', 'zmDevices', 'devices', $SLANG['Devices'] ) ?></div>
+      <div id="devices"><?php echo makePopupLink( '?view=devices', 'zmDevices', 'devices', translate('Devices') ) ?></div>
 <?php
 }
 if ( canView( 'System' ) )
 {
 ?>
-      <div id="options"><?php echo makePopupLink( '?view=options', 'zmOptions', 'options', $SLANG['Options'] ) ?><?php if ( logToDatabase() > Logger::NOLOG ) { ?> / <?php echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.$SLANG['Log'].'</span>' ) ?><?php } ?></div>
+      <div id="options"><?php echo makePopupLink( '?view=options', 'zmOptions', 'options', translate('Options') ) ?><?php if ( logToDatabase() > Logger::NOLOG ) { ?> / <?php echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.translate('Log').'</span>' ) ?><?php } ?></div>
 <?php
 }
 if ( canView( 'Stream' ) && $cycleCount > 1 )
 {
     $cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
 ?>
-      <div id="cycleMontage"><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), $SLANG['Cycle'], $running ) ?>&nbsp;/&nbsp;<?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', $SLANG['Montage'], $running ) ?></div>
+      <div id="cycleMontage"><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), translate('Cycle'), $running ) ?>&nbsp;/&nbsp;<?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', translate('Montage'), $running ) ?></div>
 <?php
 }
 else
@@ -220,21 +220,21 @@ else
       <h3 id="loginBandwidth"><?php
 if ( ZM_OPT_USE_AUTH )
 {
-?><?php echo $SLANG['LoggedInAs'] ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?php echo strtolower( $SLANG['ConfiguredFor'] ) ?><?php
+?><?php echo translate('LoggedInAs') ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?php echo strtolower( translate('ConfiguredFor') ) ?><?php
 }
 else
 {
-?><?php echo $SLANG['ConfiguredFor'] ?><?php
+?><?php echo translate('ConfiguredFor') ?><?php
 }
-?>&nbsp;<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo $SLANG['BandwidthHead'] ?></h3>
+?>&nbsp;<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo translate('BandwidthHead') ?></h3>
     </div>
     <div id="content">
       <table id="consoleTable" cellspacing="0">
         <thead>
           <tr>
-            <th class="colName"><?php echo $SLANG['Name'] ?></th>
-            <th class="colFunction"><?php echo $SLANG['Function'] ?></th>
-            <th class="colSource"><?php echo $SLANG['Source'] ?></th>
+            <th class="colName"><?php echo translate('Name') ?></th>
+            <th class="colFunction"><?php echo translate('Function') ?></th>
+            <th class="colSource"><?php echo translate('Source') ?></th>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ )
 {
@@ -243,24 +243,24 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
 <?php
 }
 ?>
-            <th class="colZones"><?php echo $SLANG['Zones'] ?></th>
+            <th class="colZones"><?php echo translate('Zones') ?></th>
 <?php
 if ( canEdit('Monitors') )
 {
 ?>
-            <th class="colOrder"><?php echo $SLANG['Order'] ?></th>
+            <th class="colOrder"><?php echo translate('Order') ?></th>
 <?php
 }
 ?>
-            <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
+            <th class="colMark"><?php echo translate('Mark') ?></th>
           </tr>
         </thead>
         <tfoot>
           <tr>
             <td class="colLeftButtons" colspan="3">
-              <input type="button" value="<?php echo $SLANG['Refresh'] ?>" onclick="location.reload(true);"/>
-              <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
-              <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', $SLANG['Filters'], canView( 'Events' ) ) ?>
+              <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
+              <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
+              <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
             </td>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ )
@@ -272,7 +272,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
 }
 ?>
             <td class="colZones"><?php echo $zoneCount ?></td>
-            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
+            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
           </tr>
         </tfoot>
         <tbody>
@@ -302,7 +302,7 @@ foreach( $displayMonitors as $monitor )
     $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 ?>
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
-            <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.$SLANG['Fn'.$monitor['Function']].( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
+            <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php if ( $monitor['Type'] == "Local" ) { ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php
index 91a6654f1..4b979543c 100644
--- a/web/skins/classic/views/control.php
+++ b/web/skins/classic/views/control.php
@@ -53,15 +53,15 @@ $monitor = dbFetchOne( $sql, NULL, array( $mid ) );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Control'] );
+xhtmlHeaders(__FILE__, translate('Control') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Control'] ?></h2>
+      <h2><?php echo translate('Control') ?></h2>
       <div id="headerControl">
         <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
           <input type="hidden" name="view" value="<?php echo $view ?>"/>
diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php
index 9c2d53951..2a898de9c 100644
--- a/web/skins/classic/views/controlcap.php
+++ b/web/skins/classic/views/controlcap.php
@@ -25,15 +25,15 @@ if ( !canEdit( 'Control' ) )
 }
 
 $tabs = array();
-$tabs["main"] = $SLANG['Main'];
-$tabs["move"] = $SLANG['Move'];
-$tabs["pan"] = $SLANG['Pan'];
-$tabs["tilt"] = $SLANG['Tilt'];
-$tabs["zoom"] = $SLANG['Zoom'];
-$tabs["focus"] = $SLANG['Focus'];
-$tabs["white"] = $SLANG['White'];
-$tabs["iris"] = $SLANG['Iris'];
-$tabs["presets"] = $SLANG['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["white"] = translate('White');
+$tabs["iris"] = translate('Iris');
+$tabs["presets"] = translate('Presets');
 
 if ( isset($_REQUEST['tab']) )
     $tab = validHtmlStr($_REQUEST['tab']);
@@ -53,7 +53,7 @@ else
     else
     {
         $control = array(
-            'Name' => $SLANG['New'],
+            'Name' => translate('New'),
             'Type' => "Local",
             'Protocol' => "",
             'CanWake' => "",
@@ -155,12 +155,12 @@ else
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['ControlCap']." - ".$newControl['Name'] );
+xhtmlHeaders(__FILE__, translate('ControlCap')." - ".$newControl['Name'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['ControlCap'] ?> - <?php echo $newControl['Name'] ?></h2>
+      <h2><?php echo translate('ControlCap') ?> - <?php echo $newControl['Name'] ?></h2>
     </div>
     <div id="content">
       <ul class="tabList">
@@ -343,158 +343,158 @@ switch ( $tab )
     case 'main' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['Name'] ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>" size="24"/></td></tr>
+            <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'=>$SLANG['Local'], 'Remote'=>$SLANG['Remote'], 'Ffmpeg'=>$SLANG['Ffmpeg'], 'Libvlc'=>$SLANG['Libvlc'], 'cURL'=>"cURL");
+        $types = array( 'Local'=>translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>"cURL");
 ?>
-            <tr><th scope="row"><?php echo $SLANG['Type'] ?></th><td><?php echo buildSelect( "newControl[Type]", $types ); ?></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['CanSleep'] ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanReset'] ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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('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>
+            <tr><th scope="row"><?php echo translate('CanReset') ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }
     case 'move' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanMove'] ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanMoveDiag'] ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanMoveMap'] ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanMoveAbs'] ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanMoveRel'] ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanMoveCon'] ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMove') ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMoveDiag') ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMoveMap') ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMoveAbs') ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMoveRel') ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanMoveCon') ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }
     case 'pan' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinPanRange'] ?></th><td><input type="text" name="newControl[MinPanRange]" value="<?php echo $newControl['MinPanRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxPanRange'] ?></th><td><input type="text" name="newControl[MaxPanRange]" value="<?php echo $newControl['MaxPanRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinPanStep'] ?></th><td><input type="text" name="newControl[MinPanStep]" value="<?php echo $newControl['MinPanStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxPanStep'] ?></th><td><input type="text" name="newControl[MaxPanStep]" value="<?php echo $newControl['MaxPanStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinPanSpeed'] ?></th><td><input type="text" name="newControl[MinPanSpeed]" value="<?php echo $newControl['MinPanSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxPanSpeed'] ?></th><td><input type="text" name="newControl[MaxPanSpeed]" value="<?php echo $newControl['MaxPanSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['TurboPanSpeed'] ?></th><td><input type="text" name="newControl[TurboPanSpeed]" value="<?php echo $newControl['TurboPanSpeed'] ?>" size="8"/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxPanStep'] ?>" size="8"/></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 $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 $newControl['MaxPanSpeed'] ?>" size="8"/></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 $newControl['TurboPanSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'tilt' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinTiltRange'] ?></th><td><input type="text" name="newControl[MinTiltRange]" value="<?php echo $newControl['MinTiltRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxTiltRange'] ?></th><td><input type="text" name="newControl[MaxTiltRange]" value="<?php echo $newControl['MaxTiltRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinTiltStep'] ?></th><td><input type="text" name="newControl[MinTiltStep]" value="<?php echo $newControl['MinTiltStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxTiltStep'] ?></th><td><input type="text" name="newControl[MaxTiltStep]" value="<?php echo $newControl['MaxTiltStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinTiltSpeed'] ?></th><td><input type="text" name="newControl[MinTiltSpeed]" value="<?php echo $newControl['MinTiltSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxTiltSpeed'] ?></th><td><input type="text" name="newControl[MaxTiltSpeed]" value="<?php echo $newControl['MaxTiltSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['TurboTiltSpeed'] ?></th><td><input type="text" name="newControl[TurboTiltSpeed]" value="<?php echo $newControl['TurboTiltSpeed'] ?>" size="8"/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxTiltStep'] ?>" size="8"/></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 $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 $newControl['MaxTiltSpeed'] ?>" size="8"/></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 $newControl['TurboTiltSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'zoom' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanZoom'] ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['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 $SLANG['MinZoomRange'] ?></th><td><input type="text" name="newControl[MinZoomRange]" value="<?php echo $newControl['MinZoomRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxZoomRange'] ?></th><td><input type="text" name="newControl[MaxZoomRange]" value="<?php echo $newControl['MaxZoomRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinZoomStep'] ?></th><td><input type="text" name="newControl[MinZoomStep]" value="<?php echo $newControl['MinZoomStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxZoomStep'] ?></th><td><input type="text" name="newControl[MaxZoomStep]" value="<?php echo $newControl['MaxZoomStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinZoomSpeed'] ?></th><td><input type="text" name="newControl[MinZoomSpeed]" value="<?php echo $newControl['MinZoomSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxZoomSpeed'] ?></th><td><input type="text" name="newControl[MaxZoomSpeed]" value="<?php echo $newControl['MaxZoomSpeed'] ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanZoom') ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <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 $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 $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 $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 $newControl['MaxZoomStep'] ?>" size="8"/></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 $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 $newControl['MaxZoomSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'focus' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanFocus'] ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanAutoFocus'] ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['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 $SLANG['MinFocusRange'] ?></th><td><input type="text" name="newControl[MinFocusRange]" value="<?php echo $newControl['MinFocusRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxFocusRange'] ?></th><td><input type="text" name="newControl[MaxFocusRange]" value="<?php echo $newControl['MaxFocusRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinFocusStep'] ?></th><td><input type="text" name="newControl[MinFocusStep]" value="<?php echo $newControl['MinFocusStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxFocusStep'] ?></th><td><input type="text" name="newControl[MaxFocusStep]" value="<?php echo $newControl['MaxFocusStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinFocusSpeed'] ?></th><td><input type="text" name="newControl[MinFocusSpeed]" value="<?php echo $newControl['MinFocusSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxFocusSpeed'] ?></th><td><input type="text" name="newControl[MaxFocusSpeed]" value="<?php echo $newControl['MaxFocusSpeed'] ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanFocus') ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanAutoFocus') ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxFocusStep'] ?>" size="8"/></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 $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 $newControl['MaxFocusSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'iris' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanIris'] ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanAutoIris'] ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['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 $SLANG['MinIrisRange'] ?></th><td><input type="text" name="newControl[MinIrisRange]" value="<?php echo $newControl['MinIrisRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxIrisRange'] ?></th><td><input type="text" name="newControl[MaxIrisRange]" value="<?php echo $newControl['MaxIrisRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinIrisStep'] ?></th><td><input type="text" name="newControl[MinIrisStep]" value="<?php echo $newControl['MinIrisStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxIrisStep'] ?></th><td><input type="text" name="newControl[MaxIrisStep]" value="<?php echo $newControl['MaxIrisStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinIrisSpeed'] ?></th><td><input type="text" name="newControl[MinIrisSpeed]" value="<?php echo $newControl['MinIrisSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxIrisSpeed'] ?></th><td><input type="text" name="newControl[MaxIrisSpeed]" value="<?php echo $newControl['MaxIrisSpeed'] ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanIris') ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <tr><th scope="row"><?php echo translate('CanAutoIris') ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxIrisStep'] ?>" size="8"/></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 $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 $newControl['MaxIrisSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'gain' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanGain'] ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanAutoGain'] ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['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 $SLANG['MinGainRange'] ?></th><td><input type="text" name="newControl[MinGainRange]" value="<?php echo $newControl['MinGainRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxGainRange'] ?></th><td><input type="text" name="newControl[MaxGainRange]" value="<?php echo $newControl['MaxGainRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinGainStep'] ?></th><td><input type="text" name="newControl[MinGainStep]" value="<?php echo $newControl['MinGainStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxGainStep'] ?></th><td><input type="text" name="newControl[MaxGainStep]" value="<?php echo $newControl['MaxGainStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinGainSpeed'] ?></th><td><input type="text" name="newControl[MinGainSpeed]" value="<?php echo $newControl['MinGainSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxGainSpeed'] ?></th><td><input type="text" name="newControl[MaxGainSpeed]" value="<?php echo $newControl['MaxGainSpeed'] ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanGain') ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanAutoGain') ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxGainStep'] ?>" size="8"/></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 $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 $newControl['MaxGainSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'white' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['CanWhite'] ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['CanAutoWhite'] ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['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 $SLANG['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 $SLANG['MinWhiteRange'] ?></th><td><input type="text" name="newControl[MinWhiteRange]" value="<?php echo $newControl['MinWhiteRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxWhiteRange'] ?></th><td><input type="text" name="newControl[MaxWhiteRange]" value="<?php echo $newControl['MaxWhiteRange'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MinWhiteStep'] ?></th><td><input type="text" name="newControl[MinWhiteStep]" value="<?php echo $newControl['MinWhiteStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxWhiteStep'] ?></th><td><input type="text" name="newControl[MaxWhiteStep]" value="<?php echo $newControl['MaxWhiteStep'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['MinWhiteSpeed'] ?></th><td><input type="text" name="newControl[MinWhiteSpeed]" value="<?php echo $newControl['MinWhiteSpeed'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['MaxWhiteSpeed'] ?></th><td><input type="text" name="newControl[MaxWhiteSpeed]" value="<?php echo $newControl['MaxWhiteSpeed'] ?>" size="8"/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanWhite') ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanAutoWhite') ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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 $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 $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 $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 $newControl['MaxWhiteStep'] ?>" size="8"/></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 $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 $newControl['MaxWhiteSpeed'] ?>" size="8"/></td></tr>
 <?php
         break;
     }
     case 'presets' :
     {
 ?>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['NumPresets'] ?></th><td><input type="text" name="newControl[NumPresets]" value="<?php echo $newControl['NumPresets'] ?>" size="8"/></td></tr>
-            <tr><th scope="row"><?php echo $SLANG['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 $SLANG['CanSetPresets'] ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <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 $newControl['NumPresets'] ?>" size="8"/></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
         break;
     }
@@ -503,7 +503,7 @@ switch ( $tab )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php
index 560efc432..517f8141e 100644
--- a/web/skins/classic/views/controlcaps.php
+++ b/web/skins/classic/views/controlcaps.php
@@ -28,15 +28,15 @@ $controls = dbFetchAll( 'SELECT * FROM Controls ORDER BY Id' );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['ControlCaps'] );
+xhtmlHeaders(__FILE__, translate('ControlCaps') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['ControlCaps'] ?></h2>
+      <h2><?php echo translate('ControlCaps') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );">
@@ -45,16 +45,16 @@ xhtmlHeaders(__FILE__, $SLANG['ControlCaps'] );
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th class="colName"><?php echo $SLANG['Name'] ?></th>
-              <th class="colType"><?php echo $SLANG['Type'] ?></th>
-              <th class="colProtocol"><?php echo $SLANG['Protocol'] ?></th>
-              <th class="colCanMove"><?php echo $SLANG['CanMove'] ?></th>
-              <th class="colCanZoom"><?php echo $SLANG['CanZoom'] ?></th>
-              <th class="colCanFocus"><?php echo $SLANG['CanFocus'] ?></th>
-              <th class="colCanIris"><?php echo $SLANG['CanIris'] ?></th>
-              <th class="colCanWhiteBal"><?php echo $SLANG['CanWhiteBal'] ?></th>
-              <th class="colHasPresets"><?php echo $SLANG['HasPresets'] ?></th>
-              <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
+              <th class="colName"><?php echo translate('Name') ?></th>
+              <th class="colType"><?php echo translate('Type') ?></th>
+              <th class="colProtocol"><?php echo translate('Protocol') ?></th>
+              <th class="colCanMove"><?php echo translate('CanMove') ?></th>
+              <th class="colCanZoom"><?php echo translate('CanZoom') ?></th>
+              <th class="colCanFocus"><?php echo translate('CanFocus') ?></th>
+              <th class="colCanIris"><?php echo translate('CanIris') ?></th>
+              <th class="colCanWhiteBal"><?php echo translate('CanWhiteBal') ?></th>
+              <th class="colHasPresets"><?php echo translate('HasPresets') ?></th>
+              <th class="colMark"><?php echo translate('Mark') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -66,11 +66,11 @@ foreach( $controls as $control )
               <td class="colName"><?php echo makePopupLink( '?view=controlcap&amp;cid='.$control['Id'], 'zmControlCap', 'controlcap', $control['Name'], canView( 'Control' ) ) ?></td>
               <td class="colType"><?php echo $control['Type'] ?></td>
               <td class="colProtocol"><?php echo $control['Protocol'] ?></td>
-              <td class="colCanMove"><?php echo $control['CanMove']?$SLANG['Yes']:$SLANG['No'] ?></td>
-              <td class="colCanZoom"><?php echo $control['CanZoom']?$SLANG['Yes']:$SLANG['No'] ?></td>
-              <td class="colCanFocus"><?php echo $control['CanFocus']?$SLANG['Yes']:$SLANG['No'] ?></td>
-              <td class="colCanIris"><?php echo $control['CanIris']?$SLANG['Yes']:$SLANG['No'] ?></td>
-              <td class="colCanWhiteBal"><?php echo $control['CanWhite']?$SLANG['Yes']:$SLANG['No'] ?></td>
+              <td class="colCanMove"><?php echo $control['CanMove']?translate('Yes'):translate('No') ?></td>
+              <td class="colCanZoom"><?php echo $control['CanZoom']?translate('Yes'):translate('No') ?></td>
+              <td class="colCanFocus"><?php echo $control['CanFocus']?translate('Yes'):translate('No') ?></td>
+              <td class="colCanIris"><?php echo $control['CanIris']?translate('Yes'):translate('No') ?></td>
+              <td class="colCanWhiteBal"><?php echo $control['CanWhite']?translate('Yes'):translate('No') ?></td>
               <td class="colHasPresets"><?php echo $control['HasHomePreset']?'H':'' ?><?php echo $control['HasPresets']?$control['NumPresets']:'0' ?></td>
               <td class="colMark"><input type="checkbox" name="markCids[]" value="<?php echo $control['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/></td>
             </tr>
@@ -80,7 +80,7 @@ foreach( $controls as $control )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="button" value="<?php echo $SLANG['AddNewControl'] ?>" onclick="createPopup( '?view=controlcap', 'zmControlCap', 'controlcap' );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/>
+          <input type="button" value="<?php echo translate('AddNewControl') ?>" onclick="createPopup( '?view=controlcap', 'zmControlCap', 'controlcap' );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/controlpreset.php b/web/skins/classic/views/controlpreset.php
index 59c96db66..a36d03db9 100644
--- a/web/skins/classic/views/controlpreset.php
+++ b/web/skins/classic/views/controlpreset.php
@@ -34,7 +34,7 @@ foreach( dbFetchAll( 'SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, a
 $presets = array();
 for ( $i = 1; $i <= $monitor['NumPresets']; $i++ )
 {
-    $presets[$i] = $SLANG['Preset']." ".$i;
+    $presets[$i] = translate('Preset')." ".$i;
     if ( !empty($labels[$i]) )
     {
         $presets[$i] .= " (".validHtmlStr($labels[$i]).")";
@@ -44,12 +44,12 @@ for ( $i = 1; $i <= $monitor['NumPresets']; $i++ )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['SetPreset'] );
+xhtmlHeaders(__FILE__, translate('SetPreset') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['SetPreset'] ?></h2>
+      <h2><?php echo translate('SetPreset') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -59,9 +59,9 @@ xhtmlHeaders(__FILE__, $SLANG['SetPreset'] );
         <input type="hidden" name="control" value="presetSet"/>
         <input type="hidden" name="showControls" value="1"/>
         <p><?php echo buildSelect( "preset", $presets, "updateLabel()" ) ?></p>
-        <p><label for="newLabel"><?php echo $SLANG['NewLabel'] ?></label><input type="text" name="newLabel" id="newLabel" value="" size="16"/></p>
+        <p><label for="newLabel"><?php echo translate('NewLabel') ?></label><input type="text" name="newLabel" id="newLabel" value="" size="16"/></p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index b574925e7..a49e43953 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -87,20 +87,20 @@ noCacheHeaders();
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['CycleWatch'] );
+xhtmlHeaders(__FILE__, translate('CycleWatch') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
 <?php if ( $mode == "stream" ) { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo $SLANG['Stills'] ?></a>
+        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo translate('Stills') ?></a>
 <?php } else { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo $SLANG['Stream'] ?></a>
+        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo translate('Stream') ?></a>
 <?php } ?>
-        <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Cycle'] ?> - <?php echo validHtmlStr($monitor['Name']) ?></h2>
+      <h2><?php echo translate('Cycle') ?> - <?php echo validHtmlStr($monitor['Name']) ?></h2>
     </div>
     <div id="content">
       <div id="imageFeed">
diff --git a/web/skins/classic/views/device.php b/web/skins/classic/views/device.php
index 41096fd72..4b58d3e5f 100644
--- a/web/skins/classic/views/device.php
+++ b/web/skins/classic/views/device.php
@@ -33,12 +33,12 @@ if ( !empty($_REQUEST['did']) ) {
     );
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Device']." - ".$newDevice['Name'] );
+xhtmlHeaders( __FILE__, translate('Device')." - ".$newDevice['Name'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Device']." - ".validHtmlStr($newDevice['Name']) ?></h2>
+      <h2><?php echo translate('Device')." - ".validHtmlStr($newDevice['Name']) ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -48,17 +48,17 @@ xhtmlHeaders( __FILE__, $SLANG['Device']." - ".$newDevice['Name'] );
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['Name'] ?></th>
+              <th scope="row"><?php echo translate('Name') ?></th>
               <td><input type="text" name="newDevice[Name]" value="<?php echo validHtmlStr($newDevice['Name']) ?>"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['KeyString'] ?></th>
+              <th scope="row"><?php echo translate('KeyString') ?></th>
               <td><input type="text" name="newDevice[KeyString]" value="<?php echo validHtmlStr($newDevice['KeyString']) ?>"/></td>
             </tr>
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Devices' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Devices' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/devices.php b/web/skins/classic/views/devices.php
index 90efca19d..c2f7a384f 100644
--- a/web/skins/classic/views/devices.php
+++ b/web/skins/classic/views/devices.php
@@ -32,12 +32,12 @@ foreach( dbFetchAll( $sql ) as $row )
     $devices[] = $row;
 }
 
-xhtmlHeaders(__FILE__, $SLANG['Devices'] );
+xhtmlHeaders(__FILE__, translate('Devices') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Devices'] ?></h2>
+      <h2><?php echo translate('Devices') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -65,8 +65,8 @@ foreach( $devices as $device )
 ?>
             <tr>
               <td><?php echo makePopupLink( '?view=device&amp;did='.$device['Id'], 'zmDevice', 'device', '<span class="'.$fclass.'">'.validHtmlStr($device['Name']).' ('.validHtmlStr($device['KeyString']).')</span>', canEdit( 'Devices' ) ) ?></td>
-              <td><input type="button" value="<?php echo $SLANG['On'] ?>"<?php echo ($device['Status'] != 'ON')?' class="set"':'' ?> onclick="switchDeviceOn( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
-              <td><input type="button" value="<?php echo $SLANG['Off'] ?>"<?php echo ($device['Status'] != 'OFF')?' class="set"':'' ?> onclick="switchDeviceOff( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
+              <td><input type="button" value="<?php echo translate('On') ?>"<?php echo ($device['Status'] != 'ON')?' class="set"':'' ?> onclick="switchDeviceOn( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
+              <td><input type="button" value="<?php echo translate('Off') ?>"<?php echo ($device['Status'] != 'OFF')?' class="set"':'' ?> onclick="switchDeviceOff( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
               <td><input type="checkbox" name="markDids[]" value="<?php echo $device['Id'] ?>" onclick="configureButtons( this, 'markDids' );"<?php if ( !canEdit( 'Devices' ) ) {?> disabled="disabled"<?php } ?>/></td>
             </tr>
 <?php
@@ -75,9 +75,9 @@ foreach( $devices as $device )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="button" value="<?php echo $SLANG['New'] ?>" onclick="createPopup( '?view=device&amp;did=0', 'zmDevice', 'device' )"<?php echo canEdit('Devices')?'':' disabled="disabled"' ?>/>
-          <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteDevice( this )" disabled="disabled"/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="button" value="<?php echo translate('New') ?>" onclick="createPopup( '?view=device&amp;did=0', 'zmDevice', 'device' )"<?php echo canEdit('Devices')?'':' disabled="disabled"' ?>/>
+          <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteDevice( this )" disabled="disabled"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/donate.php b/web/skins/classic/views/donate.php
index ce37ee0bf..35dd002a1 100644
--- a/web/skins/classic/views/donate.php
+++ b/web/skins/classic/views/donate.php
@@ -25,38 +25,38 @@ if ( !canEdit( 'System' ) )
 }
 
 $options = array( 
-    "go"      => $SLANG['DonateYes'],
-    "hour"    => $SLANG['DonateRemindHour'],
-    "day"     => $SLANG['DonateRemindDay'],
-    "week"    => $SLANG['DonateRemindWeek'],
-    "month"   => $SLANG['DonateRemindMonth'],
-    "never"   => $SLANG['DonateRemindNever'],
-    "already" => $SLANG['DonateAlready'],
+    "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__, $SLANG['Donate'] );
+xhtmlHeaders(__FILE__, translate('Donate') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Donate'] ?></h2>
-      <h1>ZoneMinder - <?php echo $SLANG['Donate'] ?></h1>
+      <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="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="action" value="donate"/>
         <p>
-          <?php echo $SLANG['DonateEnticement'] ?>
+          <?php echo translate('DonateEnticement') ?>
         </p>
         <p>
           <?php echo buildSelect( "option", $options ); ?>
         </p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Apply'] ?>" onclick="submitForm( this )">
-          <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()">
+          <input type="submit" value="<?php echo translate('Apply') ?>" onclick="submitForm( this )">
+          <input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()">
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/error.php b/web/skins/classic/views/error.php
index c2d2a3009..21741c557 100644
--- a/web/skins/classic/views/error.php
+++ b/web/skins/classic/views/error.php
@@ -20,22 +20,22 @@
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Error'] );
+xhtmlHeaders(__FILE__, translate('Error') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Error'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Error') ?></h1>
     </div>
     <div id="content">
       <p>
-        <?php echo $SLANG['YouNoPerms'] ?>
+        <?php echo translate('YouNoPerms') ?>
       </p>
       <p>
-        <?php echo $SLANG['ContactAdmin'] ?>
+        <?php echo translate('ContactAdmin') ?>
       </p>
       <p>
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </p>
     </div>
   </div>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 543015a9a..24294a418 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -27,7 +27,7 @@ if ( !canView( 'Events' ) )
 $eid = validInt( $_REQUEST['eid'] );
 $fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
 
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
+$sql = 'SELECT E.*,M.Name AS MonitorName,M.Width,M.Height,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
 $sql_values = array( $eid );
 
 if ( $user['MonitorIds'] ) {
@@ -47,15 +47,15 @@ else
     $scale = reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
 
 $replayModes = array(
-    'single' => $SLANG['ReplaySingle'],
-    'all' => $SLANG['ReplayAll'],
-    'gapless' => $SLANG['ReplayGapless'],
+    'single' => translate('ReplaySingle'),
+    'all' => translate('ReplayAll'),
+    'gapless' => translate('ReplayGapless'),
 );
 
 if ( isset( $_REQUEST['streamMode'] ) )
-	$streamMode = validHtmlStr($_REQUEST['streamMode']);
+    $streamMode = validHtmlStr($_REQUEST['streamMode']);
 else
-	$streamMode = video;
+    $streamMode = video;
 
 if ( isset( $_REQUEST['replayMode'] ) )
     $replayMode = validHtmlStr($_REQUEST['replayMode']);
@@ -78,7 +78,7 @@ $connkey = generateConnKey();
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Event'] );
+xhtmlHeaders(__FILE__, translate('Event') );
 ?>
 <body>
   <div id="page">
@@ -86,46 +86,46 @@ xhtmlHeaders(__FILE__, $SLANG['Event'] );
       <div id="dataBar">
         <table id="dataTable" class="major" cellspacing="0">
           <tr>
-            <td><span id="dataId" title="<?php echo $SLANG['Id'] ?>"><?php echo $event['Id'] ?></span></td>
-            <td><span id="dataCause" title="<?php echo $event['Notes']?validHtmlStr($event['Notes']):$SLANG['AttrCause'] ?>"><?php echo validHtmlStr($event['Cause']) ?></span></td>
-            <td><span id="dataTime" title="<?php echo $SLANG['Time'] ?>"><?php echo strftime( STRF_FMT_DATETIME_SHORT, strtotime($event['StartTime'] ) ) ?></span></td>
-            <td><span id="dataDuration" title="<?php echo $SLANG['Duration'] ?>"><?php echo $event['Length'] ?></span>s</td>
-            <td><span id="dataFrames" title="<?php echo $SLANG['AttrFrames']."/".$SLANG['AttrAlarmFrames'] ?>"><?php echo $event['Frames'] ?>/<?php echo $event['AlarmFrames'] ?></span></td>
-            <td><span id="dataScore" title="<?php echo $SLANG['AttrTotalScore']."/".$SLANG['AttrAvgScore']."/".$SLANG['AttrMaxScore'] ?>"><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></span></td>
+            <td><span id="dataId" title="<?php echo translate('Id') ?>"><?php echo $event['Id'] ?></span></td>
+            <td><span id="dataCause" title="<?php echo $event['Notes']?validHtmlStr($event['Notes']):translate('AttrCause') ?>"><?php echo validHtmlStr($event['Cause']) ?></span></td>
+            <td><span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime( STRF_FMT_DATETIME_SHORT, strtotime($event['StartTime'] ) ) ?></span></td>
+            <td><span id="dataDuration" title="<?php echo translate('Duration') ?>"><?php echo $event['Length'] ?></span>s</td>
+            <td><span id="dataFrames" title="<?php echo translate('AttrFrames')."/".translate('AttrAlarmFrames') ?>"><?php echo $event['Frames'] ?>/<?php echo $event['AlarmFrames'] ?></span></td>
+            <td><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></td>
           </tr>
         </table>
       </div>
       <div id="menuBar1">
-        <div id="scaleControl"><label for="scale"><?php echo $SLANG['Scale'] ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
-        <div id="replayControl"><label for="replayMode"><?php echo $SLANG['Replay'] ?></label><?php echo buildSelect( "replayMode", $replayModes, "changeReplayMode();" ); ?></div>
-        <div id="nameControl"><input type="text" id="eventName" name="eventName" value="<?php echo validHtmlStr($event['Name']) ?>" size="16"/><input type="button" value="<?php echo $SLANG['Rename'] ?>" onclick="renameEvent()"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></div>
+        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
+        <div id="replayControl"><label for="replayMode"><?php echo translate('Replay') ?></label><?php echo buildSelect( "replayMode", $replayModes, "changeReplayMode();" ); ?></div>
+        <div id="nameControl"><input type="text" id="eventName" name="eventName" value="<?php echo validHtmlStr($event['Name']) ?>" size="16"/><input type="button" value="<?php echo translate('Rename') ?>" onclick="renameEvent()"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></div>
       </div>
       <div id="menuBar2">
-        <div id="closeWindow"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
+        <div id="closeWindow"><a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a></div>
 <?php
 if ( canEdit( 'Events' ) )
 {
 ?>
-				<div id="deleteEvent"><a href="#" onclick="deleteEvent()"><?php echo $SLANG['Delete'] ?></a></div>
-				<div id="editEvent"><a href="#" onclick="editEvent()"><?php echo $SLANG['Edit'] ?></a></div>
-				<div id="archiveEvent" class="hidden"><a href="#" onclick="archiveEvent()"><?php echo $SLANG['Archive'] ?></a></div>
-				<div id="unarchiveEvent" class="hidden"><a href="#" onclick="unarchiveEvent()"><?php echo $SLANG['Unarchive'] ?></a></div>
+        <div id="deleteEvent"><a href="#" onclick="deleteEvent()"><?php echo translate('Delete') ?></a></div>
+        <div id="editEvent"><a href="#" onclick="editEvent()"><?php echo translate('Edit') ?></a></div>
+        <div id="archiveEvent" class="hidden"><a href="#" onclick="archiveEvent()"><?php echo translate('Archive') ?></a></div>
+        <div id="unarchiveEvent" class="hidden"><a href="#" onclick="unarchiveEvent()"><?php echo translate('Unarchive') ?></a></div>
 <?php
 }
 if ( canView( 'Events' ) )
 {
 ?>
-				<div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo $SLANG['Frames'] ?></a></div>
+				<div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo translate('Frames') ?></a></div>
 <?php
 if ( $event['SaveJPEGs'] & 3 )
 {
 ?>
-				<div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo $SLANG['Stills'] ?></a></div>
+				<div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo translate('Stills') ?></a></div>
 <?php
 }
 ?>
-				<div id="videoEvent"<?php if ( $streamMode == 'video' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showVideo()"><?php echo $SLANG['Video'] ?></a></div>
-				<div id="exportEvent"><a href="#" onclick="exportEvent()"><?php echo $SLANG['Export'] ?></a></div>
+				<div id="videoEvent"<?php if ( $streamMode == 'video' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showVideo()"><?php echo translate('Video') ?></a></div>
+				<div id="exportEvent"><a href="#" onclick="exportEvent()"><?php echo translate('Export')  ?></a></div>
 			</div>
 			<div id="eventVideo" class="">
 <?php 
@@ -150,39 +150,39 @@ else
 <?php
 if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 {
-		$streamSrc = getStreamSrc( array( "source=event", "mode=mpeg", "event=".$eid, "frame=".$fid, "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_REPLAY_FORMAT, "replay=".$replayMode ) );
-		outputVideoStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), ZM_MPEG_LIVE_FORMAT );
+    $streamSrc = getStreamSrc( array( "source=event", "mode=mpeg", "event=".$eid, "frame=".$fid, "scale=".$scale, "rate=".$rate, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_REPLAY_FORMAT, "replay=".$replayMode ) );
+    outputVideoStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), ZM_MPEG_LIVE_FORMAT );
 }
 else
 {
-		$streamSrc = getStreamSrc( array( "source=event", "mode=jpeg", "event=".$eid, "frame=".$fid, "scale=".$scale, "rate=".$rate, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "replay=".$replayMode) );
-		if ( canStreamNative() )
-		{
-				outputImageStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), validHtmlStr($event['Name']) );
-		}
-		else
-		{
-				outputHelperStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) );
-		}
+    $streamSrc = getStreamSrc( array( "source=event", "mode=jpeg", "event=".$eid, "frame=".$fid, "scale=".$scale, "rate=".$rate, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "replay=".$replayMode) );
+    if ( canStreamNative() )
+    {
+        outputImageStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ), validHtmlStr($event['Name']) );
+    }
+    else
+    {
+        outputHelperStream( "evtStream", $streamSrc, reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) );
+    }
 }
 ?>
         </div>
         <p id="dvrControls">
-          <input type="button" value="&lt;+" id="prevBtn" title="<?php echo $SLANG['Prev'] ?>" class="inactive" onclick="streamPrev( true )"/>
-          <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo $SLANG['Rewind'] ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true )"/>
-          <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true )"/>
-          <input type="button" value="||" id="pauseBtn" title="<?php echo $SLANG['Pause'] ?>" class="inactive" onclick="streamPause( true )"/>
-          <input type="button" value="|>" id="playBtn" title="<?php echo $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamPlay( true )"/>
-          <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamSlowFwd( true )"/>
-          <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo $SLANG['FastForward'] ?>" class="inactive" disabled="disabled" onclick="streamFastFwd( true )"/>
-          <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo $SLANG['ZoomOut'] ?>" class="avail" onclick="streamZoomOut()"/>
-          <input type="button" value="+&gt;" id="nextBtn" title="<?php echo $SLANG['Next'] ?>" class="inactive" onclick="streamNext( true )"/>
+          <input type="button" value="&lt;+" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" onclick="streamPrev( true )"/>
+          <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true )"/>
+          <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true )"/>
+          <input type="button" value="||" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" onclick="streamPause( true )"/>
+          <input type="button" value="|>" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" onclick="streamPlay( true )"/>
+          <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" onclick="streamSlowFwd( true )"/>
+          <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="inactive" disabled="disabled" onclick="streamFastFwd( true )"/>
+          <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" onclick="streamZoomOut()"/>
+          <input type="button" value="+&gt;" id="nextBtn" title="<?php echo translate('Next') ?>" class="inactive" onclick="streamNext( true )"/>
         </p>
         <div id="replayStatus">
-          <span id="mode">Mode: <span id="modeValue">&nbsp;</span></span>
-          <span id="rate">Rate: <span id="rateValue"></span>x</span>
-          <span id="progress">Progress: <span id="progressValue"></span>s</span>
-          <span id="zoom">Zoom: <span id="zoomValue"></span>x</span>
+          <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">&nbsp;</span></span>
+          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
+          <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue"></span>s</span>
+          <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
         </div>
         <div id="progressBar" class="invisible">
 <?php
@@ -193,54 +193,47 @@ else
 <?php
         }
 ?>
-		</div>    
-<?php				    
-}
-?>
-				</div>
-			</div>
+        </div>
+      </div>
 <?php
 if ($event['SaveJPEGs'] & 3)
 {
 ?>
-			<div id="eventStills" class="hidden">
-				<div id="eventThumbsPanel">
-					<div id="eventThumbs">
-					</div>
-				</div>
-				<div id="eventImagePanel">
-					<div id="eventImageFrame">
-						<img id="eventImage" src="graphics/transparent.gif" alt=""/>
-						<div id="eventImageBar">
-							<div id="eventImageClose"><input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="hideEventImage()"/></div>
-							<div id="eventImageStats" class="hidden"><input type="button" value="<?php echo $SLANG['Stats'] ?>" onclick="showFrameStats()"/></div>
-							<div id="eventImageData">Frame <span id="eventImageNo"></span></div>
-						</div>
-					</div>
-				</div>
-				<div id="eventImageNav">
-					<div id="eventImageButtons">
-						<div id="prevButtonsPanel">
-							<input id="prevEventBtn" type="button" value="&lt;E" onclick="prevEvent()" disabled="disabled"/>
-							<input id="prevThumbsBtn" type="button" value="&lt;&lt;" onclick="prevThumbs()" disabled="disabled"/>
-							<input id="prevImageBtn" type="button" value="&lt;" onclick="prevImage()" disabled="disabled"/>
-							<input id="nextImageBtn" type="button" value="&gt;" onclick="nextImage()" disabled="disabled"/>
-							<input id="nextThumbsBtn" type="button" value="&gt;&gt;" onclick="nextThumbs()" disabled="disabled"/>
-							<input id="nextEventBtn" type="button" value="E&gt;" onclick="nextEvent()" disabled="disabled"/>
-						</div>
-					</div>
-					<div id="thumbsSliderPanel">
-						<div id="thumbsSlider">
-							<div id="thumbsKnob">
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-<?php
-}
-}
-?>
-	</div>
+      <div id="eventStills" class="hidden">
+        <div id="eventThumbsPanel">
+          <div id="eventThumbs">
+          </div>
+        </div>
+        <div id="eventImagePanel">
+          <div id="eventImageFrame">
+            <img id="eventImage" src="graphics/transparent.gif" alt=""/>
+            <div id="eventImageBar">
+              <div id="eventImageClose"><input type="button" value="<?php echo translate('Close') ?>" onclick="hideEventImage()"/></div>
+              <div id="eventImageStats" class="hidden"><input type="button" value="<?php echo translate('Stats') ?>" onclick="showFrameStats()"/></div>
+              <div id="eventImageData"><?php echo translate('Frame') ?> <span id="eventImageNo"></span></div>
+            </div>
+          </div>
+        </div>
+        <div id="eventImageNav">
+          <div id="eventImageButtons">
+            <div id="prevButtonsPanel">
+              <input id="prevEventBtn" type="button" value="&lt;E" onclick="prevEvent()" disabled="disabled"/>
+              <input id="prevThumbsBtn" type="button" value="&lt;&lt;" onclick="prevThumbs()" disabled="disabled"/>
+              <input id="prevImageBtn" type="button" value="&lt;" onclick="prevImage()" disabled="disabled"/>
+              <input id="nextImageBtn" type="button" value="&gt;" onclick="nextImage()" disabled="disabled"/>
+              <input id="nextThumbsBtn" type="button" value="&gt;&gt;" onclick="nextThumbs()" disabled="disabled"/>
+              <input id="nextEventBtn" type="button" value="E&gt;" onclick="nextEvent()" disabled="disabled"/>
+            </div>
+          </div>
+          <div id="thumbsSliderPanel">
+            <div id="thumbsSlider">
+              <div id="thumbsKnob">
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php
index e3a1bcd94..e6b02aec5 100644
--- a/web/skins/classic/views/eventdetail.php
+++ b/web/skins/classic/views/eventdetail.php
@@ -61,9 +61,9 @@ else
 $focusWindow = true;
 
 if ( $mode == 'single' )
-    xhtmlHeaders(__FILE__, $SLANG['Event']." - ".$eid );
+    xhtmlHeaders(__FILE__, translate('Event')." - ".$eid );
 else
-    xhtmlHeaders(__FILE__, $SLANG['Events'] );
+    xhtmlHeaders(__FILE__, translate('Events') );
 ?>
 <body>
   <div id="page">
@@ -72,13 +72,13 @@ else
 if ( $mode == 'single' )
 {
 ?>
-      <h2><?php echo $SLANG['Event'] ?> <?php echo $eid ?></h2>
+      <h2><?php echo translate('Event') ?> <?php echo $eid ?></h2>
 <?php
 }
 else
 {
 ?>
-      <h2><?php echo $SLANG['Events'] ?></h2>
+      <h2><?php echo translate('Events') ?></h2>
 <?php
 }
 ?>
@@ -112,17 +112,17 @@ elseif ( $mode = 'multi' )
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['Cause'] ?></th>
+              <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 $SLANG['Notes'] ?></th>
+              <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">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 59403c76b..7d0669177 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -114,7 +114,7 @@ $pagination = getPagination( $pages, $page, $maxShortcuts, $filterQuery.$sortQue
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Events'] );
+xhtmlHeaders(__FILE__, translate('Events') );
 
 ?>
 <body>
@@ -127,18 +127,18 @@ if ( $pages > 1 )
     if ( !empty($page) )
     {
 ?>
-        <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo $SLANG['ViewAll'] ?></a>
+        <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo translate('ViewAll') ?></a>
 <?php
     }
     else
     {
 ?>
-        <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo $SLANG['ViewPaged'] ?></a>
+        <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo translate('ViewPaged') ?></a>
 <?php
     }
 }
 ?>
-        <a href="#" onclick="closeWindows();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindows();"><?php echo translate('Close') ?></a>
       </div>
       <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
     </div>
@@ -160,9 +160,9 @@ if ( $pagination )
 }
 ?>
         <p id="controls">
-          <a id="refreshLink" href="#" onclick="location.reload(true);"><?php echo $SLANG['Refresh'] ?></a>
-          <a id="filterLink" href="#" onclick="createPopup( '?view=filter&amp;page=<?php echo $page ?><?php echo $filterQuery ?>', 'zmFilter', 'filter' );"><?php echo $SLANG['ShowFilterWindow'] ?></a>
-          <a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?php echo $filterQuery ?>', 'zmTimeline', 'timeline' );"><?php echo $SLANG['ShowTimeline'] ?></a>
+          <a id="refreshLink" href="#" onclick="location.reload(true);"><?php echo translate('Refresh') ?></a>
+          <a id="filterLink" href="#" onclick="createPopup( '?view=filter&amp;page=<?php echo $page ?><?php echo $filterQuery ?>', 'zmFilter', 'filter' );"><?php echo translate('ShowFilterWindow') ?></a>
+          <a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?php echo $filterQuery ?>', 'zmTimeline', 'timeline' );"><?php echo translate('ShowTimeline') ?></a>
         </p>
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
@@ -174,22 +174,22 @@ foreach ( $events as $event )
     {
 ?>
             <tr>
-              <th class="colId"><a href="<?php echo sortHeader( 'Id' ) ?>"><?php echo $SLANG['Id'] ?><?php echo sortTag( 'Id' ) ?></a></th>
-              <th class="colName"><a href="<?php echo sortHeader( 'Name' ) ?>"><?php echo $SLANG['Name'] ?><?php echo sortTag( 'Name' ) ?></a></th>
-              <th class="colMonitor"><a href="<?php echo sortHeader( 'MonitorName' ) ?>"><?php echo $SLANG['Monitor'] ?><?php echo sortTag( 'MonitorName' ) ?></a></th>
-              <th class="colCause"><a href="<?php echo sortHeader( 'Cause' ) ?>"><?php echo $SLANG['Cause'] ?><?php echo sortTag( 'Cause' ) ?></a></th>
-              <th class="colTime"><a href="<?php echo sortHeader( 'StartTime' ) ?>"><?php echo $SLANG['Time'] ?><?php echo sortTag( 'StartTime' ) ?></a></th>
-              <th class="colDuration"><a href="<?php echo sortHeader( 'Length' ) ?>"><?php echo $SLANG['Duration'] ?><?php echo sortTag( 'Length' ) ?></a></th>
-              <th class="colFrames"><a href="<?php echo sortHeader( 'Frames' ) ?>"><?php echo $SLANG['Frames'] ?><?php echo sortTag( 'Frames' ) ?></a></th>
-              <th class="colAlarmFrames"><a href="<?php echo sortHeader( 'AlarmFrames' ) ?>"><?php echo $SLANG['AlarmBrFrames'] ?><?php echo sortTag( 'AlarmFrames' ) ?></a></th>
-              <th class="colTotScore"><a href="<?php echo sortHeader( 'TotScore' ) ?>"><?php echo $SLANG['TotalBrScore'] ?><?php echo sortTag( 'TotScore' ) ?></a></th>
-              <th class="colAvgScore"><a href="<?php echo sortHeader( 'AvgScore' ) ?>"><?php echo $SLANG['AvgBrScore'] ?><?php echo sortTag( 'AvgScore' ) ?></a></th>
-              <th class="colMaxScore"><a href="<?php echo sortHeader( 'MaxScore' ) ?>"><?php echo $SLANG['MaxBrScore'] ?><?php echo sortTag( 'MaxScore' ) ?></a></th>
+              <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>
 <?php
         if ( ZM_WEB_LIST_THUMBS )
         {
 ?>
-              <th class="colThumbnail"><?php echo $SLANG['Thumbnail'] ?></th>
+              <th class="colThumbnail"><?php echo translate('Thumbnail') ?></th>
 <?php
         }
 ?>
@@ -246,12 +246,12 @@ if ( true || canEdit( 'Events' ) )
 {
 ?>
         <div id="contentButtons">
-          <input type="button" name="viewBtn" value="<?php echo $SLANG['View'] ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/>
-          <input type="button" name="archiveBtn" value="<?php echo $SLANG['Archive'] ?>" onclick="archiveEvents( this, 'markEids' )" disabled="disabled"/>
-          <input type="button" name="unarchiveBtn" value="<?php echo $SLANG['Unarchive'] ?>" onclick="unarchiveEvents( this, 'markEids' );" disabled="disabled"/>
-          <input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editEvents( this, 'markEids' )" disabled="disabled"/>
-          <input type="button" name="exportBtn" value="<?php echo $SLANG['Export'] ?>" onclick="exportEvents( this, 'markEids' )" disabled="disabled"/>
-          <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteEvents( this, 'markEids' );" disabled="disabled"/>
+          <input type="button" name="viewBtn" value="<?php echo translate('View') ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/>
+          <input type="button" name="archiveBtn" value="<?php echo translate('Archive') ?>" onclick="archiveEvents( this, 'markEids' )" disabled="disabled"/>
+          <input type="button" name="unarchiveBtn" value="<?php echo translate('Unarchive') ?>" onclick="unarchiveEvents( this, 'markEids' );" disabled="disabled"/>
+          <input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editEvents( this, 'markEids' )" disabled="disabled"/>
+          <input type="button" name="exportBtn" value="<?php echo translate('Export') ?>" onclick="exportEvents( this, 'markEids' )" disabled="disabled"/>
+          <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteEvents( this, 'markEids' );" disabled="disabled"/>
         </div>
 <?php
 }
diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index f95bddfb9..5585b96c4 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -24,6 +24,9 @@ if ( !canView( 'Events' ) )
     return;
 }
 
+# Must re-start session because we close it now in index.php to improve concurrency
+session_start();
+
 if ( isset($_SESSION['export']) )
 {
     if ( isset($_SESSION['export']['detail']) )
@@ -42,15 +45,15 @@ if ( isset($_SESSION['export']) )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Export'] );
+xhtmlHeaders(__FILE__, translate('Export') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow()"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['ExportOptions'] ?></h2>
+      <h2><?php echo translate('ExportOptions') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -75,54 +78,54 @@ elseif ( !empty($_REQUEST['eids']) )
         <table id="contentTable" class="minor" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportDetails'] ?></th>
+              <th scope="row"><?php echo translate('ExportDetails') ?></th>
               <td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportFrames'] ?></th>
+              <th scope="row"><?php echo translate('ExportFrames') ?></th>
               <td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportImageFiles'] ?></th>
+              <th scope="row"><?php echo translate('ExportImageFiles') ?></th>
               <td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportVideoFiles'] ?></th>
+              <th scope="row"><?php echo translate('ExportVideoFiles') ?></th>
               <td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportMiscFiles'] ?></th>
+              <th scope="row"><?php echo translate('ExportMiscFiles') ?></th>
               <td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ExportFormat'] ?></th>
+              <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 } ?> onclick="configureExportButton( this )"/><label for="exportFormatTar"><?php echo $SLANG['ExportFormatTar'] ?></label>
-                <input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><label for="exportFormatZip"><?php echo $SLANG['ExportFormatZip'] ?></label>
+                <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><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 } ?> onclick="configureExportButton( this )"/><label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
               </td>
             </tr>
           </tbody>
         </table>
-        <input type="button" id="exportButton" name="exportButton" value="<?php echo $SLANG['Export'] ?>" onclick="exportEvent( this.form );" disabled="disabled"/>
+        <input type="button" id="exportButton" name="exportButton" value="<?php echo translate('Export') ?>" onclick="exportEvent( this.form );" disabled="disabled"/>
       </form>
     </div>
 <?php
     if ( isset($_REQUEST['generated']) )
     {
 ?>
-      <h2 id="exportProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="exportProgressText"><?php echo $_REQUEST['generated']?$SLANG['ExportSucceeded']:$SLANG['ExportFailed'] ?></span><span id="exportProgressTicker"></span></h2>
+      <h2 id="exportProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="exportProgressText"><?php echo $_REQUEST['generated']?translate('ExportSucceeded'):translate('ExportFailed') ?></span><span id="exportProgressTicker"></span></h2>
 <?php
     }
     else
     {
 ?>
-      <h2 id="exportProgress" class="hidden warnText"><span id="exportProgressText"><?php echo $SLANG['Exporting'] ?></span><span id="exportProgressTicker"></span></h2>
+      <h2 id="exportProgress" class="hidden warnText"><span id="exportProgressText"><?php echo translate('Exporting') ?></span><span id="exportProgressTicker"></span></h2>
 <?php
     }
     if ( !empty($_REQUEST['generated']) )
     {
 ?>
-      <h3 id="downloadLink"><a href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo $SLANG['Download'] ?></a></h3>
+      <h3 id="downloadLink"><a href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo translate('Download') ?></a></h3>
 <?php
     }
 ?>
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 9fadd1a4c..1c7c6e270 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -24,7 +24,7 @@ if ( !canView( 'Events' ) )
     return;
 }
 $selectName = "filterName";
-$filterNames = array( ''=>$SLANG['ChooseFilter'] );
+$filterNames = array( ''=>translate('ChooseFilter') );
 foreach ( dbFetchAll( "select * from Filters order by Name" ) as $row )
 {
     $filterNames[$row['Name']] = $row['Name'];
@@ -38,7 +38,7 @@ $backgroundStr = "";
 if ( isset($dbFilter) )
 {
     if ( $dbFilter['Background'] ) 
-        $backgroundStr = '['.strtolower($SLANG['Background']).']';
+        $backgroundStr = '['.strtolower(translate('Background')).']';
     $_REQUEST['filter'] = jsonDecode( $dbFilter['Query'] );
     $_REQUEST['sort_field'] = isset($_REQUEST['filter']['sort_field'])?$_REQUEST['filter']['sort_field']:"DateTime";
     $_REQUEST['sort_asc'] = isset($_REQUEST['filter']['sort_asc'])?$_REQUEST['filter']['sort_asc']:"1";
@@ -49,8 +49,8 @@ if ( isset($dbFilter) )
 }
 
 $conjunctionTypes = array(
-    'and' => $SLANG['ConjAnd'],
-    'or'  => $SLANG['ConjOr']
+    'and' => translate('ConjAnd'),
+    'or'  => translate('ConjOr')
 );
 $obracketTypes = array(); 
 $cbracketTypes = array();
@@ -64,42 +64,42 @@ if ( isset($_REQUEST['filter']['terms']) )
 }
 
 $attrTypes = array(
-    'MonitorId'   => $SLANG['AttrMonitorId'],
-    'MonitorName' => $SLANG['AttrMonitorName'],
-    'Id'          => $SLANG['AttrId'],
-    'Name'        => $SLANG['AttrName'],
-    'Cause'       => $SLANG['AttrCause'],
-    'Notes'       => $SLANG['AttrNotes'],
-    'DateTime'    => $SLANG['AttrDateTime'],
-    'Date'        => $SLANG['AttrDate'],
-    'Time'        => $SLANG['AttrTime'],
-    'Weekday'     => $SLANG['AttrWeekday'],
-    'Length'      => $SLANG['AttrDuration'],
-    'Frames'      => $SLANG['AttrFrames'],
-    'AlarmFrames' => $SLANG['AttrAlarmFrames'],
-    'TotScore'    => $SLANG['AttrTotalScore'],
-    'AvgScore'    => $SLANG['AttrAvgScore'],
-    'MaxScore'    => $SLANG['AttrMaxScore'],
-    'Archived'    => $SLANG['AttrArchiveStatus'],
-    'DiskPercent' => $SLANG['AttrDiskPercent'],
-    'DiskBlocks'  => $SLANG['AttrDiskBlocks'],
-    'SystemLoad'  => $SLANG['AttrSystemLoad'],
+    'MonitorId'   => translate('AttrMonitorId'),
+    'MonitorName' => translate('AttrMonitorName'),
+    'Id'          => translate('AttrId'),
+    'Name'        => translate('AttrName'),
+    'Cause'       => translate('AttrCause'),
+    'Notes'       => translate('AttrNotes'),
+    'DateTime'    => translate('AttrDateTime'),
+    'Date'        => translate('AttrDate'),
+    'Time'        => translate('AttrTime'),
+    'Weekday'     => translate('AttrWeekday'),
+    'Length'      => translate('AttrDuration'),
+    'Frames'      => translate('AttrFrames'),
+    'AlarmFrames' => translate('AttrAlarmFrames'),
+    'TotScore'    => translate('AttrTotalScore'),
+    'AvgScore'    => translate('AttrAvgScore'),
+    'MaxScore'    => translate('AttrMaxScore'),
+    'Archived'    => translate('AttrArchiveStatus'),
+    'DiskPercent' => translate('AttrDiskPercent'),
+    'DiskBlocks'  => translate('AttrDiskBlocks'),
+    'SystemLoad'  => translate('AttrSystemLoad'),
 );
 $opTypes = array(
-    '='   => $SLANG['OpEq'],
-    '!='  => $SLANG['OpNe'],
-    '>='  => $SLANG['OpGtEq'],
-    '>'   => $SLANG['OpGt'],
-    '<'   => $SLANG['OpLt'],
-    '<='  => $SLANG['OpLtEq'],
-    '=~'  => $SLANG['OpMatches'],
-    '!~'  => $SLANG['OpNotMatches'],
-    '=[]' => $SLANG['OpIn'],
-    '![]' => $SLANG['OpNotIn'],
+    '='   => translate('OpEq'),
+    '!='  => translate('OpNe'),
+    '>='  => translate('OpGtEq'),
+    '>'   => translate('OpGt'),
+    '<'   => translate('OpLt'),
+    '<='  => translate('OpLtEq'),
+    '=~'  => translate('OpMatches'),
+    '!~'  => translate('OpNotMatches'),
+    '=[]' => translate('OpIn'),
+    '![]' => translate('OpNotIn'),
 );
 $archiveTypes = array(
-    '0' => $SLANG['ArchUnarchived'],
-    '1' => $SLANG['ArchArchived']
+    '0' => translate('ArchUnarchived'),
+    '1' => translate('ArchArchived')
 );
 $weekdays = array();
 for ( $i = 0; $i < 7; $i++ )
@@ -107,22 +107,22 @@ for ( $i = 0; $i < 7; $i++ )
     $weekdays[$i] = strftime( "%A", mktime( 12, 0, 0, 1, $i+1, 2001 ) );
 }
 $sort_fields = array(
-    'Id'          => $SLANG['AttrId'],
-    'Name'        => $SLANG['AttrName'],
-    'Cause'       => $SLANG['AttrCause'],
-    'Notes'       => $SLANG['AttrNotes'],
-    'MonitorName' => $SLANG['AttrMonitorName'],
-    'DateTime'    => $SLANG['AttrDateTime'],
-    'Length'      => $SLANG['AttrDuration'],
-    'Frames'      => $SLANG['AttrFrames'],
-    'AlarmFrames' => $SLANG['AttrAlarmFrames'],
-    'TotScore'    => $SLANG['AttrTotalScore'],
-    'AvgScore'    => $SLANG['AttrAvgScore'],
-    'MaxScore'    => $SLANG['AttrMaxScore'],
+    'Id'          => translate('AttrId'),
+    'Name'        => translate('AttrName'),
+    'Cause'       => translate('AttrCause'),
+    'Notes'       => translate('AttrNotes'),
+    'MonitorName' => translate('AttrMonitorName'),
+    'DateTime'    => translate('AttrDateTime'),
+    'Length'      => translate('AttrDuration'),
+    'Frames'      => translate('AttrFrames'),
+    'AlarmFrames' => translate('AttrAlarmFrames'),
+    'TotScore'    => translate('AttrTotalScore'),
+    'AvgScore'    => translate('AttrAvgScore'),
+    'MaxScore'    => translate('AttrMaxScore'),
 );
 $sort_dirns = array(
-    '1' => $SLANG['SortAsc'],
-    '0'  => $SLANG['SortDesc']
+    '1' => translate('SortAsc'),
+    '0'  => translate('SortDesc')
 );
 if ( empty($_REQUEST['sort_field']) )
 {
@@ -134,15 +134,15 @@ $hasCal = file_exists( 'tools/jscalendar/calendar.js' );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
+xhtmlHeaders(__FILE__, translate('EventFilter') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['EventFilter'] ?></h2>
+      <h2><?php echo translate('EventFilter') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -155,7 +155,7 @@ xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
         <input type="hidden" name="line" value=""/>
         <input type="hidden" name="fid" value=""/>
         <hr/>
-        <div id="filterSelector"><label for="<?php echo $selectName ?>"><?php echo $SLANG['UseFilter'] ?></label><?php if ( count($filterNames) > 1 ) { echo buildSelect( $selectName, $filterNames, "submitToFilter( this, 1 );" ); } else { ?><select disabled="disabled"><option><?php echo $SLANG['NoSavedFilters'] ?></option></select><?php } ?><?php echo $backgroundStr ?></div>
+        <div id="filterSelector"><label for="<?php echo $selectName ?>"><?php echo translate('UseFilter') ?></label><?php if ( count($filterNames) > 1 ) { echo buildSelect( $selectName, $filterNames, "submitToFilter( this, 1 );" ); } else { ?><select disabled="disabled"><option><?php echo translate('NoSavedFilters') ?></option></select><?php } ?><?php echo $backgroundStr ?></div>
         <hr/>
         <table id="fieldsTable" class="filterTable" cellspacing="0">
           <tbody>
@@ -186,7 +186,7 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
         if ( $_REQUEST['filter']['terms'][$i]['attr'] == "Archived" )
         {
 ?>
-              <td><?php echo $SLANG['OpEq'] ?><input type="hidden" name="filter[terms][<?php echo $i ?>][op]" value="="/></td>
+              <td><?php echo translate('OpEq') ?><input type="hidden" name="filter[terms][<?php echo $i ?>][op]" value="="/></td>
               <td><?php echo buildSelect( "filter[terms][$i][val]", $archiveTypes ); ?></td>
 <?php
         }
@@ -254,8 +254,8 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
         <table id="sortTable" class="filterTable" cellspacing="0">
           <tbody>
             <tr>
-              <td><label for="sort_field"><?php echo $SLANG['SortBy'] ?></label><?php echo buildSelect( "sort_field", $sort_fields ); ?><?php echo buildSelect( "sort_asc", $sort_dirns ); ?></td>
-              <td><label for="limit"><?php echo $SLANG['LimitResultsPre'] ?></label><input type="text" size="6" id="limit" name="limit" value="<?php echo isset($_REQUEST['limit'])?validInt($_REQUEST['limit']):"" ?>"/><?php echo $SLANG['LimitResultsPost'] ?></td>
+              <td><label for="sort_field"><?php echo translate('SortBy') ?></label><?php echo buildSelect( "sort_field", $sort_fields ); ?><?php echo buildSelect( "sort_asc", $sort_dirns ); ?></td>
+              <td><label for="limit"><?php echo translate('LimitResultsPre') ?></label><input type="text" size="6" id="limit" name="limit" value="<?php echo isset($_REQUEST['limit'])?validInt($_REQUEST['limit']):"" ?>"/><?php echo translate('LimitResultsPost') ?></td>
             </tr>
           </tbody>
         </table>
@@ -263,7 +263,7 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
         <table id="actionsTable" class="filterTable" cellspacing="0">
           <tbody>
             <tr>
-              <td><?php echo $SLANG['FilterArchiveEvents'] ?></td>
+              <td><?php echo translate('FilterArchiveEvents') ?></td>
               <td><input type="checkbox" name="autoArchive" value="1"<?php if ( !empty($dbFilter['AutoArchive']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
 <?php
@@ -271,7 +271,7 @@ if ( ZM_OPT_FFMPEG )
 {
 ?>
             <tr>
-              <td><?php echo $SLANG['FilterVideoEvents'] ?></td>
+              <td><?php echo translate('FilterVideoEvents') ?></td>
               <td><input type="checkbox" name="autoVideo" value="1"<?php if ( !empty($dbFilter['AutoVideo']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
 <?php
@@ -280,7 +280,7 @@ if ( ZM_OPT_UPLOAD )
 {
 ?>
             <tr>
-              <td><?php echo $SLANG['FilterUploadEvents'] ?></td>
+              <td><?php echo translate('FilterUploadEvents') ?></td>
               <td><input type="checkbox" name="autoUpload" value="1"<?php if ( !empty($dbFilter['AutoUpload']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
 <?php
@@ -289,7 +289,7 @@ if ( ZM_OPT_EMAIL )
 {
 ?>
             <tr>
-              <td><?php echo $SLANG['FilterEmailEvents'] ?></td>
+              <td><?php echo translate('FilterEmailEvents') ?></td>
               <td><input type="checkbox" name="autoEmail" value="1"<?php if ( !empty($dbFilter['AutoEmail']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
 <?php
@@ -298,31 +298,31 @@ if ( ZM_OPT_MESSAGE )
 {
 ?>
             <tr>
-              <td><?php echo $SLANG['FilterMessageEvents'] ?></td>
+              <td><?php echo translate('FilterMessageEvents') ?></td>
               <td><input type="checkbox" name="autoMessage" value="1"<?php if ( !empty($dbFilter['AutoMessage']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
 <?php
 }
 ?>
             <tr>
-              <td><?php echo $SLANG['FilterExecuteEvents'] ?></td>
+              <td><?php echo translate('FilterExecuteEvents') ?></td>
               <td><input type="checkbox" name="autoExecute" value="1"<?php if ( !empty($dbFilter['AutoExecute']) ) { ?> checked="checked"<?php } ?>/><input type="text" name="autoExecuteCmd" value="<?php echo isset($dbFilter['AutoExecuteCmd'])?$dbFilter['AutoExecuteCmd']:"" ?>" size="32" maxlength="255" onchange="updateButtons( this )"/></td>
             </tr>
             <tr>
-              <td><?php echo $SLANG['FilterDeleteEvents'] ?></td>
+              <td><?php echo translate('FilterDeleteEvents') ?></td>
               <td colspan="2"><input type="checkbox" name="autoDelete" value="1"<?php if ( !empty($dbFilter['AutoDelete']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
             </tr>
           </tbody>
         </table>
         <hr/>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Submit'] ?>" onclick="submitToEvents( this );"/>
-          <input type="button" name="executeButton" id="executeButton" value="<?php echo $SLANG['Execute'] ?>" onclick="executeFilter( this );"/>
+          <input type="submit" value="<?php echo translate('Submit') ?>" onclick="submitToEvents( this );"/>
+          <input type="button" name="executeButton" id="executeButton" value="<?php echo translate('Execute') ?>" onclick="executeFilter( this );"/>
 <?php if ( canEdit( 'Events' ) ) { ?>
-          <input type="button" value="<?php echo $SLANG['Save'] ?>" onclick="saveFilter( this );"/><?php } ?>
+          <input type="button" value="<?php echo translate('Save') ?>" onclick="saveFilter( this );"/><?php } ?>
 <?php if ( canEdit( 'Events' ) && isset($dbFilter) ) { ?>
-          <input type="button" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/><?php } ?>
-          <input type="button" value="<?php echo $SLANG['Reset'] ?>" onclick="submitToFilter( this, 1 );"/>
+          <input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/><?php } ?>
+          <input type="button" value="<?php echo translate('Reset') ?>" onclick="submitToFilter( this, 1 );"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/filtersave.php b/web/skins/classic/views/filtersave.php
index e8d1ec625..83c803485 100644
--- a/web/skins/classic/views/filtersave.php
+++ b/web/skins/classic/views/filtersave.php
@@ -41,12 +41,12 @@ $filter = $_REQUEST['filter'];
 
 parseFilter( $filter );
 
-xhtmlHeaders(__FILE__, $SLANG['SaveFilter'] );
+xhtmlHeaders(__FILE__, translate('SaveFilter') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['SaveFilter'] ?></h2>
+      <h2><?php echo translate('SaveFilter') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -66,18 +66,18 @@ xhtmlHeaders(__FILE__, $SLANG['SaveFilter'] );
         <input type="hidden" name="autoDelete" value="<?php echo requestVar( 'autoDelete' ) ?>"/>
 <?php if ( count($filterNames) ) { ?>
         <p>
-          <label for="<?php echo $selectName ?>"><?php echo $SLANG['SaveAs'] ?></label><?php echo buildSelect( $selectName, $filterNames ); ?><label for="<?php echo $newSelectName ?>"><?php echo $SLANG['OrEnterNewName'] ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="<?php echo requestVar('filterName') ?>"/>
+          <label for="<?php echo $selectName ?>"><?php echo translate('SaveAs') ?></label><?php echo buildSelect( $selectName, $filterNames ); ?><label for="<?php echo $newSelectName ?>"><?php echo translate('OrEnterNewName') ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="<?php echo requestVar('filterName') ?>"/>
         </p>
 <?php } else { ?>
         <p>
-          <label for="<?php echo $newSelectName ?>"><?php echo $SLANG['EnterNewFilterName'] ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="">
+          <label for="<?php echo $newSelectName ?>"><?php echo translate('EnterNewFilterName') ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="">
         </p>
 <?php } ?>
         <p>
-          <label for="background"><?php echo $SLANG['BackgroundFilter'] ?></label><input type="checkbox" id="background" name="background" value="1"<?php if ( !empty($filterData['Background']) ) { ?> checked="checked"<?php } ?>/>
+          <label for="background"><?php echo translate('BackgroundFilter') ?></label><input type="checkbox" id="background" name="background" value="1"<?php if ( !empty($filterData['Background']) ) { ?> checked="checked"<?php } ?>/>
         </p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 3ffc93319..9edaa0371 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -62,29 +62,29 @@ $rImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-r.jpg", $eventPath,
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Frame']." - ".$event['Id']." - ".$frame['FrameId'] );
+xhtmlHeaders(__FILE__, translate('Frame')." - ".$event['Id']." - ".$frame['FrameId'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <?php if ( ZM_RECORD_EVENT_STATS && $alarmFrame ) { echo makePopupLink( '?view=stats&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $SLANG['Stats'] ); } ?>
-        <?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?php echo $event['Id'] ?>"><?php echo $SLANG['Delete'] ?></a><?php } ?>
-        <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
+        <?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="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Frame'] ?> <?php echo $event['Id']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
+      <h2><?php echo translate('Frame') ?> <?php echo $event['Id']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
     </div>
     <div id="content">
       <p id="image"><?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imagePath ) ?>" 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'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?></p>
       <p id="controls">
 <?php if ( $frame['FrameId'] > 1 ) { ?>
-        <a id="firstLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['First'] ?></a>
+        <a id="firstLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('First') ?></a>
 <?php } if ( $frame['FrameId'] > 1 ) { ?>
-        <a id="prevLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Prev'] ?></a>
+        <a id="prevLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('Prev') ?></a>
 <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a id="nextLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Next'] ?></a>
+        <a id="nextLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('Next') ?></a>
 <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a id="lastLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Last'] ?></a>
+        <a id="lastLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('Last') ?></a>
 <?php } ?>
       </p>
 <?php if (file_exists ($dImagePath)) { ?>
diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php
index a6318c35f..5883286ca 100644
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@@ -31,13 +31,13 @@ $frames = dbFetchAll( $sql, NULL, array( $_REQUEST['eid'] ) );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Frames']." - ".$event['Id'] );
+xhtmlHeaders(__FILE__, translate('Frames')." - ".$event['Id'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
-      <h2><?php echo $SLANG['Frames'] ?> - <?php echo $event['Id'] ?></h2>
+      <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a></div>
+      <h2><?php echo translate('Frames') ?> - <?php echo $event['Id'] ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -45,11 +45,11 @@ xhtmlHeaders(__FILE__, $SLANG['Frames']." - ".$event['Id'] );
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th class="colId"><?php echo $SLANG['FrameId'] ?></th>
-              <th class="colType"><?php echo $SLANG['Type'] ?></th>
-              <th class="colTimeStamp"><?php echo $SLANG['TimeStamp'] ?></th>
-              <th class="colTimeDelta"><?php echo $SLANG['TimeDelta'] ?></th>
-              <th class="colScore"><?php echo $SLANG['Score'] ?></th>
+              <th class="colId"><?php echo translate('FrameId') ?></th>
+              <th class="colType"><?php echo translate('Type') ?></th>
+              <th class="colTimeStamp"><?php echo translate('TimeStamp') ?></th>
+              <th class="colTimeDelta"><?php echo translate('TimeDelta') ?></th>
+              <th class="colScore"><?php echo translate('Score') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -61,7 +61,7 @@ if ( count($frames) )
         $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( 'image', $event['Width'], $event['Height'] ), $frame['FrameId'] ) ?></td>
+              <td class="colId"><?php echo makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmImage', array( 'frame', $event['Width'], $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>
@@ -87,7 +87,7 @@ else
 {
 ?>
             <tr>
-              <td colspan="5"><?php echo $SLANG['NoFramesRecorded'] ?></td>
+              <td colspan="5"><?php echo translate('NoFramesRecorded') ?></td>
             </tr>
 <?php
 }
diff --git a/web/skins/classic/views/function.php b/web/skins/classic/views/function.php
index d6560c719..a52020185 100644
--- a/web/skins/classic/views/function.php
+++ b/web/skins/classic/views/function.php
@@ -28,12 +28,12 @@ $monitor = dbFetchMonitor( $_REQUEST['mid'] );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Function']." - ".validHtmlStr($monitor['Name']) );
+xhtmlHeaders(__FILE__, translate('Function')." - ".validHtmlStr($monitor['Name']) );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Function']." - ".validHtmlStr($monitor['Name']) ?></h2>
+      <h2><?php echo translate('Function')." - ".validHtmlStr($monitor['Name']) ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -46,16 +46,16 @@ xhtmlHeaders(__FILE__, $SLANG['Function']." - ".validHtmlStr($monitor['Name']) )
 foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
 {
 ?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $SLANG['Fn'.$optFunction] ?></option>
+            <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 $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
+          <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">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index 229c8cc68..ce50cc875 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -37,12 +37,12 @@ else
     );
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
+xhtmlHeaders( __FILE__, translate('Group')." - ".$newGroup['Name'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Group'] ?> - <?php echo $newGroup['Name'] ?></h2>
+      <h2><?php echo translate('Group') ?> - <?php echo $newGroup['Name'] ?></h2>
     </div>
     <div id="content">
       <form name="groupForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -52,11 +52,11 @@ xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['Name'] ?></th>
+              <th scope="row"><?php echo translate('Name') ?></th>
               <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup['Name']) ?>"/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['MonitorIds'] ?></th>
+              <th scope="row"><?php echo translate('MonitorIds') ?></th>
               <td>
                 <select name="newGroup[MonitorIds][]" size="4" multiple="multiple">
 <?php
@@ -78,8 +78,8 @@ xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/groups.php b/web/skins/classic/views/groups.php
index 3db497501..2e957fbc9 100644
--- a/web/skins/classic/views/groups.php
+++ b/web/skins/classic/views/groups.php
@@ -36,12 +36,12 @@ foreach( dbFetchAll( $sql ) as $row )
     $groups[] = $row;
 }
 
-xhtmlHeaders(__FILE__, $SLANG['Groups'] );
+xhtmlHeaders(__FILE__, translate('Groups') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Groups'] ?></h2>
+      <h2><?php echo translate('Groups') ?></h2>
     </div>
     <div id="content">
       <form name="groupsForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -50,15 +50,15 @@ xhtmlHeaders(__FILE__, $SLANG['Groups'] );
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th class="colName"><?php echo $SLANG['Name'] ?></th>
-              <th class="colIds"><?php echo $SLANG['MonitorIds'] ?></th>
-              <th class="colSelect"><?php echo $SLANG['Select'] ?></th>
+              <th class="colName"><?php echo translate('Name') ?></th>
+              <th class="colIds"><?php echo translate('MonitorIds') ?></th>
+              <th class="colSelect"><?php echo translate('Select') ?></th>
             </tr>
           </thead>
           <tbody>
             <tr class="highlight">
-              <td class="colName"><?php echo $SLANG['NoGroup'] ?></td>
-              <td class="colIds"><?php echo $SLANG['All'] ?></td>
+              <td class="colName"><?php echo translate('NoGroup') ?></td>
+              <td class="colIds"><?php echo translate('All') ?></td>
               <td class="colSelect"><input type="radio" name="gid" value="0"<?php echo !$selected?' checked="checked"':'' ?> onclick="configureButtons( this );"/></td>
             </tr>
 <?php foreach ( $groups as $group ) { ?>
@@ -71,11 +71,11 @@ xhtmlHeaders(__FILE__, $SLANG['Groups'] );
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
-          <input type="button" value="<?php echo $SLANG['New'] ?>" onclick="newGroup()"<?php echo canEdit('System')?'':' disabled="disabled"' ?>/>
-          <input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
-          <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="submit" value="<?php echo translate('Apply') ?>"/>
+          <input type="button" value="<?php echo translate('New') ?>" onclick="newGroup()"<?php echo canEdit('System')?'':' disabled="disabled"' ?>/>
+          <input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
+          <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index bbde397e1..7415e2c72 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -44,5 +44,5 @@ var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 //
 // Strings
 //
-var deleteString = "<?php echo $SLANG['Delete'] ?>";
-var causeString = "<?php echo $SLANG['AttrCause'] ?>";
+var deleteString = "<?php echo translate('Delete') ?>";
+var causeString = "<?php echo translate('AttrCause') ?>";
diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php
index 4548da91c..647515a7e 100644
--- a/web/skins/classic/views/js/events.js.php
+++ b/web/skins/classic/views/js/events.js.php
@@ -10,4 +10,4 @@ var sortQuery = '<?php echo isset($sortQuery)?validJsStr($sortQuery):'' ?>';
 var maxWidth = <?php echo $maxWidth?$maxWidth:0 ?>;
 var maxHeight = <?php echo $maxHeight?$maxHeight:0 ?>;
 
-var confirmDeleteEventsString = "<?php echo addslashes($SLANG['ConfirmDeleteEvents']) ?>";
+var confirmDeleteEventsString = "<?php echo addslashes(translate('ConfirmDeleteEvents')) ?>";
diff --git a/web/skins/classic/views/js/export.js.php b/web/skins/classic/views/js/export.js.php
index 4bdbf4dcd..a251f92ca 100644
--- a/web/skins/classic/views/js/export.js.php
+++ b/web/skins/classic/views/js/export.js.php
@@ -19,4 +19,4 @@ var eidParm = 'eid=<?php echo validInt($_REQUEST['eid']) ?>';
 var exportReady = <?php echo !empty($_REQUEST['generated'])?'true':'false' ?>;
 var exportFile = '<?php echo !empty($_REQUEST['exportFile'])?validJsStr($_REQUEST['exportFile']):'' ?>';
 
-var exportProgressString = '<?php echo addslashes($SLANG['Exporting']) ?>';
+var exportProgressString = '<?php echo addslashes(translate('Exporting')) ?>';
diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php
index 9c2a631b5..29eef084b 100644
--- a/web/skins/classic/views/js/filter.js.php
+++ b/web/skins/classic/views/js/filter.js.php
@@ -1,4 +1,4 @@
-var deleteSavedFilterString = "<?php echo $SLANG['DeleteSavedFilter'] ?>";
+var deleteSavedFilterString = "<?php echo translate('DeleteSavedFilter') ?>";
 function validateForm( form )
 {
 <?php
@@ -19,7 +19,7 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
 ?>
     if ( bracket_count )
     {
-        alert( "<?php echo $SLANG['ErrorBrackets'] ?>" );
+        alert( "<?php echo translate('ErrorBrackets') ?>" );
         return( false );
     }
 <?php
@@ -32,7 +32,7 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
     var val = form.elements['filter[terms][<?php echo $i ?>][val]'];
     if ( val.value == '' )
     {
-        alert( "<?php echo $SLANG['ErrorValidValue'] ?>" );
+        alert( "<?php echo translate('ErrorValidValue') ?>" );
         return( false );
     }
 <?php
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index cce3572e8..2d017129b 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -8,7 +8,7 @@ if ( ZM_OPT_CONTROL )
 var controlOptions = new Object();
 <?php
     global $controlTypes;
-    $controlTypes = array( ''=>$SLANG['None'] );
+    $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";
@@ -21,7 +21,7 @@ controlOptions[<?php echo $row['Id'] ?>] = new Array();
         if ( $row['HasHomePreset'] )
         {
 ?>
-controlOptions[<?php echo $row['Id'] ?>][0] = '<?php echo $SLANG['Home'] ?>';
+controlOptions[<?php echo $row['Id'] ?>][0] = '<?php echo translate('Home') ?>';
 <?php
         }
         else
@@ -33,7 +33,7 @@ controlOptions[<?php echo $row['Id'] ?>][0] = null;
         for ( $i = 1; $i <= $row['NumPresets']; $i++ )
         {
 ?>
-controlOptions[<?php echo $row['Id'] ?>][<?php echo $i ?>] = '<?php echo $SLANG['Preset'].' '.$i ?>';
+controlOptions[<?php echo $row['Id'] ?>][<?php echo $i ?>] = '<?php echo translate('Preset').' '.$i ?>';
 <?php
         }
     }
@@ -60,76 +60,76 @@ function validateForm( form )
     var errors = new Array();
 
     if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
-        errors[errors.length] = "<?php echo $SLANG['BadNameChars'] ?>";
+        errors[errors.length] = "<?php echo translate('BadNameChars') ?>";
     else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
-        errors[errors.length] = "<?php echo $SLANG['DuplicateMonitorName'] ?>";
+        errors[errors.length] = "<?php echo translate('DuplicateMonitorName') ?>";
         
     if ( form.elements['newMonitor[MaxFPS]'].value && !(parseFloat(form.elements['newMonitor[MaxFPS]'].value) > 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadMaxFPS'] ?>";
+        errors[errors.length] = "<?php echo translate('BadMaxFPS') ?>";
     if ( form.elements['newMonitor[AlarmMaxFPS]'].value && !(parseFloat(form.elements['newMonitor[AlarmMaxFPS]'].value) > 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadAlarmMaxFPS'] ?>";
+        errors[errors.length] = "<?php echo translate('BadAlarmMaxFPS') ?>";
     if ( !form.elements['newMonitor[RefBlendPerc]'].value || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) > 100 ) || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) < 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadRefBlendPerc'] ?>";
+        errors[errors.length] = "<?php echo translate('BadRefBlendPerc') ?>";
     if ( form.elements['newMonitor[Type]'].value == 'Local' )
     {
         if ( !form.elements['newMonitor[Palette]'].value || !form.elements['newMonitor[Palette]'].value.match( /^\d+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadPalette'] ?>";
+            errors[errors.length] = "<?php echo translate('BadPalette') ?>";
         if ( !form.elements['newMonitor[Device]'].value )
-            errors[errors.length] = "<?php echo $SLANG['BadDevice'] ?>";
+            errors[errors.length] = "<?php echo translate('BadDevice') ?>";
         if ( !form.elements['newMonitor[Channel]'].value || !form.elements['newMonitor[Channel]'].value.match( /^\d+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadChannel'] ?>";
+            errors[errors.length] = "<?php echo translate('BadChannel') ?>";
         if ( !form.elements['newMonitor[Format]'].value || !form.elements['newMonitor[Format]'].value.match( /^\d+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadFormat'] ?>";
+            errors[errors.length] = "<?php echo translate('BadFormat') ?>";
     }
     else if ( form.elements['newMonitor[Type]'].value == 'Remote' )
     {
         if ( !form.elements['newMonitor[Host]'].value || !form.elements['newMonitor[Host]'].value.match( /^[0-9a-zA-Z_.:@-]+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadHost'] ?>";
+            errors[errors.length] = "<?php echo translate('BadHost') ?>";
         if ( form.elements['newMonitor[Port]'].value && !form.elements['newMonitor[Port]'].value.match( /^\d+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadPort'] ?>";
+            errors[errors.length] = "<?php echo translate('BadPort') ?>";
         //if ( !form.elements['newMonitor[Path]'].value )
-            //errors[errors.length] = "<?php echo $SLANG['BadPath'] ?>";
+            //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 $SLANG['BadPath'] ?>";
+            errors[errors.length] = "<?php echo translate('BadPath') ?>";
     }
     if ( !form.elements['newMonitor[Colours]'].value || (parseInt(form.elements['newMonitor[Colours]'].value) != 1 && parseInt(form.elements['newMonitor[Colours]'].value) != 3 && parseInt(form.elements['newMonitor[Colours]'].value) != 4 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadColours'] ?>";
+        errors[errors.length] = "<?php echo translate('BadColours') ?>";
     if ( !form.elements['newMonitor[Width]'].value || !(parseInt(form.elements['newMonitor[Width]'].value) > 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadWidth'] ?>";
+        errors[errors.length] = "<?php echo translate('BadWidth') ?>";
     if ( !form.elements['newMonitor[Height]'].value || !(parseInt(form.elements['newMonitor[Height]'].value) > 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadHeight'] ?>";
+        errors[errors.length] = "<?php echo translate('BadHeight') ?>";
     if ( !form.elements['newMonitor[LabelX]'].value || !(parseInt(form.elements['newMonitor[LabelX]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadLabelX'] ?>";
+        errors[errors.length] = "<?php echo translate('BadLabelX') ?>";
     if ( !form.elements['newMonitor[LabelY]'].value || !(parseInt(form.elements['newMonitor[LabelY]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadLabelY'] ?>";
+        errors[errors.length] = "<?php echo translate('BadLabelY') ?>";
     if ( !form.elements['newMonitor[ImageBufferCount]'].value || !(parseInt(form.elements['newMonitor[ImageBufferCount]'].value) >= 10 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadImageBufferCount'] ?>";
+        errors[errors.length] = "<?php echo translate('BadImageBufferCount') ?>";
     if ( !form.elements['newMonitor[WarmupCount]'].value || !(parseInt(form.elements['newMonitor[WarmupCount]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadWarmupCount'] ?>";
+        errors[errors.length] = "<?php echo translate('BadWarmupCount') ?>";
     if ( !form.elements['newMonitor[PreEventCount]'].value || !(parseInt(form.elements['newMonitor[PreEventCount]'].value) > 0 ) || (parseInt(form.elements['newMonitor[PreEventCount]'].value) > parseInt(form.elements['newMonitor[ImageBufferCount]'].value)) )
-        errors[errors.length] = "<?php echo $SLANG['BadPreEventCount'] ?>";
+        errors[errors.length] = "<?php echo translate('BadPreEventCount') ?>";
     if ( !form.elements['newMonitor[PostEventCount]'].value || !(parseInt(form.elements['newMonitor[PostEventCount]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadPostEventCount'] ?>";
+        errors[errors.length] = "<?php echo translate('BadPostEventCount') ?>";
     if ( !form.elements['newMonitor[StreamReplayBuffer]'].value || !(parseInt(form.elements['newMonitor[StreamReplayBuffer]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadStreamReplayBuffer'] ?>";
+        errors[errors.length] = "<?php echo translate('BadStreamReplayBuffer') ?>";
     if ( !form.elements['newMonitor[AlarmFrameCount]'].value || !(parseInt(form.elements['newMonitor[AlarmFrameCount]'].value) > 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadAlarmFrameCount'] ?>";
+        errors[errors.length] = "<?php echo translate('BadAlarmFrameCount') ?>";
     if ( !form.elements['newMonitor[SectionLength]'].value || !(parseInt(form.elements['newMonitor[SectionLength]'].value) >= 30 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadSectionLength'] ?>";
+        errors[errors.length] = "<?php echo translate('BadSectionLength') ?>";
     if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadFPSReportInterval'] ?>";
+        errors[errors.length] = "<?php echo translate('BadFPSReportInterval') ?>";
     if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadFrameSkip'] ?>";
+        errors[errors.length] = "<?php echo translate('BadFrameSkip') ?>";
     if ( !form.elements['newMonitor[MotionFrameSkip]'].value || !(parseInt(form.elements['newMonitor[MotionFrameSkip]'].value) >= 0 ) )
-        errors[errors.length] = "<?php echo $SLANG['BadMotionFrameSkip'] ?>";
+        errors[errors.length] = "<?php echo translate('BadMotionFrameSkip') ?>";
     if ( form.elements['newMonitor[Type]'].value == 'Local' )
         if ( !form.elements['newMonitor[SignalCheckColour]'].value || !form.elements['newMonitor[SignalCheckColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
-            errors[errors.length] = "<?php echo $SLANG['BadSignalCheckColour'] ?>";
+            errors[errors.length] = "<?php echo translate('BadSignalCheckColour') ?>";
     if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
-        errors[errors.length] = "<?php echo $SLANG['BadWebColour'] ?>";
+        errors[errors.length] = "<?php echo translate('BadWebColour') ?>";
 
     if ( errors.length )
     {
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index b952fb3f7..655f993ff 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -8,11 +8,11 @@ var STATE_ALERT = <?php echo STATE_ALERT ?>;
 var STATE_TAPE = <?php echo STATE_TAPE ?>;
 
 var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo $SLANG['Idle'] ?>";
-stateStrings[STATE_PREALARM] = "<?php echo $SLANG['Idle'] ?>";
-stateStrings[STATE_ALARM] = "<?php echo $SLANG['Alarm'] ?>";
-stateStrings[STATE_ALERT] = "<?php echo $SLANG['Alert'] ?>";
-stateStrings[STATE_TAPE] = "<?php echo $SLANG['Record'] ?>";
+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_QUERY = <?php echo CMD_QUERY ?>;
 
diff --git a/web/skins/classic/views/js/options.js.php b/web/skins/classic/views/js/options.js.php
index 5c86a78eb..6d9d18312 100644
--- a/web/skins/classic/views/js/options.js.php
+++ b/web/skins/classic/views/js/options.js.php
@@ -1,5 +1,5 @@
 var restartWarning = <?php echo empty($restartWarning)?'false':'true' ?>;
 if ( restartWarning )
 {
-    alert( "<?php echo $SLANG['OptionRestartWarning'] ?>" );
+    alert( "<?php echo translate('OptionRestartWarning') ?>" );
 }
diff --git a/web/skins/classic/views/js/timeline.js.php b/web/skins/classic/views/js/timeline.js.php
index 4ec23432f..c5852a6ea 100644
--- a/web/skins/classic/views/js/timeline.js.php
+++ b/web/skins/classic/views/js/timeline.js.php
@@ -13,4 +13,4 @@ monitorNames[<?php echo $monitor['Id'] ?>] = '<?php echo validJsStr($monitor['Na
 }
 ?>
 
-var archivedString = "<?php echo $SLANG['Archived'] ?>";
+var archivedString = "<?php echo translate('Archived') ?>";
diff --git a/web/skins/classic/views/js/video.js.php b/web/skins/classic/views/js/video.js.php
index dd1dd2b01..cd12fef7b 100644
--- a/web/skins/classic/views/js/video.js.php
+++ b/web/skins/classic/views/js/video.js.php
@@ -1,5 +1,5 @@
 var eventId = '<?php echo $event['Id'] ?>';
 
-var videoGenSuccessString = '<?php echo addslashes($SLANG['VideoGenSucceeded']) ?>';
-var videoGenFailedString = '<?php echo addslashes($SLANG['VideoGenFailed']) ?>';
-var videoGenProgressString = '<?php echo addslashes($SLANG['GeneratingVideo']) ?>';
+var videoGenSuccessString = '<?php echo addslashes(translate('VideoGenSucceeded')) ?>';
+var videoGenFailedString = '<?php echo addslashes(translate('VideoGenFailed')) ?>';
+var videoGenProgressString = '<?php echo addslashes(translate('GeneratingVideo')) ?>';
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 79641d4f6..f33983d9f 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -8,13 +8,13 @@ var STATE_ALERT = <?php echo STATE_ALERT ?>;
 var STATE_TAPE = <?php echo STATE_TAPE ?>;
 
 var stateStrings = new Array();
-stateStrings[STATE_IDLE] = "<?php echo $SLANG['Idle'] ?>";
-stateStrings[STATE_PREALARM] = "<?php echo $SLANG['Idle'] ?>";
-stateStrings[STATE_ALARM] = "<?php echo $SLANG['Alarm'] ?>";
-stateStrings[STATE_ALERT] = "<?php echo $SLANG['Alert'] ?>";
-stateStrings[STATE_TAPE] = "<?php echo $SLANG['Record'] ?>";
+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 deleteString = "<?php echo $SLANG['Delete'] ?>";
+var deleteString = "<?php echo translate('Delete') ?>";
 
 var CMD_NONE = <?php echo CMD_NONE ?>;
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 73bd92dd6..7e3145378 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -50,18 +50,18 @@ var maxX = <?php echo $monitor['Width']-1 ?>;
 var maxY = <?php echo $monitor['Height']-1 ?>;
 var selfIntersecting = <?php echo $selfIntersecting?'true':'false' ?>;
 
-var selfIntersectingString = '<?php echo addslashes($SLANG['SelfIntersecting']) ?>';
-var alarmRGBUnsetString = '<?php echo addslashes($SLANG['AlarmRGBUnset']) ?>';
-var minPixelThresUnsetString = '<?php echo addslashes($SLANG['MinPixelThresUnset']) ?>';
-var minPixelThresLtMaxString = '<?php echo addslashes($SLANG['MinPixelThresLtMax']) ?>';
-var filterUnsetString = '<?php echo addslashes($SLANG['FilterUnset']) ?>';
-var minAlarmAreaUnsetString = '<?php echo addslashes($SLANG['MinAlarmAreaUnset']) ?>';
-var minAlarmAreaLtMaxString = '<?php echo addslashes($SLANG['MinAlarmAreaLtMax']) ?>';
-var minFilterAreaUnsetString = '<?php echo addslashes($SLANG['MinFilterAreaUnset']) ?>';
-var minFilterAreaLtMaxString = '<?php echo addslashes($SLANG['MinFilterAreaLtMax']) ?>';
-var minFilterLtMinAlarmString = '<?php echo addslashes($SLANG['MinFilterLtMinAlarm']) ?>';
-var minBlobAreaUnsetString = '<?php echo addslashes($SLANG['MinBlobAreaUnset']) ?>';
-var minBlobAreaLtMaxString = '<?php echo addslashes($SLANG['MinBlobAreaLtMax']) ?>';
-var minBlobLtMinFilterString = '<?php echo addslashes($SLANG['MinBlobLtMinFilter']) ?>';
-var minBlobsUnsetString = '<?php echo addslashes($SLANG['MinBlobsUnset']) ?>';
-var minBlobsLtMaxString = '<?php echo addslashes($SLANG['MinBlobsLtMax']) ?>';
+var selfIntersectingString = '<?php echo addslashes(translate('SelfIntersecting')) ?>';
+var alarmRGBUnsetString = '<?php echo addslashes(translate('AlarmRGBUnset')) ?>';
+var minPixelThresUnsetString = '<?php echo addslashes(translate('MinPixelThresUnset')) ?>';
+var minPixelThresLtMaxString = '<?php echo addslashes(translate('MinPixelThresLtMax')) ?>';
+var filterUnsetString = '<?php echo addslashes(translate('FilterUnset')) ?>';
+var minAlarmAreaUnsetString = '<?php echo addslashes(translate('MinAlarmAreaUnset')) ?>';
+var minAlarmAreaLtMaxString = '<?php echo addslashes(translate('MinAlarmAreaLtMax')) ?>';
+var minFilterAreaUnsetString = '<?php echo addslashes(translate('MinFilterAreaUnset')) ?>';
+var minFilterAreaLtMaxString = '<?php echo addslashes(translate('MinFilterAreaLtMax')) ?>';
+var minFilterLtMinAlarmString = '<?php echo addslashes(translate('MinFilterLtMinAlarm')) ?>';
+var minBlobAreaUnsetString = '<?php echo addslashes(translate('MinBlobAreaUnset')) ?>';
+var minBlobAreaLtMaxString = '<?php echo addslashes(translate('MinBlobAreaLtMax')) ?>';
+var minBlobLtMinFilterString = '<?php echo addslashes(translate('MinBlobLtMinFilter')) ?>';
+var minBlobsUnsetString = '<?php echo addslashes(translate('MinBlobsUnset')) ?>';
+var minBlobsLtMaxString = '<?php echo addslashes(translate('MinBlobsLtMax')) ?>';
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index 21d7875d9..06e3d9a68 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -26,52 +26,52 @@ if ( !canView( 'System' ) )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
+xhtmlHeaders(__FILE__, translate('SystemLog') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-          <input type="button" value="<?php echo $SLANG['More'] ?>" onclick="expandLog()"/>
-          <input type="button" value="<?php echo $SLANG['Clear'] ?>" onclick="clearLog()"/>
-          <input type="button" value="<?php echo $SLANG['Refresh'] ?>" onclick="refreshLog()"/>
-          <input type="button" value="<?php echo $SLANG['Export'] ?>" onclick="exportLog()"/>
-          <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
+          <input type="button" value="<?php echo translate('More') ?>" onclick="expandLog()"/>
+          <input type="button" value="<?php echo translate('Clear') ?>" onclick="clearLog()"/>
+          <input type="button" value="<?php echo translate('Refresh') ?>" onclick="refreshLog()"/>
+          <input type="button" value="<?php echo translate('Export') ?>" onclick="exportLog()"/>
+          <input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()"/>
       </div>
-      <h2 class="floating"><?php echo $SLANG['SystemLog'] ?></h2>
+      <h2 class="floating"><?php echo translate('SystemLog') ?></h2>
       <div id="headerControl">
         <table id="logSummary" cellspacing="0">
           <tr>
-            <td><?php echo $SLANG['Updated'] ?>: <span id="lastUpdate"></span></td>
-            <td><?php echo $SLANG['State'] ?>: <span id="logState"></span></td>
-            <td><?php echo $SLANG['Total'] ?>: <span id="totalLogs"></span></td>
-            <td><?php echo $SLANG['Available'] ?>: <span id="availLogs"></span></td>
-            <td><?php echo $SLANG['Displaying'] ?>: <span id="displayLogs"></span></td>
+            <td><?php echo translate('Updated') ?>: <span id="lastUpdate"></span></td>
+            <td><?php echo translate('State') ?>: <span id="logState"></span></td>
+            <td><?php echo translate('Total') ?>: <span id="totalLogs"></span></td>
+            <td><?php echo translate('Available') ?>: <span id="availLogs"></span></td>
+            <td><?php echo translate('Displaying') ?>: <span id="displayLogs"></span></td>
           </tr>
         </table>
       </div>
     </div>
     <div id="content">
-      <div id="filters">Filter log -
-        Component <select id="filter[Component]" onchange="filterLog(this)"><option value="">-----</option></select>
-        PID <select id="filter[Pid]" onchange="filterLog(this)"><option value="">-----</option></select>
-        Level <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select>
-        File <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select>
-        Line <select id="filter[Line]" onchange="filterLog(this)"><option value="">----</option></select>
-        <input type="reset" value="<?php echo $SLANG['Reset'] ?>" onclick="resetLog()"/>
+      <div id="filters"><?php echo translate('FilterLog') ?> -
+        <?php echo translate('Component') ?> <select id="filter[Component]" onchange="filterLog(this)"><option value="">-----</option></select>
+        <?php echo translate('Pid') ?> <select id="filter[Pid]" onchange="filterLog(this)"><option value="">-----</option></select>
+        <?php echo translate('Level') ?> <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select>
+        <?php echo translate('File') ?> <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select>
+        <?php echo translate('Line') ?> <select id="filter[Line]" onchange="filterLog(this)"><option value="">----</option></select>
+        <input type="reset" value="<?php echo translate('Reset') ?>" onclick="resetLog()"/>
       </div>
       <form name="logForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <table id="logTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th><?php echo $SLANG['DateTime'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['Component'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['Pid'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['Level'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['Message'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['File'] ?></th>
-              <th class="table-th-nosort"><?php echo $SLANG['Line'] ?></th>
+              <th><?php echo translate('DateTime') ?></th>
+              <th class="table-th-nosort"><?php echo translate('Component') ?></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>
@@ -84,29 +84,29 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
   </div>
   <div id="exportLog" class="overlay">
     <div class="overlayHeader">
-      <div class="overlayTitle"><?php echo $SLANG['ExportLog'] ?></div>
+      <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 $SLANG['SelectLog'] ?></legend>
-            <label for="selectorAll">All</label><input type="radio" id="selectorAll" name="selector" value="all"/>
-            <label for="selectorFilter">Filter</label><input type="radio" id="selectorFilter" name="selector" value="filter"/>
-            <label for="selectorCurrent">Current</label><input type="radio" id="selectorCurrent" name="selector" value="current" title="<?php echo $SLANG['ChooseLogSelection'] ?>" data-validators="validate-one-required"/>
+            <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 $SLANG['SelectFormat'] ?></legend>
-            <label for="formatText">Text</label><input type="radio" id="formatText" name="format" value="text"/>
+            <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 $SLANG['ChooseLogFormat'] ?>" class="validate-one-required"/>
+            <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 $SLANG['ExportFailed'] ?>: <span id="exportErrorText"></span>
+            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
           </div>
-          <input type="button" id="exportButton" value="<?php echo $SLANG['Export'] ?>" onclick="exportRequest()"/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" class="overlayCloser"/>
+          <input type="button" id="exportButton" value="<?php echo translate('Export') ?>" onclick="exportRequest()"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" class="overlayCloser"/>
         </form>
       </div>
     </div>
diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php
index a7562e5fa..d89a94319 100644
--- a/web/skins/classic/views/login.php
+++ b/web/skins/classic/views/login.php
@@ -18,12 +18,12 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-xhtmlHeaders(__FILE__, $SLANG['Login'] );
+xhtmlHeaders(__FILE__, translate('Login') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Login') ?></h1>
     </div>
     <div id="content">
       <form name="loginForm" id="loginForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -33,16 +33,16 @@ xhtmlHeaders(__FILE__, $SLANG['Login'] );
         <table id="loginTable" class="minor" cellspacing="0">
           <tbody>
             <tr>
-              <td class="colLeft"><?php echo $SLANG['Username'] ?></td>
+              <td class="colLeft"><?php echo translate('Username') ?></td>
               <td class="colRight"><input type="text" name="username" value="<?php echo isset($_REQUEST['username'])?validHtmlStr($_REQUEST['username']):"" ?>" size="12"/></td>
             </tr>
             <tr>
-              <td class="colLeft"><?php echo $SLANG['Password'] ?></td>
+              <td class="colLeft"><?php echo translate('Password') ?></td>
               <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
             </tr>
           </tbody>
         </table>
-        <input type="submit" value="<?php echo $SLANG['Login'] ?>"/>
+        <input type="submit" value="<?php echo translate('Login') ?>"/>
       </form>
     </div>
   </div>
diff --git a/web/skins/classic/views/logout.php b/web/skins/classic/views/logout.php
index 4b65d9c60..f8b83157b 100644
--- a/web/skins/classic/views/logout.php
+++ b/web/skins/classic/views/logout.php
@@ -20,12 +20,12 @@
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Logout'] );
+xhtmlHeaders(__FILE__, translate('Logout') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Logout'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Logout') ?></h1>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -33,16 +33,16 @@ xhtmlHeaders(__FILE__, $SLANG['Logout'] );
         <input type="hidden" name="view" value="login"/>
         <p><?php echo sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p>
         <p>
-          <input type="submit" value="<?php echo $SLANG['Logout'] ?>"/>
+          <input type="submit" value="<?php echo translate('Logout') ?>"/>
 <?php
 if ( ZM_USER_SELF_EDIT )
 {
 ?>
-          <input type="button" value="<?php echo $SLANG['Config'] ?>" onclick="createPopup( '?view=user&amp;uid=<?php echo $user['Id'] ?>', 'zmUser', 'user' );"/>
+          <input type="button" value="<?php echo translate('Config') ?>" onclick="createPopup( '?view=user&amp;uid=<?php echo $user['Id'] ?>', 'zmUser', 'user' );"/>
 <?php
 }
 ?>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </p>
       </form>
     </div>
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 88ee529a2..6cf89cebe 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -25,16 +25,16 @@ if ( !canView( 'Monitors' ) )
 }
 
 $tabs = array();
-$tabs["general"] = $SLANG['General'];
-$tabs["source"] = $SLANG['Source'];
-$tabs["storage"] = "Storage";
-$tabs["timestamp"] = $SLANG['Timestamp'];
-$tabs["buffers"] = $SLANG['Buffers'];
+$tabs["general"] = translate('General');
+$tabs["source"] = translate('Source');
+$tabs["storage"] = translate('Storage');
+$tabs["timestamp"] = translate('Timestamp');
+$tabs["buffers"] = translate('Buffers');
 if ( ZM_OPT_CONTROL && canView( 'Control' ) )
-    $tabs["control"] = $SLANG['Control'];
+    $tabs["control"] = translate('Control');
 if ( ZM_OPT_X10 )
-    $tabs["x10"] = $SLANG['X10'];
-$tabs["misc"] = $SLANG['Misc'];
+    $tabs["x10"] = translate('X10');
+$tabs["misc"] = translate('Misc');
 
 if ( isset($_REQUEST['tab']) )
     $tab = validHtmlStr($_REQUEST['tab']);
@@ -49,7 +49,7 @@ if ( ! empty($_REQUEST['mid']) ) {
     $nextId = getTableAutoInc( 'Monitors' );
     $monitor = array(
         'Id' => 0,
-        'Name' => $SLANG['Monitor'].'-'.$nextId,
+        'Name' => translate('Monitor').'-'.$nextId,
         'Function' => "Monitor",
         'Enabled' => true,
         'LinkedMonitors' => "",
@@ -178,11 +178,11 @@ if ( !empty($_REQUEST['probe']) )
 }
 
 $sourceTypes = array(
-    'Local'  => $SLANG['Local'],
-    'Remote' => $SLANG['Remote'],
-    'File'   => $SLANG['File'],
-    'Ffmpeg' => $SLANG['Ffmpeg'],
-    'Libvlc' => $SLANG['Libvlc'],
+    'Local'  => translate('Local'),
+    'Remote' => translate('Remote'),
+    'File'   => translate('File'),
+    'Ffmpeg' => translate('Ffmpeg'),
+    'Libvlc' => translate('Libvlc'),
     'cURL'   => "cURL (HTTP(S) only)"
 );
 if ( !ZM_HAS_V4L )
@@ -238,7 +238,7 @@ if ( ZM_HAS_V4L1 )
         $v4l1DeviceChannels["$i"] = $i;
 
     $v4l1LocalPalettes = array(
-        $SLANG['Grey']      => 1,
+        translate('Grey')      => 1,
         "BGR32"             => 5,
         "BGR24"             => 4,
         "*YUYV"              => 8,
@@ -292,7 +292,7 @@ if ( ZM_HAS_V4L2 )
         "Auto" => 0, /* Automatic palette selection */
 
         /*      Pixel format         FOURCC                        depth  Description  */
-        $SLANG['Grey'] =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
+        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     */
@@ -358,18 +358,18 @@ if ( ZM_HAS_V4L2 )
 }
 
 $Colours = array(
-    $SLANG['8BitGrey']    => 1,
-    $SLANG['24BitColour'] => 3,
-    $SLANG['32BitColour'] => 4
+    translate('8BitGrey')    => 1,
+    translate('24BitColour') => 3,
+    translate('32BitColour') => 4
 );
 
 $orientations = array(
-    $SLANG['Normal']      => '0',
-    $SLANG['RotateRight'] => '90',
-    $SLANG['Inverted']    => '180',
-    $SLANG['RotateLeft']  => '270',
-    $SLANG['FlippedHori'] => 'hori',
-    $SLANG['FlippedVert'] => 'vert'
+    translate('Normal')      => '0',
+    translate('RotateRight') => '90',
+    translate('Inverted')    => '180',
+    translate('RotateLeft')  => '270',
+    translate('FlippedHori') => 'hori',
+    translate('FlippedVert') => 'vert'
 );
 
 $deinterlaceopts = array(
@@ -433,7 +433,7 @@ $videowriteropts = array(
     "H264 Camera Passthrough"                             => 2          
 );
 
-xhtmlHeaders(__FILE__, $SLANG['Monitor']." - ".validHtmlStr($monitor['Name']) );
+xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name']) );
 ?>
 <body>
   <div id="page">
@@ -443,21 +443,21 @@ if ( canEdit( 'Monitors' ) )
 {
 ?>
       <div id="headerButtons">
-        <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo $SLANG['Probe'] ?></a>
+        <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
 	<?php
 	if ( ZM_HAS_ONVIF )
 	{
 	?>
-	        <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  $SLANG['OnvifProbe'] ?></a>
+	        <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
 	<?php
 	}
 	?>
-        <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo $SLANG['Presets'] ?></a>
+        <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
       </div>
 <?php
 }
 ?>
-      <h2><?php echo $SLANG['Monitor'] ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
+      <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
     </div>
     <div id="content">
       <ul class="tabList">
@@ -637,9 +637,9 @@ switch ( $tab )
     case 'general' :
     {
 ?>
-            <tr><td><?php echo $SLANG['Name'] ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
-            <tr><td><?php echo $SLANG['SourceType'] ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
-            <tr><td><?php echo $SLANG['Function'] ?></td><td><select name="newMonitor[Function]">
+            <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
+            <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
+            <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
 <?php
         foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
         {
@@ -649,9 +649,9 @@ switch ( $tab )
         }
 ?>
             </select></td></tr>
-            <tr><td><?php echo $SLANG['Enabled'] ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><td><?php echo translate('Enabled') ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr>
-              <td><?php echo $SLANG['LinkedMonitors'] ?></td>
+              <td><?php echo translate('LinkedMonitors') ?></td>
               <td>
                 <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
 <?php
@@ -673,23 +673,23 @@ switch ( $tab )
                 </select>
               </td>
             </tr>
-            <tr><td><?php echo $SLANG['MaximumFPS'] ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['AlarmMaximumFPS'] ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="6"/></td></tr>
 <?php
 	if ( ZM_FAST_IMAGE_BLENDS )
         {
 ?>
-            <tr><td><?php echo $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <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 == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('AlmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
 	} else {
 ?>
-            <tr><td><?php echo $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
 <?php
         }
 ?>
-            <tr><td><?php echo $SLANG['Triggers'] ?></td><td>
+            <tr><td><?php echo translate('Triggers') ?></td><td>
 <?php
         $optTriggers = getSetValues( 'Monitors', 'Triggers' );
         $breakCount = (int)(ceil(count($optTriggers)));
@@ -709,7 +709,7 @@ switch ( $tab )
         if ( !$optCount )
         {
 ?>
-              <em><?php echo $SLANG['NoneAvailable'] ?></em>
+              <em><?php echo translate('NoneAvailable') ?></em>
 <?php
         }
 ?>
@@ -722,27 +722,27 @@ switch ( $tab )
         if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" )
         {
 ?>
-            <tr><td><?php echo $SLANG['DevicePath'] ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
-            <tr><td><?php echo $SLANG['CaptureMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
+            <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
+            <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
 <?php
             if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' )
             {
 ?>
-            <tr><td><?php echo $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <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 == $newMonitor['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 ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['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 == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
             }
             else
             {
 ?>
-            <tr><td><?php echo $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <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 == $newMonitor['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 == $newMonitor['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 == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
             }
 ?>
-			<tr><td><?php echo $SLANG['V4LMultiBuffer'] ?></td><td>
+			<tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
 				<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['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 ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
@@ -750,36 +750,36 @@ switch ( $tab )
 				<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
 				<label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
 			</td></tr>
-			<tr><td><?php echo $SLANG['V4LCapturesPerFrame'] ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+			<tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
 <?php
         }
         elseif ( $newMonitor['Type'] == "Remote" )
         {
 ?>
-            <tr><td><?php echo $SLANG['RemoteProtocol'] ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this )" ); ?></td></tr>
+            <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this )" ); ?></td></tr>
 <?php
             if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == "http" )
             {
 ?>
-            <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $httpMethods ); ?></td></tr>
+            <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $httpMethods ); ?></td></tr>
 <?php
             }
             else
             {
 ?>
-            <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
+            <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
 <?php
             }
 ?>
-            <tr><td><?php echo $SLANG['RemoteHostName'] ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
-            <tr><td><?php echo $SLANG['RemoteHostPort'] ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['RemoteHostPath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
 <?php
         }
         elseif ( $newMonitor['Type'] == "File" )
         {
 ?>
-            <tr><td><?php echo $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
 <?php
         }
         elseif ( $newMonitor['Type'] == "cURL" )
@@ -793,26 +793,26 @@ switch ( $tab )
         elseif ( $newMonitor['Type'] == "Ffmpeg" || $newMonitor['Type'] == "Libvlc")
         {
 ?>
-			<tr><td><?php echo $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
-            <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
-			<tr><td><?php echo $SLANG['Options'] ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
+			<tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
+			<tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
 <?php
         }
 ?>
-            <tr><td><?php echo "Target Colorspace" ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td><?php echo $SLANG['CaptureWidth'] ?> (<?php echo $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-            <tr><td><?php echo $SLANG['CaptureHeight'] ?> (<?php echo $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-            <tr><td><?php echo $SLANG['PreserveAspect'] ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr> 
-            <tr><td><?php echo $SLANG['Orientation'] ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('TargetColorspace') ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['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($newMonitor['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><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         if ( $newMonitor['Type'] == "Local" )
         {
 ?>
-            <tr><td><?php echo "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         } else {
 ?>
-            <tr><td><?php echo "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         }
 ?>
@@ -821,72 +821,72 @@ switch ( $tab )
     }
     case 'storage'   :
 ?>
-            <tr><td>Save as JPEGs</td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td>Video writer</td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <tr><td>Optional encoder parameters</td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($newMonitor['EncoderParameters']) ?></textarea></td></tr>
+            <tr><td>translate('SaveJPEGs')</td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td>translate('VideoWriter')</td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td>translate('OptionalEncoderParameters')</td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($newMonitor['EncoderParameters']) ?></textarea></td></tr>
 <?php
         break;
     case 'timestamp' :
     {
 ?>
-            <tr><td><?php echo $SLANG['TimestampLabelFormat'] ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
-            <tr><td><?php echo $SLANG['TimestampLabelX'] ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['TimestampLabelY'] ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelY') ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr>
 <?php
         break;
     }
     case 'buffers' :
     {
 ?>
-            <tr><td><?php echo $SLANG['ImageBufferSize'] ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['WarmupFrames'] ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['PreEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['PostEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['StreamReplayBuffer'] ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr>
-<tr><td><?php echo $SLANG['AlarmFrameCount'] ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('PreEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('PostEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('StreamReplayBuffer') ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr>
+<tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
 <?php
         break;
     }
     case 'control' :
     {
 ?>
-            <tr><td><?php echo $SLANG['Controllable'] ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><td><?php echo $SLANG['ControlType'] ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo $SLANG['Edit'] ?></a><?php } ?></td></tr>
-            <tr><td><?php echo $SLANG['ControlDevice'] ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>" size="32"/></td></tr>
-            <tr><td><?php echo $SLANG['ControlAddress'] ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>" size="32"/></td></tr>
-            <tr><td><?php echo $SLANG['AutoStopTimeout'] ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['TrackMotion'] ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['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;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo translate('Edit') ?></a><?php } ?></td></tr>
+            <tr><td><?php echo translate('ControlDevice') ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('ControlAddress') ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('AutoStopTimeout') ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TrackMotion') ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         $return_options = array(
-            '-1' => $SLANG['None'],
-            '0' => $SLANG['Home'],
-            '1' => $SLANG['Preset']." 1",
+            '-1' => translate('None'),
+            '0' => translate('Home'),
+            '1' => translate('Preset')." 1",
         );
 ?>
-            <tr><td><?php echo $SLANG['TrackDelay'] ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>" size="4"/></td></tr>
-            <tr><td><?php echo $SLANG['ReturnLocation'] ?></td><td><?php echo buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr>
-            <tr><td><?php echo $SLANG['ReturnDelay'] ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TrackDelay') ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['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($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
 <?php
         break;
     }
     case 'x10' :
     {
 ?>
-            <tr><td><?php echo $SLANG['X10ActivationString'] ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
-            <tr><td><?php echo $SLANG['X10InputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
-            <tr><td><?php echo $SLANG['X10OutputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
+            <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>
 <?php
         break;
     }
     case 'misc' :
     {
 ?>
-            <tr><td><?php echo $SLANG['EventPrefix'] ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
-            <tr><td><?php echo $SLANG['Sectionlength'] ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['FrameSkip'] ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['MotionFrameSkip'] ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['FPSReportInterval'] ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr>
-            <tr><td><?php echo $SLANG['DefaultView'] ?></td><td><select name="newMonitor[DefaultView]">
+            <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
+            <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('FrameSkip') ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('MotionFrameSkip') ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('FPSReportInterval') ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('DefaultView') ?></td><td><select name="newMonitor[DefaultView]">
 <?php
         foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view )
         {
@@ -898,17 +898,17 @@ switch ( $tab )
         }
 ?>
             </select></td></tr>
-            <tr><td><?php echo $SLANG['DefaultRate'] ?></td><td><?php echo buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr>
-            <tr><td><?php echo $SLANG['DefaultScale'] ?></td><td><?php echo buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr>
+            <tr><td><?php echo translate('DefaultRate') ?></td><td><?php echo buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr>
+            <tr><td><?php echo translate('DefaultScale') ?></td><td><?php echo buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr>
 <?php
         if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" )
         {
 ?>
-            <tr><td><?php echo $SLANG['SignalCheckColour'] ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
+            <tr><td><?php echo translate('SignalCheckColour') ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
 <?php
         }
 ?>
-            <tr><td><?php echo $SLANG['WebColour'] ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
+            <tr><td><?php echo translate('WebColour') ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
 <?php
         break;
     }
@@ -917,7 +917,7 @@ switch ( $tab )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php
index 0c78899f0..db2c06252 100644
--- a/web/skins/classic/views/monitorpreset.php
+++ b/web/skins/classic/views/monitorpreset.php
@@ -25,7 +25,7 @@ if ( !canEdit( 'Monitors' ) )
 }
 $sql = "select Id,Name from MonitorPresets";
 $presets = array();
-$presets[0] = $SLANG['ChoosePreset'];
+$presets[0] = translate('ChoosePreset');
 foreach( dbFetchAll( $sql ) as $preset )
 {
     $presets[$preset['Id']] = htmlentities( $preset['Name'] );
@@ -33,25 +33,25 @@ foreach( dbFetchAll( $sql ) as $preset )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['MonitorPreset'] );
+xhtmlHeaders(__FILE__, translate('MonitorPreset') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['MonitorPreset'] ?></h2>
+      <h2><?php echo translate('MonitorPreset') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
         <p>
-          <?php echo $SLANG['MonitorPresetIntro'] ?>
+          <?php echo translate('MonitorPresetIntro') ?>
         </p>
         <p>
-          <label for="preset"><?php echo $SLANG['Preset'] ?></label><?php echo buildSelect( "preset", $presets, 'configureButtons( this )' ); ?>
+          <label for="preset"><?php echo translate('Preset') ?></label><?php echo buildSelect( "preset", $presets, 'configureButtons( this )' ); ?>
         </p>
         <div id="contentButtons">
-          <input type="submit" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" onclick="submitPreset( this )" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" onclick="submitPreset( this )" disabled="disabled"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index 8ae592440..8714383fc 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -25,7 +25,7 @@ if ( !canEdit( 'Monitors' ) )
 }
 
 $cameras = array();
-$cameras[0] = $SLANG['ChooseDetectedCamera'];
+$cameras[0] = translate('ChooseDetectedCamera');
 
 if ( ZM_HAS_V4L2 )
 {
@@ -103,7 +103,7 @@ if ( ZM_HAS_V4L2 )
                     $inputMonitor['SignalCheckColour'] = '#000023';
                 }
                 $inputDesc = base64_encode(serialize($inputMonitor));
-                $inputString = $deviceMatches[1].', chan '.$i.($input['free']?(" - ".$SLANG['Available']):(" (".$monitors[$input['id']]['Name'].")"));
+                $inputString = $deviceMatches[1].', chan '.$i.($input['free']?(" - ".translate('Available')):(" (".$monitors[$input['id']]['Name'].")"));
                 $inputs[] = $input;
                 $cameras[$inputDesc] = $inputString;
             }
@@ -341,36 +341,36 @@ foreach ( $output as $line )
         }
         else
         {
-            $sourceString .= " - ".$SLANG['Available'];
+            $sourceString .= " - ".translate('Available');
         }
         $cameras[$sourceDesc] = $sourceString;
     }
 }
 
 if ( count($cameras) <= 0 )
-    $cameras[0] = $SLANG['NoDetectedCameras'];
+    $cameras[0] = translate('NoDetectedCameras');
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['MonitorProbe'] );
+xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['MonitorProbe'] ?></h2>
+      <h2><?php echo translate('MonitorProbe') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
         <p>
-          <?php echo $SLANG['MonitorProbeIntro'] ?>
+          <?php echo translate('MonitorProbeIntro') ?>
         </p>
         <p>
-          <label for="probe"><?php echo $SLANG['DetectedCameras'] ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
+          <label for="probe"><?php echo translate('DetectedCameras') ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
         </p>
         <div id="contentButtons">
-          <input type="submit" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" onclick="submitCamera( this )" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" onclick="submitCamera( this )" disabled="disabled"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index f8a8a9554..d9f92805a 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -70,17 +70,17 @@ foreach( dbFetchAll( $sql ) as $row )
 $focusWindow = true;
 
 $layouts = array(
-    'montage_freeform.css' => $SLANG['MtgDefault'],
-    'montage_2wide.css' => $SLANG['Mtg2widgrd'],
-    'montage_3wide.css' => $SLANG['Mtg3widgrd'],
-    'montage_4wide.css' => $SLANG['Mtg4widgrd'],
-    'montage_3wide50enlarge.css' => $SLANG['Mtg3widgrx'],
+    'montage_freeform.css' => translate('MtgDefault'),
+    'montage_2wide.css' => translate('Mtg2widgrd'),
+    'montage_3wide.css' => translate('Mtg3widgrd'),
+    'montage_4wide.css' => translate('Mtg4widgrd'),
+    'montage_3wide50enlarge.css' => translate('Mtg3widgrx'),
 );
 
 if ( isset($_COOKIE['zmMontageLayout']) )
     $layout = $_COOKIE['zmMontageLayout'];
 
-xhtmlHeaders(__FILE__, $SLANG['Montage'] );
+xhtmlHeaders(__FILE__, translate('Montage') );
 ?>
 <body>
   <div id="page">
@@ -90,16 +90,16 @@ xhtmlHeaders(__FILE__, $SLANG['Montage'] );
 if ( $showControl )
 {
 ?>
-        <a href="#" onclick="createPopup( '?view=control', 'zmControl', 'control' )"><?php echo $SLANG['Control'] ?></a>
+        <a href="#" onclick="createPopup( '?view=control', 'zmControl', 'control' )"><?php echo translate('Control') ?></a>
 <?php
 }
 ?>
-        <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow()"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Montage'] ?></h2>
+      <h2><?php echo translate('Montage') ?></h2>
       <div id="headerControl">
-        <span id="scaleControl"><?php echo $SLANG['Scale'] ?>: <?php echo buildSelect( 'scale', $scales, 'changeScale(this);' ); ?></span> 
-        <label for="layout"><?php echo $SLANG['Layout'] ?>:</label><?php echo buildSelect( 'layout', $layouts, 'selectLayout(this);' )?>
+        <span id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( 'scale', $scales, 'changeScale(this);' ); ?></span> 
+        <label for="layout"><?php echo translate('Layout') ?>:</label><?php echo buildSelect( 'layout', $layouts, 'selectLayout(this);' )?>
       </div>
     </div>
     <div id="content">
@@ -138,7 +138,7 @@ else
     if ( !ZM_WEB_COMPACT_MONTAGE )
     {
 ?>
-            <div id="monitorState<?php echo $monitor['index'] ?>" class="monitorState idle"><?php echo $SLANG['State'] ?>:&nbsp;<span id="stateValue<?php echo $monitor['index'] ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor['index'] ?>"></span>&nbsp;fps</div>
+            <div id="monitorState<?php echo $monitor['index'] ?>" class="monitorState idle"><?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor['index'] ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor['index'] ?>"></span>&nbsp;fps</div>
 <?php
     }
 ?>
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index 22c365296..c15568eaf 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -25,7 +25,7 @@ if ( !canEdit( 'Monitors' ) )
 }
 
 $cameras = array();
-$cameras[0] = $SLANG['ChooseDetectedCamera'];
+$cameras[0] = translate('ChooseDetectedCamera');
 
 
 function execONVIF( $cmd )
@@ -124,7 +124,7 @@ function probeProfiles( $device_ep, $soapversion, $username, $password )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['MonitorProbe'] );
+xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 
 if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
 
@@ -159,7 +159,7 @@ if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
         }
         else
         {
-            $sourceString .= " - ".$SLANG['Available'];
+            $sourceString .= " - ".translate('Available');
         }
         $cameras[$sourceDesc] = $sourceString;
     }
@@ -171,39 +171,39 @@ if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
   }
 
   if ( count($cameras) <= 0 )
-      $cameras[0] = $SLANG['NoDetectedCameras'];
+      $cameras[0] = translate('NoDetectedCameras');
 
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?= $SLANG['MonitorProbe'] ?></h2>
+      <h2><?php echo translate('MonitorProbe') ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
-        <input type="hidden" name="mid" value="<?= validNum($_REQUEST['mid']) ?>"/>
+        <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
         <input type="hidden" name="step" value=""/>
         <p>
-          <?= $SLANG['OnvifProbeIntro'] ?>
+          <?php echo translate('OnvifProbeIntro') ?>
         </p>
         <p>
-          <label for="probe"><?= $SLANG['DetectedCameras'] ?></label><?= buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
+          <label for="probe"><?php echo translate('DetectedCameras') ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
         </p>
         <p>
-          <?= $SLANG['OnvifCredentialsIntro'] ?>
+          <?php echo translate('OnvifCredentialsIntro') ?>
         </p>
         <p>
-          <label for="username"><?= $SLANG['Username'] ?></label>
+          <label for="username"><?php echo translate('Username') ?></label>
           <input type="text" name="username" value="" onChange="configureButtons( this )" />
         </p>
         <p>
-          <label for="password"><?= $SLANG['Password'] ?></label>
+          <label for="password"><?php echo translate('Password') ?></label>
           <input type="password" name="password" value=""onChange="configureButtons( this )" />
         </p>
         <div id="contentButtons">
-          <input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
-          <input type="submit" name="nextBtn" value="<?= $SLANG['Next'] ?>" onclick="gotoStep2( this )" disabled="disabled"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <input type="submit" name="nextBtn" value="<?php echo translate('Next') ?>" onclick="gotoStep2( this )" disabled="disabled"/>
         </div>
       </form>
     </div>
@@ -251,29 +251,29 @@ else if($_REQUEST['step'] == "2")
   }
 
   if ( count($cameras) <= 0 )
-      $cameras[0] = $SLANG['NoDetectedCameras'];
+      $cameras[0] = translate('NoDetectedCameras');
 
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?= $SLANG['ProfileProbe'] ?></h2>
+      <h2><?php echo translate('ProfileProbe') ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
-        <input type="hidden" name="mid" value="<?= validNum($_REQUEST['mid']) ?>"/>
+        <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
         <input type="hidden" name="step" value=""/>
         <p>
-          <?= $SLANG['ProfileProbeIntro'] ?>
+          <?php echo translate('ProfileProbeIntro') ?>
         </p>
         <p>
-          <label for="probe"><?= $SLANG['DetectedProfiles'] ?></label><?= buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
+          <label for="probe"><?php echo translate('DetectedProfiles') ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
         </p>
         <div id="contentButtons">
-          <input type="button" name="prevBtn" value="<?= $SLANG['Prev'] ?>" onclick="gotoStep1( this )"/>
-          <input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
-          <input type="submit" name="saveBtn" value="<?= $SLANG['Save'] ?>" onclick="submitCamera( this )" disabled="disabled"/>
+          <input type="button" name="prevBtn" value="<?php echo translate('Prev') ?>" onclick="gotoStep1( this )"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" onclick="submitCamera( this )" disabled="disabled"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/optionhelp.php b/web/skins/classic/views/optionhelp.php
index 2aa5a4e40..fbfd3be69 100644
--- a/web/skins/classic/views/optionhelp.php
+++ b/web/skins/classic/views/optionhelp.php
@@ -25,15 +25,15 @@ $optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['OptionHelp'] );
+xhtmlHeaders(__FILE__, translate('OptionHelp') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['OptionHelp'] ?></h2>
+      <h2><?php echo translate('OptionHelp') ?></h2>
     </div>
     <div id="content">
       <h3><?php echo validHtmlStr($_REQUEST['option']) ?></h3>
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 9f8ef86e9..45e6c9ebb 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -27,23 +27,23 @@ if ( !canView( 'System' ) )
 $canEdit = canEdit( 'System' );
 
 $tabs = array();
-$tabs['skins'] = $SLANG['Display']; // change me to be supported by SLANG...
-$tabs['system'] = $SLANG['System'];
-$tabs['config'] = $SLANG['Config'];
-$tabs['paths'] = $SLANG['Paths'];
-$tabs['web'] = $SLANG['Web'];
-$tabs['images'] = $SLANG['Images'];
-$tabs['logging'] = $SLANG['Logging'];
-$tabs['network'] = $SLANG['Network'];
-$tabs['mail'] = $SLANG['Email'];
-$tabs['upload'] = $SLANG['Upload'];
-$tabs['x10'] = $SLANG['X10'];
-$tabs['highband'] = $SLANG['HighBW'];
-$tabs['medband'] = $SLANG['MediumBW'];
-$tabs['lowband'] = $SLANG['LowBW'];
-$tabs['phoneband'] = $SLANG['PhoneBW'];
+$tabs['skins'] = translate('Display');
+$tabs['system'] = translate('System');
+$tabs['config'] = translate('Config');
+$tabs['paths'] = translate('Paths');
+$tabs['web'] = translate('Web');
+$tabs['images'] = translate('Images');
+$tabs['logging'] = translate('Logging');
+$tabs['network'] = translate('Network');
+$tabs['mail'] = translate('Email');
+$tabs['upload'] = translate('Upload');
+$tabs['x10'] = translate('X10');
+$tabs['highband'] = translate('HighBW');
+$tabs['medband'] = translate('MediumBW');
+$tabs['lowband'] = translate('LowBW');
+$tabs['phoneband'] = translate('PhoneBW');
 $tabs['eyeZm'] = "eyeZm";
-$tabs['users'] = $SLANG['Users'];
+$tabs['users'] = translate('Users');
 
 if ( isset($_REQUEST['tab']) )
     $tab = validHtmlStr($_REQUEST['tab']);
@@ -52,12 +52,12 @@ else
 
 $focusWindow = true;
 
-xhtmlHeaders( __FILE__, $SLANG['Options'] );
+xhtmlHeaders( __FILE__, translate('Options') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Options'] ?></h2>
+      <h2><?php echo translate('Options') ?></h2>
     </div>
     <div id="content">
       <ul class="tabList">
@@ -105,11 +105,11 @@ if($tab == 'skins') {
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
 		<table class="contentTable major optionTable" cellspacing="0">
-			<thead><tr><th><?php echo $SLANG['Name'] ?></th><th><?php echo $SLANG['Description'] ?></th> <th><?php echo $SLANG['Value'] ?></th></tr></thead>
+			<thead><tr><th><?php echo translate('Name') ?></th><th><?php echo translate('Description') ?></th> <th><?php echo translate('Value') ?></th></tr></thead>
 			<tbody>
 				<tr>
 					<td>ZM_SKIN</td>
-					<td><?php echo $SLANG['SkinDescription']; ?></td>
+					<td><?php echo translate('SkinDescription'); ?></td>
 					<td><select name="skin-choice">
 						<?php
 							foreach($skin_options as $dir) {
@@ -121,7 +121,7 @@ if($tab == 'skins') {
 				</tr>
 				<tr>
 					<td>ZM_CSS</td>
-					<td><?php echo $SLANG['CSSDescription']; ?></td>
+					<td><?php echo translate('CSSDescription'); ?></td>
 					<td><select name="css-choice">
 						<?php
 							foreach( array_map( 'basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDIR) ) as $dir) {
@@ -134,8 +134,8 @@ if($tab == 'skins') {
 			</tbody>
 		</table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/>
-		  <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/>
+		  <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
      </form>
 	
@@ -151,17 +151,17 @@ elseif ( $tab == "users" )
         <table id="contentTable" class="major userTable" cellspacing="0">
           <thead>
             <tr>
-              <th class="colUsername"><?php echo $SLANG['Username'] ?></th>
-              <th class="colLanguage"><?php echo $SLANG['Language'] ?></th>
-              <th class="colEnabled"><?php echo $SLANG['Enabled'] ?></th>
-              <th class="colStream"><?php echo $SLANG['Stream'] ?></th>
-              <th class="colEvents"><?php echo $SLANG['Events'] ?></th>
-              <th class="colControl"><?php echo $SLANG['Control'] ?></th>
-              <th class="colMonitors"><?php echo $SLANG['Monitors'] ?></th>
-              <th class="colSystem"><?php echo $SLANG['System'] ?></th>
-              <th class="colBandwidth"><?php echo $SLANG['Bandwidth'] ?></th>
-              <th class="colMonitor"><?php echo $SLANG['Monitor'] ?></th>
-              <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
+              <th class="colUsername"><?php echo translate('Username') ?></th>
+              <th class="colLanguage"><?php echo translate('Language') ?></th>
+              <th class="colEnabled"><?php echo translate('Enabled') ?></th>
+              <th class="colStream"><?php echo translate('Stream') ?></th>
+              <th class="colEvents"><?php echo translate('Events') ?></th>
+              <th class="colControl"><?php echo translate('Control') ?></th>
+              <th class="colMonitors"><?php echo translate('Monitors') ?></th>
+              <th class="colSystem"><?php echo translate('System') ?></th>
+              <th class="colBandwidth"><?php echo translate('Bandwidth') ?></th>
+              <th class="colMonitor"><?php echo translate('Monitor') ?></th>
+              <th class="colMark"><?php echo translate('Mark') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -188,7 +188,7 @@ elseif ( $tab == "users" )
             <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']?$SLANG['Yes']:$SLANG['No'] ?></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>
@@ -204,7 +204,7 @@ elseif ( $tab == "users" )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="button" value="<?php echo $SLANG['AddNewUser'] ?>" onclick="createPopup( '?view=user&amp;uid=0', 'zmUser', 'user' );"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="button" value="<?php echo translate('AddNewUser') ?>" onclick="createPopup( '?view=user&amp;uid=0', 'zmUser', 'user' );"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
 <?php
@@ -223,9 +223,9 @@ elseif ( $tab == "users" )
         <table id="contentTable" class="major optionTable" cellspacing="0">
           <thead>
             <tr>
-              <th><?php echo $SLANG['Name'] ?></th>
-              <th><?php echo $SLANG['Description'] ?></th>
-              <th><?php echo $SLANG['Value'] ?></th>
+              <th><?php echo translate('Name') ?></th>
+              <th><?php echo translate('Description') ?></th>
+              <th><?php echo translate('Value') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -336,7 +336,7 @@ elseif ( $tab == "users" )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow();"/>
         </div>
       </form>
 <?php
diff --git a/web/skins/classic/views/plugin.php b/web/skins/classic/views/plugin.php
index b93a639cf..3061ea394 100644
--- a/web/skins/classic/views/plugin.php
+++ b/web/skins/classic/views/plugin.php
@@ -42,7 +42,7 @@ $plugin_path = dirname(ZM_PLUGINS_CONFIG_PATH)."/".$plugin;
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Plugin'] );
+xhtmlHeaders(__FILE__, translate('Plugin') );
 
 
 $pluginOptions=array(
@@ -103,7 +103,7 @@ function pLang($name)
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Monitor'] ?> <?php echo $monitor['Name'] ?> - <?php echo $SLANG['Zone'] ?> <?php echo $newZone['Name'] ?> - <?php echo $SLANG['Plugin'] ?> <?php echo $plugin ?></h2>
+      <h2><?php echo translate('Monitor') ?> <?php echo $monitor['Name'] ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?> - <?php echo translate('Plugin') ?> <?php echo $plugin ?></h2>
     </div>
     <div id="content">
       <form name="pluginForm" id="pluginForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -116,12 +116,12 @@ function pLang($name)
         <div id="settingsPanel">
           <table id="pluginSettings" cellspacing="0">
             <tbody>
-<?
+<?php
 foreach($pluginOptions as $name => $popt)
 {
    ?>
             <tr><th scope="row"><?php echo pLang($name) ?></th>     
-   <?
+   <?php
    switch($popt['Type'])
    {
       case "checkbox":
@@ -132,7 +132,7 @@ foreach($pluginOptions as $name => $popt)
             ?>
                <td colspan="2">
                   <select name="pluginOpt[<?php echo $popt['Name'] ?>]" id="pluginOpt[<?php echo $popt['Name'] ?>]">
-            <?
+            <?php
             foreach($pchoices as $pchoice)
             {
                $psel="";
@@ -140,12 +140,12 @@ foreach($pluginOptions as $name => $popt)
                   $psel="selected";
                ?>
                      <option value="<?php echo $pchoice ?>" <?php echo $psel ?>><?php echo pLang($pchoice) ?></option>
-               <?
+               <?php
             }
             ?>
                </td>
                   </select>
-         <?
+         <?php
          break;
       case "text":
       default:
@@ -153,12 +153,12 @@ foreach($pluginOptions as $name => $popt)
    }
    ?>
             </tr>
-   <?
+   <?php
 }
 ?>
             </tbody>
           </table>
-          <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo translate('Save') ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/postlogin.php b/web/skins/classic/views/postlogin.php
index b08bc77fe..c27b773c8 100644
--- a/web/skins/classic/views/postlogin.php
+++ b/web/skins/classic/views/postlogin.php
@@ -18,15 +18,15 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-xhtmlHeaders(__FILE__, $SLANG['LoggingIn'] );
+xhtmlHeaders(__FILE__, translate('LoggingIn') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Login') ?></h1>
     </div>
     <div id="content">
-      <h2><?php echo $SLANG['LoggingIn'] ?></h2>
+      <h2><?php echo translate('LoggingIn') ?></h2>
     </div>
   </div>
 </body>
diff --git a/web/skins/classic/views/settings.php b/web/skins/classic/views/settings.php
index 14d635178..3302d2063 100644
--- a/web/skins/classic/views/settings.php
+++ b/web/skins/classic/views/settings.php
@@ -36,12 +36,12 @@ $monitor['Colour'] = $colour;
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, validHtmlStr($monitor['Name'])." - ".$SLANG['Settings'] );
+xhtmlHeaders(__FILE__, validHtmlStr($monitor['Name'])." - ".translate('Settings') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo validHtmlStr($monitor['Name']) ?> - <?php echo $SLANG['Settings'] ?></h2>
+      <h2><?php echo validHtmlStr($monitor['Name']) ?> - <?php echo translate('Settings') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -51,25 +51,25 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor['Name'])." - ".$SLANG['Settings'] )
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['Brightness'] ?></th>
+              <th scope="row"><?php echo translate('Brightness') ?></th>
               <td><input type="text" name="newBrightness" value="<?php echo $monitor['Brightness'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Contrast'] ?></th>
+              <th scope="row"><?php echo translate('Contrast') ?></th>
               <td><input type="text" name="newContrast" value="<?php echo $monitor['Contrast'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Hue'] ?></th>
+              <th scope="row"><?php echo translate('Hue') ?></th>
               <td><input type="text" name="newHue" value="<?php echo $monitor['Hue'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Colour'] ?></th>
+              <th scope="row"><?php echo translate('Colour') ?></th>
               <td><input type="text" name="newColour" value="<?php echo $monitor['Colour'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php
index 66c9ef9c1..84ffb954d 100644
--- a/web/skins/classic/views/state.php
+++ b/web/skins/classic/views/state.php
@@ -29,12 +29,12 @@ $states = dbFetchAll( "select * from States" );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['RunState'] );
+xhtmlHeaders(__FILE__, translate('RunState') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['RunState'] ?></h2>
+      <h2><?php echo translate('RunState') ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -51,14 +51,14 @@ if ( empty($_REQUEST['apply']) )
     if ( $running )
     {
 ?>
-            <option value="stop" selected="selected"><?php echo $SLANG['Stop'] ?></option>
-            <option value="restart"><?php echo $SLANG['Restart'] ?></option>
+            <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 $SLANG['Start'] ?></option>
+            <option value="start" selected="selected"><?php echo translate('Start') ?></option>
 <?php
     }
 ?>
@@ -75,16 +75,16 @@ if ( empty($_REQUEST['apply']) )
         <table id="contentTable" class="minor" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['NewState'] ?></th>
+              <th scope="row"><?php echo translate('NewState') ?></th>
               <td><input type="text" name="newState" value="" size="16" onchange="checkState( this );"/></td>
             </tr>
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
-          <input type="button" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" disabled="disabled" onclick="saveState( this );"/>
-          <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled" onclick="deleteState( this );"/>
-          <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Apply') ?>"/>
+          <input type="button" name="saveBtn" value="<?php echo translate('Save') ?>" disabled="disabled" onclick="saveState( this );"/>
+          <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled" onclick="deleteState( this );"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
 <?php
 }
@@ -94,8 +94,8 @@ else
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="action" value="state"/>
         <input type="hidden" name="runState" value="<?php echo validHtmlStr($_REQUEST['runState']) ?>"/>
-        <p><?php echo $SLANG['ApplyingStateChange'] ?></p>
-        <p><?php echo $SLANG['PleaseWait'] ?></p>
+        <p><?php echo translate('ApplyingStateChange') ?></p>
+        <p><?php echo translate('PleaseWait') ?></p>
 <?php
 }
 ?>
diff --git a/web/skins/classic/views/stats.php b/web/skins/classic/views/stats.php
index 42c069ffb..55a9fab6e 100644
--- a/web/skins/classic/views/stats.php
+++ b/web/skins/classic/views/stats.php
@@ -32,15 +32,15 @@ $stats = dbFetchAll( $sql, NULL, array( $eid, $fid ) );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Stats']." - ".$eid." - ".$fid );
+xhtmlHeaders(__FILE__, translate('Stats')." - ".$eid." - ".$fid );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Stats'] ?> - <?php echo $eid ?> - <?php echo $fid ?></h2>
+      <h2><?php echo translate('Stats') ?> - <?php echo $eid ?> - <?php echo $fid ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -48,15 +48,15 @@ xhtmlHeaders(__FILE__, $SLANG['Stats']." - ".$eid." - ".$fid );
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th class="colZone"><?php echo $SLANG['Zone'] ?></th>
-              <th class="colPixelDiff"><?php echo $SLANG['PixelDiff'] ?></th>
-              <th class="colAlarmPx"><?php echo $SLANG['AlarmPx'] ?></th>
-              <th class="colFilterPx"><?php echo $SLANG['FilterPx'] ?></th>
-              <th class="colBlobPx"><?php echo $SLANG['BlobPx'] ?></th>
-              <th class="colBlobs"><?php echo $SLANG['Blobs'] ?></th>
-              <th class="colBlobSizes"><?php echo $SLANG['BlobSizes'] ?></th>
-              <th class="colAlarmLimits"><?php echo $SLANG['AlarmLimits'] ?></th>
-              <th class="colScore"><?php echo $SLANG['Score'] ?></th>
+              <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>
@@ -97,7 +97,7 @@ else
 {
 ?>
             <tr>
-              <td class="rowNoStats" colspan="9"><?php echo $SLANG['NoStatisticsRecorded'] ?></td>
+              <td class="rowNoStats" colspan="9"><?php echo translate('NoStatisticsRecorded') ?></td>
             </tr>
 <?php
 }
diff --git a/web/skins/classic/views/status.php b/web/skins/classic/views/status.php
index facfe153f..9bfa3ed19 100644
--- a/web/skins/classic/views/status.php
+++ b/web/skins/classic/views/status.php
@@ -31,12 +31,12 @@ $refresh = ZM_WEB_REFRESH_STATUS;
 $url = '?view='.$view;
 noCacheHeaders();
 
-xhtmlHeaders(__FILE__, $SLANG['Status'] );
+xhtmlHeaders(__FILE__, translate('Status') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Status'] ?></h2>
+      <h2><?php echo translate('Status') ?></h2>
     </div>
     <div id="content">
       <table id="contentTable" class="major" cellspacing="0">
diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index a7739726e..109712f88 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -671,8 +671,6 @@ else
 
 function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomClass=false )
 {
-    global $SLANG;
-
     ob_start();
     $labelCount = 0;
     $lastTick = 0;
@@ -725,7 +723,7 @@ 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 $SLANG['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') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
 <?php
                 }
                 $lastTick = $i;
@@ -738,7 +736,7 @@ 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 $SLANG['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') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
 <?php
     }
 ?>
@@ -799,22 +797,22 @@ function getSlotShowEventBehaviour( $slot )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Timeline'] );
+xhtmlHeaders(__FILE__, translate('Timeline') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <?php echo makePopupLink( '?view=events&amp;page=1'.htmlspecialchars($filterQuery), 'zmEvents', 'events', $SLANG['List'], canView( 'Events' ) ) ?>
-        <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
+        <?php echo makePopupLink( '?view=events&amp;page=1'.htmlspecialchars($filterQuery), 'zmEvents', 'events', translate('List'), canView( 'Events' ) ) ?>
+        <a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Timeline'] ?></h2>
+      <h2><?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.gif" alt="<?php echo $SLANG['ViewEvent'] ?>" title="<?php echo $SLANG['ViewEvent'] ?>"/>-->
+			<!-- <img id="imageSrc" class="imageWidth" src="graphics/transparent.gif" alt="<?php echo translate('ViewEvent') ?>" title="<?php echo translate('ViewEvent') ?>"/>-->
 			<!-- width="<?php echo $event['Width']; ?>" height="<?php echo $event['Height']; ?>" -->
 			<video id="preview" width="100%" controls>
 				<source src="<?php echo "/events/".getEventPath($event)."/event.mp4"; ?>" type="video/mp4">
@@ -826,18 +824,18 @@ Your browser does not support the video tag.
         <div id="dataPanel">
           <div id="textPanel">
             <div id="instruction">
-              <p><?php echo $SLANG['TimelineTip1'] ?></p>
-              <p><?php echo $SLANG['TimelineTip2'] ?></p>
-              <p><?php echo $SLANG['TimelineTip3'] ?></p>
-              <p><?php echo $SLANG['TimelineTip4'] ?></p>
+              <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>
           </div>
           <div id="navPanel">
-            <input type="button" title="<?php echo $SLANG['PanLeft'] ?>" value="&lt;&lt;" onclick="tlPan( '<?php echo $minTime ?>', '<?php echo $range ?>' )"/>
-            <input type="button" title="<?php echo $SLANG['ZoomOut'] ?>" value="&ndash;" onclick="tlZoomRange( '<?php echo $midTime ?>', '<?php echo (int)($range*$majXScale['zoomout']) ?>' )"/>
-            <input type="button" title="<?php echo $SLANG['PanRight'] ?>" value="&gt;&gt;" onclick="tlPan( '<?php echo $maxTime ?>', '<?php echo $range ?>' )"/>
+            <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>
         </div>
       </div>
diff --git a/web/skins/classic/views/user.php b/web/skins/classic/views/user.php
index 74d85471d..274fd2fc5 100644
--- a/web/skins/classic/views/user.php
+++ b/web/skins/classic/views/user.php
@@ -33,16 +33,16 @@ if ( $_REQUEST['uid'] ) {
 	}
 } else {
 	$newUser = array();
-	$newUser['Username'] = $SLANG['NewUser'];
+	$newUser['Username'] = translate('NewUser');
 	$newUser['Enabled'] = 1;
 	$newUser['MonitorIds'] = '';
 }
 
 $monitorIds = array_flip(explode( ',', $newUser['MonitorIds'] ));
 
-$yesno = array( 0=>$SLANG['No'], 1=>$SLANG['Yes'] );
-$nv = array( 'None'=>$SLANG['None'], 'View'=>$SLANG['View'] );
-$nve = array( 'None'=>$SLANG['None'], 'View'=>$SLANG['View'], 'Edit'=>$SLANG['Edit'] );
+$yesno = array( 0=>translate('No'), 1=>translate('Yes') );
+$nv = array( 'None'=>translate('None'), 'View'=>translate('View') );
+$nve = array( 'None'=>translate('None'), 'View'=>translate('View'), 'Edit'=>translate('Edit') );
 $bandwidths = array_merge( array( ""=>"" ), $bwArray );
 $langs = array_merge( array( ""=>"" ), getLanguages() );
 
@@ -55,12 +55,12 @@ foreach( dbFetchAll( $sql ) as $monitor )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['User']." - ".$newUser['Username'] );
+xhtmlHeaders(__FILE__, translate('User')." - ".$newUser['Username'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['User']." - ".$newUser['Username'] ?></h2>
+      <h2><?php echo translate('User')." - ".$newUser['Username'] ?></h2>
     </div>
     <div id="content">
       <form name="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this, <?php echo empty($newUser['Password'])?'true':'false' ?> )">
@@ -75,22 +75,22 @@ if ( canEdit( 'System' ) )
 {
 ?>
             <tr>
-              <th scope="row"><?php echo $SLANG['Username'] ?></th>
+              <th scope="row"><?php echo translate('Username') ?></th>
               <td><input type="text" name="newUser[Username]" value="<?php echo $newUser['Username'] ?>"/></td>
             </tr>
 <?php
 }
 ?>
             <tr>
-              <th scope="row"><?php echo $SLANG['NewPassword'] ?></th>
+              <th scope="row"><?php echo translate('NewPassword') ?></th>
               <td><input type="password" name="newUser[Password]" value=""/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['ConfirmPassword'] ?></th>
+              <th scope="row"><?php echo translate('ConfirmPassword') ?></th>
               <td><input type="password" name="conf_password" value=""/></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Language'] ?></th>
+              <th scope="row"><?php echo translate('Language') ?></th>
               <td><?php echo buildSelect( "newUser[Language]", $langs ) ?></td>
             </tr>
 <?php
@@ -98,35 +98,35 @@ if ( canEdit( 'System' ) )
 {
 ?>
             <tr>
-              <th scope="row"><?php echo $SLANG['Enabled'] ?></th>
+              <th scope="row"><?php echo translate('Enabled') ?></th>
               <td><?php echo buildSelect( "newUser[Enabled]", $yesno ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Stream'] ?></th>
+              <th scope="row"><?php echo translate('Stream') ?></th>
               <td><?php echo buildSelect( "newUser[Stream]", $nv ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Events'] ?></th>
+              <th scope="row"><?php echo translate('Events') ?></th>
               <td><?php echo buildSelect( "newUser[Events]", $nve ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Control'] ?></th>
+              <th scope="row"><?php echo translate('Control') ?></th>
               <td><?php echo buildSelect( "newUser[Control]", $nve ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['Monitors'] ?></th>
+              <th scope="row"><?php echo translate('Monitors') ?></th>
               <td><?php echo buildSelect( "newUser[Monitors]", $nve ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['System'] ?></th>
+              <th scope="row"><?php echo translate('System') ?></th>
               <td><?php echo buildSelect( "newUser[System]", $nve ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['MaxBandwidth'] ?></th>
+              <th scope="row"><?php echo translate('MaxBandwidth') ?></th>
               <td><?php echo buildSelect( "newUser[MaxBandwidth]", $bandwidths ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['RestrictedMonitors'] ?></th>
+              <th scope="row"><?php echo translate('RestrictedMonitors') ?></th>
               <td>
                 <select name="monitorIds" size="4" multiple="multiple">
 <?php
@@ -149,7 +149,7 @@ if ( canEdit( 'System' ) )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php
index e56b040c4..dca598b7c 100644
--- a/web/skins/classic/views/version.php
+++ b/web/skins/classic/views/version.php
@@ -24,28 +24,28 @@ if ( !canEdit( 'System' ) )
     return;
 }
 $options = array(
-    "go" => $SLANG['GoToZoneMinder']
+    "go" => translate('GoToZoneMinder')
 );
 
 if ( verNum( ZM_DYN_CURR_VERSION ) != verNum( ZM_DYN_LAST_VERSION ) )
 {
     $options = array_merge( $options, array(
-        "ignore" => $SLANG['VersionIgnore'],
-        "hour"   => $SLANG['VersionRemindHour'],
-        "day"    => $SLANG['VersionRemindDay'],
-        "week"   => $SLANG['VersionRemindWeek'],
-        "never"  => $SLANG['VersionRemindNever']
+        "ignore" => translate('VersionIgnore'),
+        "hour"   => translate('VersionRemindHour'),
+        "day"    => translate('VersionRemindDay'),
+        "week"   => translate('VersionRemindWeek'),
+        "never"  => translate('VersionRemindNever')
     ) );
 }
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Version'] );
+xhtmlHeaders(__FILE__, translate('Version') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Version'] ?></h2>
+      <h2><?php echo translate('Version') ?></h2>
     </div>
     <div id="content">
 <?php
@@ -53,9 +53,9 @@ if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) )
 {
 ?>
       <p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p>
-      <p><?php echo $SLANG['RunLocalUpdate'] ?></p>
+      <p><?php echo translate('RunLocalUpdate') ?></p>
       <div id="contentButtons">
-        <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
+        <input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()"/>
       </div>
 <?php
 }
@@ -63,10 +63,10 @@ elseif ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) )
 {
 ?>
       <p><?php echo sprintf( $CLANG['RunningRecentVer'], ZM_VERSION ) ?></p>
-      <p><?php echo $SLANG['UpdateNotNecessary'] ?></p>
-      <p><input type="button" value="<?php echo $SLANG['GoToZoneMinder'] ?>" onclick="zmWindow()"/></p>
+      <p><?php echo translate('UpdateNotNecessary') ?></p>
+      <p><input type="button" value="<?php echo translate('GoToZoneMinder') ?>" onclick="zmWindow()"/></p>
       <div id="contentButtons">
-        <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
+        <input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()"/>
       </div>
 <?php
 }
@@ -76,12 +76,12 @@ else
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="action" value="version"/>
-        <p><?php echo $SLANG['UpdateAvailable'] ?></p>
+        <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>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Apply'] ?>" onclick="submitForm( this )"/>
-          <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Apply') ?>" onclick="submitForm( this )"/>
+          <input type="button" value="<?php echo translate('Close') ?>" onclick="closeWindow()"/>
         </div>
       </form>
 <?php
diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php
index 05ee55afb..34537f0b2 100644
--- a/web/skins/classic/views/video.php
+++ b/web/skins/classic/views/video.php
@@ -107,15 +107,15 @@ if ( isset($_REQUEST['downloadIndex']) )
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Video'] );
+xhtmlHeaders(__FILE__, translate('Video') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
+        <a href="#" onclick="closeWindow()"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo $SLANG['Video'] ?></h2>
+      <h2><?php echo translate('Video') ?></h2>
     </div>
     <div id="content">
 <?php
@@ -138,45 +138,45 @@ else
         <table id="contentTable" class="minor" cellspacing="0">
           <tbody>
             <tr>
-              <th scope="row"><?php echo $SLANG['VideoFormat'] ?></th>
+              <th scope="row"><?php echo translate('VideoFormat') ?></th>
               <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['FrameRate'] ?></th>
+              <th scope="row"><?php echo translate('FrameRate') ?></th>
               <td><?php echo buildSelect( "rate", $rates ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['VideoSize'] ?></th>
+              <th scope="row"><?php echo translate('VideoSize') ?></th>
               <td><?php echo buildSelect( "scale", $scales ) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo $SLANG['OverwriteExisting'] ?></th>
+              <th scope="row"><?php echo translate('OverwriteExisting') ?></th>
               <td><input type="checkbox" name="overwrite" value="1"<?php if ( !empty($_REQUEST['overwrite']) ) { ?> checked="checked"<?php } ?>/></td>
             </tr>
           </tbody>
         </table>
-        <input type="button" value="<?php echo $SLANG['GenerateVideo'] ?>" onclick="generateVideo( this.form );"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
+        <input type="button" value="<?php echo translate('GenerateVideo') ?>" onclick="generateVideo( this.form );"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
       </form>
 <?php
     if ( isset($_REQUEST['generated']) )
     {
 ?>
-      <h2 id="videoProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="videoProgressText"><?php echo $_REQUEST['generated']?$SLANG['VideoGenSucceeded']:$SLANG['VideoGenFailed'] ?></span><span id="videoProgressTicker"></span></h2>
+      <h2 id="videoProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="videoProgressText"><?php echo $_REQUEST['generated']?translate('VideoGenSucceeded'):translate('VideoGenFailed') ?></span><span id="videoProgressTicker"></span></h2>
 <?php
     }
     else
     {
 ?>
-      <h2 id="videoProgress" class="hidden warnText"><span id="videoProgressText"><?php echo $SLANG['GeneratingVideo'] ?></span><span id="videoProgressTicker"></span></h2>
+      <h2 id="videoProgress" class="hidden warnText"><span id="videoProgressText"><?php echo translate('GeneratingVideo') ?></span><span id="videoProgressTicker"></span></h2>
 <?php
     }
 ?>
-      <h2 id="videoFilesHeader"><?php echo $SLANG['VideoGenFiles'] ?></h2>
+      <h2 id="videoFilesHeader"><?php echo translate('VideoGenFiles') ?></h2>
 <?php
     if ( count($videoFiles) == 0 )
     {
 ?>
-      <h3 id="videoNoFiles"><?php echo $SLANG['VideoGenNoFiles'] ?></h3>
+      <h3 id="videoNoFiles"><?php echo translate('VideoGenNoFiles') ?></h3>
 <?php
     }
     else
@@ -185,11 +185,11 @@ else
       <table id="videoTable" class="major" cellspacing="0">
         <thead>
           <tr>
-            <th scope="row"><?php echo $SLANG['Format'] ?></th>
-            <th scope="row"><?php echo $SLANG['Size'] ?></th>
-            <th scope="row"><?php echo $SLANG['Rate'] ?></th>
-            <th scope="row"><?php echo $SLANG['Scale'] ?></th>
-            <th scope="row"><?php echo $SLANG['Action'] ?></th>
+            <th scope="row"><?php echo translate('Format') ?></th>
+            <th scope="row"><?php echo translate('Size') ?></th>
+            <th scope="row"><?php echo translate('Rate') ?></th>
+            <th scope="row"><?php echo translate('Scale') ?></th>
+            <th scope="row"><?php echo translate('Action') ?></th>
           </tr>
         </thead>
         <tbody>
@@ -226,7 +226,7 @@ else
           <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 ), $SLANG['View'] ); ?>&nbsp;/&nbsp;<a href="<?php echo substr( $file, strlen(ZM_DIR_EVENTS)+1 ) ?>" onclick="downloadVideo( <?php echo $index ?> ); return( false );"><?php echo $SLANG['Download'] ?></a>&nbsp;/&nbsp;<a href="#" onclick="deleteVideo( <?php echo $index ?> ); return( false );"><?php echo $SLANG['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="<?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>
         </tr>
 <?php
                 $index++;
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index ea6d4fb13..8a955840f 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -66,14 +66,14 @@ $showDvrControls = ( $streamMode == 'jpeg' && $monitor['StreamReplayBuffer'] !=
 
 noCacheHeaders();
 
-xhtmlHeaders( __FILE__, $monitor['Name']." - ".$SLANG['Feed'] );
+xhtmlHeaders( __FILE__, $monitor['Name']." - ".translate('Feed') );
 ?>
 <body>
   <div id="page">
     <div id="content">
       <div id="menuBar">
         <div id="monitorName"><?php echo $monitor['Name'] ?></div>
-        <div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a></div>
+        <div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a></div>
         <div id="menuControls">
 <?php
 if ( $showPtzControls )
@@ -81,13 +81,13 @@ if ( $showPtzControls )
     if ( canView( 'Control' ) )
     {
 ?>
-          <div id="controlControl"<?php echo $showControls?' class="hidden"':'' ?>><a id="controlLink" href="#" onclick="showPtzControls(); return( false );"><?php echo $SLANG['Control'] ?></a></div>
+          <div id="controlControl"<?php echo $showControls?' class="hidden"':'' ?>><a id="controlLink" href="#" onclick="showPtzControls(); return( false );"><?php echo translate('Control') ?></a></div>
 <?php
     }
     if ( canView( 'Events' ) )
     {
 ?>
-          <div id="eventsControl"<?php echo $showControls?'':' class="hidden"' ?>><a id="eventsLink" href="#" onclick="showEvents(); return( false );"><?php echo $SLANG['Events'] ?></a></div>
+          <div id="eventsControl"<?php echo $showControls?'':' class="hidden"' ?>><a id="eventsLink" href="#" onclick="showEvents(); return( false );"><?php echo translate('Events') ?></a></div>
 <?php
     }
 }
@@ -96,11 +96,11 @@ if ( $showPtzControls )
 if ( canView( 'Control' ) && $monitor['Type'] == "Local" )
 {
 ?>
-          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', $SLANG['Settings'], true, 'id="settingsLink"' ) ?></div>
+          <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
 <?php
 }
 ?>
-          <div id="scaleControl"><?php echo $SLANG['Scale'] ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div>
+          <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div>
         </div>
       </div>
       <div id="imageFeed">
@@ -127,34 +127,34 @@ else
 if ( canEdit( 'Monitors' ) )
 {
 ?>
-        <div id="enableDisableAlarms"><a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms(); return( false );" class="hidden"><?php echo $SLANG['EnableAlarms'] ?></a><a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms(); return( false );" class="hidden"><?php echo $SLANG['DisableAlarms'] ?></a></div>
+        <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></div>
 <?php
 }
 if ( canEdit( 'Monitors' ) )
 {
 ?>
-        <div id="forceCancelAlarm"><a id="forceAlarmLink" href="#" onclick="cmdForceAlarm()" class="hidden"><?php echo $SLANG['ForceAlarm'] ?></a><a id="cancelAlarmLink" href="#" onclick="cmdCancelForcedAlarm()" class="hidden"><?php echo $SLANG['CancelForcedAlarm'] ?></a></div>
+        <div id="forceCancelAlarm"><a id="forceAlarmLink" href="#" onclick="cmdForceAlarm()" class="hidden"><?php echo translate('ForceAlarm') ?></a><a id="cancelAlarmLink" href="#" onclick="cmdCancelForcedAlarm()" class="hidden"><?php echo translate('CancelForcedAlarm') ?></a></div>
 <?php
 }
 ?>
-        <div id="monitorState"><?php echo $SLANG['State'] ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
+        <div id="monitorState"><?php echo translate('State') ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
       </div>
       <div id="dvrControls"<?php echo $showDvrControls?'':' class="hidden"' ?>>
-        <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo $SLANG['Rewind'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastRev( true )"/>
-        <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowRev( true )"/>
-        <input type="button" value="||" id="pauseBtn" title="<?php echo $SLANG['Pause'] ?>" class="inactive" onclick="streamCmdPause( true )"/>
-        <input type="button" value="[]" id="stopBtn" title="<?php echo $SLANG['Stop'] ?>" class="unavail" disabled="disabled" onclick="streamCmdStop( true )"/>
-        <input type="button" value="|&gt;" id="playBtn" title="<?php echo $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamCmdPlay( true )"/>
-        <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowFwd( true )"/>
-        <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo $SLANG['FastForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastFwd( true )"/>
-        <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo $SLANG['ZoomOut'] ?>" class="avail" onclick="streamCmdZoomOut()"/>
+        <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo translate('Rewind') ?>" class="unavail" disabled="disabled" onclick="streamCmdFastRev( true )"/>
+        <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo translate('StepBack') ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowRev( true )"/>
+        <input type="button" value="||" id="pauseBtn" title="<?php echo translate('Pause') ?>" class="inactive" onclick="streamCmdPause( true )"/>
+        <input type="button" value="[]" id="stopBtn" title="<?php echo translate('Stop') ?>" class="unavail" disabled="disabled" onclick="streamCmdStop( true )"/>
+        <input type="button" value="|&gt;" id="playBtn" title="<?php echo translate('Play') ?>" class="active" disabled="disabled" onclick="streamCmdPlay( true )"/>
+        <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo translate('StepForward') ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowFwd( true )"/>
+        <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo translate('FastForward') ?>" class="unavail" disabled="disabled" onclick="streamCmdFastFwd( true )"/>
+        <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" onclick="streamCmdZoomOut()"/>
       </div>
       <div id="replayStatus"<?php echo $streamMode=="single"?' class="hidden"':'' ?>>
-        <span id="mode">Mode: <span id="modeValue"></span></span>
-        <span id="rate">Rate: <span id="rateValue"></span>x</span>
-        <span id="delay">Delay: <span id="delayValue"></span>s</span>
-        <span id="level">Buffer: <span id="levelValue"></span>%</span>
-        <span id="zoom">Zoom: <span id="zoomValue"></span>x</span>
+        <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>
+        <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
+        <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
       </div>
 <?php
 if ( $showPtzControls )
@@ -174,12 +174,12 @@ if ( canView( 'Events' ) )
         <table id="eventList" cellspacing="0">
           <thead>
             <tr>
-              <th class="colId"><?php echo $SLANG['Id'] ?></th>
-              <th class="colName"><?php echo $SLANG['Name'] ?></th>
-              <th class="colTime"><?php echo $SLANG['Time'] ?></th>
-              <th class="colSecs"><?php echo $SLANG['Secs'] ?></th>
-              <th class="colFrames"><?php echo $SLANG['Frames'] ?></th>
-              <th class="colScore"><?php echo $SLANG['Score'] ?></th>
+              <th class="colId"><?php echo translate('Id') ?></th>
+              <th class="colName"><?php echo translate('Name') ?></th>
+              <th class="colTime"><?php echo translate('Time') ?></th>
+              <th class="colSecs"><?php echo translate('Secs') ?></th>
+              <th class="colFrames"><?php echo translate('Frames') ?></th>
+              <th class="colScore"><?php echo translate('Score') ?></th>
               <th class="colDelete">&nbsp;</th>
             </tr>
           </thead>
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 121835913..69c0919e9 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -33,7 +33,7 @@ $hicolor = "0x00ff00"; // Green
 
 $presets = array();
 $presetNames = array();
-$presetNames[0] = $SLANG['ChoosePreset'];
+$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 )
 {
@@ -75,7 +75,7 @@ if ( !isset($newZone) )
     else
     {
         $zone = array(
-            'Name' => $SLANG['New'],
+            'Name' => translate('New'),
             'Id' => 0,
             'MonitorId' => $monitor['Id'],
             'NumCoords' => 4,
@@ -126,12 +126,12 @@ $zoneImage = ZM_DIR_IMAGES.'/Zones'.$monitor['Id'].'.jpg?'.time();
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, $SLANG['Zone'] );
+xhtmlHeaders(__FILE__, translate('Zone') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Monitor'] ?> <?php echo $monitor['Name'] ?> - <?php echo $SLANG['Zone'] ?> <?php echo $newZone['Name'] ?></h2>
+      <h2><?php echo translate('Monitor') ?> <?php echo $monitor['Name'] ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?></h2>
     </div>
     <div id="content">
       <form name="zoneForm" id="zoneForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -147,69 +147,69 @@ xhtmlHeaders(__FILE__, $SLANG['Zone'] );
           <table id="zoneSettings" cellspacing="0">
             <tbody>
               <tr>
-                <th scope="row"><?php echo $SLANG['Name'] ?></th>
+                <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 $SLANG['Type'] ?></th>
+                <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 $SLANG['Preset'] ?></th>
+                <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 $SLANG['Units'] ?></th>
+                <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 $SLANG['ZoneAlarmColour'] ?></th>
+                <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 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<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 $SLANG['CheckMethod'] ?></th>
+                <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 $SLANG['ZoneMinMaxPixelThres'] ?></th>
+                <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 $SLANG['ZoneFilterSize'] ?></th>
+                <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 $SLANG['ZoneArea'] ?></th>
+                <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 $SLANG['ZoneMinMaxAlarmArea'] ?></th>
+                <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 $SLANG['ZoneMinMaxFiltArea'] ?></th>
+                <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 $SLANG['ZoneMinMaxBlobArea'] ?></th>
+                <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 $SLANG['ZoneMinMaxBlobs'] ?></th>
+                <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 $SLANG['ZoneOverloadFrames'] ?></th>
+                <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 $SLANG['ZoneExtendAlarmFrames'] ?></th>
+                <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>
@@ -233,10 +233,10 @@ for ( $i = 0; $i < $pointCols; $i++ )
                   <table cellspacing="0">
                     <thead>
                       <tr>
-                        <th><?php echo $SLANG['Point'] ?></th>
-                        <th><?php echo $SLANG['X'] ?></th>
-                        <th><?php echo $SLANG['Y'] ?></th>
-                        <th><?php echo $SLANG['Action'] ?></th>
+                        <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>
@@ -269,7 +269,7 @@ for ( $i = 0; $i < $pointCols; $i++ )
               </tr>
             </tbody>
           </table>
-          <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
+          <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo translate('Save') ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index a8b0eea2d..9182dc98f 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -44,13 +44,13 @@ foreach( dbFetchAll( 'select * from Zones where MonitorId = ? order by Area desc
 
 $image = 'Zones'.$monitor['Id'].'.jpg';
 
-xhtmlHeaders(__FILE__, $SLANG['Zones'] );
+xhtmlHeaders(__FILE__, translate('Zones') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
-      <h2><?php echo $SLANG['Zones'] ?></h2>
+      <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo translate('Close') ?></a></div>
+      <h2><?php echo translate('Zones') ?></h2>
     </div>
     <div id="content">
       <map name="zoneMap" id="zoneMap">
@@ -72,10 +72,10 @@ foreach( array_reverse($zones) as $zone )
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
-              <th class="colName"><?php echo $SLANG['Name'] ?></th>
-              <th class="colType"><?php echo $SLANG['Type'] ?></th>
-              <th class="colUnits"><?php echo $SLANG['AreaUnits'] ?></th>
-              <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
+              <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>
@@ -95,8 +95,8 @@ foreach( $zones as $zone )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="button" value="<?php echo $SLANG['AddNewZone'] ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
-          <input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/>
+          <input type="button" value="<?php echo translate('AddNewZone') ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/mobile/includes/config.php b/web/skins/mobile/includes/config.php
index 956c36bcc..fc1eba9bb 100644
--- a/web/skins/mobile/includes/config.php
+++ b/web/skins/mobile/includes/config.php
@@ -27,7 +27,7 @@ $rates = array(
     "2000" => "20x",
     "500" => "5x",
     "200" => "2x",
-    "100" => $SLANG['Real'],
+    "100" => translate('Real'),
     "50" => "1/2x",
 );
 
@@ -36,7 +36,7 @@ $scales = array(
     "300" => "3x",
     "200" => "2x",
     "150" => "1.5x",
-    "100" => $SLANG['Actual'],
+    "100" => translate('Actual'),
     "75" => "3/4x",
     "50" => "1/2x",
     "33" => "1/3x",
diff --git a/web/skins/mobile/includes/control_functions.php b/web/skins/mobile/includes/control_functions.php
index 918c3ba23..3a12cf467 100644
--- a/web/skins/mobile/includes/control_functions.php
+++ b/web/skins/mobile/includes/control_functions.php
@@ -135,8 +135,6 @@ function getControlCommands( $monitor )
 
 function controlPresets( $monitor, $cmds )
 {
-    global $SLANG;
-
     define( "MAX_PRESETS", "10" );
 
     $sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";
diff --git a/web/skins/mobile/views/console.php b/web/skins/mobile/views/console.php
index 1c4fcb912..50b5f4775 100644
--- a/web/skins/mobile/views/console.php
+++ b/web/skins/mobile/views/console.php
@@ -40,7 +40,7 @@ $eventCounts = array(
 );
 
 $running = daemonCheck();
-$status = $running?$SLANG['Running']:$SLANG['Stopped'];
+$status = $running?translate('Running'):translate('Stopped');
 
 if ( $group = dbFetchOne( "select * from Groups where Name = 'Mobile'" ) )
     $groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
@@ -81,7 +81,7 @@ for ( $i = 0; $i < count($monitors); $i++ )
     $monitors[$i] = array_merge( $monitors[$i], $counts );
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Console'] );
+xhtmlHeaders( __FILE__, translate('Console') );
 ?>
 <body>
   <div id="page">
@@ -146,7 +146,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
 <?php
 if ( ZM_OPT_X10 ) {
 ?>
-          <td><?php echo makeLink( "?view=devices", $SLANG['Devices'], canView('Devices' ) ) ?></td>
+          <td><?php echo makeLink( "?view=devices", translate('Devices'), canView('Devices' ) ) ?></td>
 <?php
 } else {
 ?>
@@ -155,7 +155,7 @@ if ( ZM_OPT_X10 ) {
 }
 if ( $cycleCount > 1 ) {
 ?>
-          <td><?php echo makeLink( "?view=montage", $SLANG['Montage'], $running && canView( 'Stream' ) ) ?></td>
+          <td><?php echo makeLink( "?view=montage", translate('Montage'), $running && canView( 'Stream' ) ) ?></td>
 <?php
 } else {
 ?>
diff --git a/web/skins/mobile/views/devices.php b/web/skins/mobile/views/devices.php
index 08d2cd25c..add0a6bc5 100644
--- a/web/skins/mobile/views/devices.php
+++ b/web/skins/mobile/views/devices.php
@@ -32,12 +32,12 @@ foreach ( dbFetchAll( $sql ) as $row )
     $devices[] = $row;
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Devices'] );
+xhtmlHeaders( __FILE__, translate('Devices') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Devices'] ?></h2>
+      <h2><?php echo translate('Devices') ?></h2>
     </div>
     <div id="content">
       <table id="contentTable" class="major">
@@ -59,14 +59,14 @@ foreach( $devices as $device )
 ?>
         <tr>
           <th scope="row" class="<?php echo $fclass  ?>"><span class="<?php echo $fclass ?>"><?php echo substr( $device['Name'], 0, 16 ) ?></span></th>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", $SLANG['On'], canEdit('Devices') ) ?></td>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", $SLANG['Off'], canEdit('Devices') ) ?></td>
+          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", translate('On'), canEdit('Devices') ) ?></td>
+          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", translate('Off'), canEdit('Devices') ) ?></td>
         </tr>
 <?php
 }
 ?>
       </table>
-      <p><a href="?view=console"><?php echo $SLANG['Console'] ?></a></p>
+      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
     </div>
   </div>
 </body>
diff --git a/web/skins/mobile/views/error.php b/web/skins/mobile/views/error.php
index 00876b7a2..33e99f09a 100644
--- a/web/skins/mobile/views/error.php
+++ b/web/skins/mobile/views/error.php
@@ -18,16 +18,16 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-xhtmlHeaders( __FILE__, $SLANG['Error'] );
+xhtmlHeaders( __FILE__, translate('Error') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Error'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Error') ?></h1>
     </div>
     <div id="content">
-      <p><strong><?php echo $SLANG['YouNoPerms'] ?></p>
-      <p><?php echo $SLANG['ContactAdmin'] ?></p>
+      <p><strong><?php echo translate('YouNoPerms') ?></p>
+      <p><?php echo translate('ContactAdmin') ?></p>
     </div>
   </div>
 </body>
diff --git a/web/skins/mobile/views/event.php b/web/skins/mobile/views/event.php
index d79ba3de0..ead6b6eae 100644
--- a/web/skins/mobile/views/event.php
+++ b/web/skins/mobile/views/event.php
@@ -104,7 +104,7 @@ if ( !empty($_REQUEST['fid']) )
 
 $pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, '&amp;eid='.$_REQUEST['eid'].$filterQuery.$sortQuery, '&amp;' );
 
-xhtmlHeaders( __FILE__, $SLANG['Event'].' - '.$event['Name'] );
+xhtmlHeaders( __FILE__, translate('Event').' - '.$event['Name'] );
 ?>
 <body>
   <div id="page">
@@ -114,7 +114,7 @@ if ( canEdit( 'Events' ) )
 {
 ?>
       <div id="headerButtons">
-        <a href="?view=events&amp;action=delete&amp;mark_eid=<?php echo $_REQUEST['eid'] ?><?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $_REQUEST['limit'] ?>&amp;page=<?php echo $_REQUEST['page'] ?>"><?php echo $SLANG['Delete'] ?></a>
+        <a href="?view=events&amp;action=delete&amp;mark_eid=<?php echo $_REQUEST['eid'] ?><?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $_REQUEST['limit'] ?>&amp;page=<?php echo $_REQUEST['page'] ?>"><?php echo translate('Delete') ?></a>
       </div>
 <?php
 }
diff --git a/web/skins/mobile/views/eventdetails.php b/web/skins/mobile/views/eventdetails.php
index 345bc694f..deee5eef2 100644
--- a/web/skins/mobile/views/eventdetails.php
+++ b/web/skins/mobile/views/eventdetails.php
@@ -35,40 +35,40 @@ if ( $frame['Type'] == 'Alarm' )
 else
     $image2 = getImageSrc( $event, intval($event['Frames']/2), $scale );
 
-xhtmlHeaders( __FILE__, $SLANG['Event'].' - '.$_REQUEST['eid'] );
+xhtmlHeaders( __FILE__, translate('Event').' - '.$_REQUEST['eid'] );
 ?>
 <body>
   <div id="page">
     <div id="content">
       <table id="contentTable" class="major">
         <tr>
-          <th scope="row"><?php echo $SLANG['Name'] ?></th>
-          <td><?php echo htmlentities($event['Name']) ?><?php echo $event['Archived']?("(".$SLANG['Archived'].")"):"" ?></td>
+          <th scope="row"><?php echo translate('Name') ?></th>
+          <td><?php echo htmlentities($event['Name']) ?><?php echo $event['Archived']?("(".translate('Archived').")"):"" ?></td>
         </tr>
         <tr>
-          <th scope="row"><?php echo $SLANG['Time'] ?></th>
+          <th scope="row"><?php echo translate('Time') ?></th>
           <td><?php echo htmlentities(strftime("%b %d, %H:%M",strtotime($event['StartTime']))) ?></td>
         </tr>
         <tr>
-          <th scope="row"><?php echo $SLANG['Duration'] ?></th>
+          <th scope="row"><?php echo translate('Duration') ?></th>
           <td><?php echo htmlentities($event['Length']) ?>s</td>
         </tr>
         <tr>
-          <th scope="row"><?php echo $SLANG['Cause'] ?></th>
+          <th scope="row"><?php echo translate('Cause') ?></th>
           <td><?php echo htmlentities($event['Cause']) ?></td>
         </tr>
         <?php if ( !empty($event['Notes']) ) { ?>
         <tr>
-          <th scope="row"><?php echo $SLANG['Notes'] ?></th>
+          <th scope="row"><?php echo translate('Notes') ?></th>
           <td><?php echo htmlentities($event['Notes']) ?></td>
         </tr>
         <?php } ?>
         <tr>
-          <th scope="row"><?php echo $SLANG['Frames'] ?></th>
+          <th scope="row"><?php echo translate('Frames') ?></th>
           <td><?php echo $event['Frames'] ?> (<?php echo $event['AlarmFrames'] ?>)</td>
         </tr>
         <tr>
-          <th scope="row"><?php echo $SLANG['Score'] ?></th>
+          <th scope="row"><?php echo translate('Score') ?></th>
           <td><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></td>
         </tr>
       </table>
@@ -77,8 +77,8 @@ xhtmlHeaders( __FILE__, $SLANG['Event'].' - '.$_REQUEST['eid'] );
         <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $image2['thumbPath'] ) ?>" alt="<?php echo $frame['FrameId'] ?>"/></a>
       </div>
       <div id="contenButtons">
-        <a href="?view=event&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;page=1"><?php echo $SLANG['Frames'] ?></a>
-        <a href="?view=video&amp;eid=<?php echo $_REQUEST['eid'] ?>"><?php echo $SLANG['Video'] ?></a>
+        <a href="?view=event&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;page=1"><?php echo translate('Frames') ?></a>
+        <a href="?view=video&amp;eid=<?php echo $_REQUEST['eid'] ?>"><?php echo translate('Video') ?></a>
       </div>
     </div>
   </div>
diff --git a/web/skins/mobile/views/events.php b/web/skins/mobile/views/events.php
index 3bf25b1ed..40dd6eff8 100644
--- a/web/skins/mobile/views/events.php
+++ b/web/skins/mobile/views/events.php
@@ -104,12 +104,12 @@ $pages = (int)ceil($nEvents/$deviceLines);
 $maxShortcuts = 3;
 $pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, $filterQuery.$sortQuery.'&amp;limit='.$_REQUEST['limit'], '&amp;' );
 
-xhtmlHeaders( __FILE__, $SLANG['Events'] );
+xhtmlHeaders( __FILE__, translate('Events') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <div id="headerButtons"><?php echo makeLink( "?view=filter", empty($_REQUEST['filterName'])?$SLANG['ChooseFilter']:$_REQUEST['filterName'], canView( 'Events' ) ) ?></div>
+      <div id="headerButtons"><?php echo makeLink( "?view=filter", empty($_REQUEST['filterName'])?translate('ChooseFilter'):$_REQUEST['filterName'], canView( 'Events' ) ) ?></div>
       <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
     </div>
     <div id="content">
@@ -130,11 +130,11 @@ if ( $pagination )
         {
 ?>
         <tr>
-          <th class="colId"><a href="<?php echo sortHeader( 'Id', '&amp;' ) ?>"><?php echo substr( $SLANG['Id'], 0, 3 ) ?><?php echo sortTag( 'Id' ) ?></a></th>
-          <th class="colTime"><a href="<?php echo sortHeader( 'StartTime', '&amp;' ) ?>"><?php echo substr( $SLANG['Time'], 0, 3 ) ?><?php echo sortTag( 'StartTime' ) ?></a></th>
-          <th class="colDuration"><a href="<?php echo sortHeader( 'Length', '&amp;' ) ?>"><?php echo substr( $SLANG['Duration'], 0, 3 ) ?><?php echo sortTag( 'Length' ) ?></a></th>
-          <th class="colFrames"><a href="<?php echo sortHeader( 'Frames', '&amp;' ) ?>"><?php echo substr( $SLANG['Frames'], 0, 3 ) ?><?php echo sortTag( 'Frames' ) ?></a></th>
-          <th class="colScore"><a href="<?php echo sortHeader( 'TotScore', '&amp;' ) ?>"><?php echo substr( $SLANG['Score'], 0, 3 ) ?><?php echo sortTag( 'TotScore' ) ?></a></th>
+          <th class="colId"><a href="<?php echo sortHeader( 'Id', '&amp;' ) ?>"><?php echo substr( translate('Id'), 0, 3 ) ?><?php echo sortTag( 'Id' ) ?></a></th>
+          <th class="colTime"><a href="<?php echo sortHeader( 'StartTime', '&amp;' ) ?>"><?php echo substr( translate('Time'), 0, 3 ) ?><?php echo sortTag( 'StartTime' ) ?></a></th>
+          <th class="colDuration"><a href="<?php echo sortHeader( 'Length', '&amp;' ) ?>"><?php echo substr( translate('Duration'), 0, 3 ) ?><?php echo sortTag( 'Length' ) ?></a></th>
+          <th class="colFrames"><a href="<?php echo sortHeader( 'Frames', '&amp;' ) ?>"><?php echo substr( translate('Frames'), 0, 3 ) ?><?php echo sortTag( 'Frames' ) ?></a></th>
+          <th class="colScore"><a href="<?php echo sortHeader( 'TotScore', '&amp;' ) ?>"><?php echo substr( translate('Score'), 0, 3 ) ?><?php echo sortTag( 'TotScore' ) ?></a></th>
         </tr>
 <?php
         }
@@ -150,7 +150,7 @@ if ( $pagination )
     }
 ?>
       </table>
-      <p><a href="?view=console"><?php echo $SLANG['Console'] ?></a></p>
+      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
     </div>
   </div>
 </body>
diff --git a/web/skins/mobile/views/filter.php b/web/skins/mobile/views/filter.php
index 13deffcba..4613f3c3c 100644
--- a/web/skins/mobile/views/filter.php
+++ b/web/skins/mobile/views/filter.php
@@ -31,7 +31,7 @@ foreach( dbFetchAll( $sql ) as $row )
     $filterNames[$row['Name']] = $row['Name'];
 }
 
-xhtmlHeaders( __FILE__, $SLANG['EventFilter'] );
+xhtmlHeaders( __FILE__, translate('EventFilter') );
 ?>
 <body>
   <div id="page">
@@ -50,17 +50,17 @@ if ( count($filterNames) > 0 )
 {
 ?>
         <div>
-          <label for="filterName"><?php echo $SLANG['UseFilter'] ?></label><?php echo buildSelect( "filterName", $filterNames ); ?>
+          <label for="filterName"><?php echo translate('UseFilter') ?></label><?php echo buildSelect( "filterName", $filterNames ); ?>
         </div>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Submit'] ?>"/>
+          <input type="submit" value="<?php echo translate('Submit') ?>"/>
         </div>
 <?php
 }
 else
 {
 ?>
-        <p><?php echo $SLANG['NoSavedFilters'] ?></p>
+        <p><?php echo translate('NoSavedFilters') ?></p>
 <?php
 }
 ?>
diff --git a/web/skins/mobile/views/frame.php b/web/skins/mobile/views/frame.php
index 1ce591078..f9bb41633 100644
--- a/web/skins/mobile/views/frame.php
+++ b/web/skins/mobile/views/frame.php
@@ -47,12 +47,12 @@ $scale = getDeviceScale( $event['Width'], $event['Height'], 1.1 );
 
 $imageData = getImageSrc( $event, $frame, $scale, (isset($_REQUEST['show'])&&$_REQUEST['show']=="capt") );
 
-xhtmlHeaders( __FILE__, $SLANG['Frame'].' - '.$_REQUEST['eid'].'-'.$frame['FrameId'] );
+xhtmlHeaders( __FILE__, translate('Frame').' - '.$_REQUEST['eid'].'-'.$frame['FrameId'] );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['Frame'] ?> <?php echo $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
+      <h2><?php echo translate('Frame') ?> <?php echo $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
     </div>
     <div id="content">
       <?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
diff --git a/web/skins/mobile/views/function.php b/web/skins/mobile/views/function.php
index 3c06062c9..421d91063 100644
--- a/web/skins/mobile/views/function.php
+++ b/web/skins/mobile/views/function.php
@@ -25,7 +25,7 @@ if ( !canEdit( 'Monitors' ) )
 }
 $monitor = dbFetchMonitor( $_REQUEST['mid'] );
 
-xhtmlHeaders( __FILE__, $SLANG['Function'].' - '.$monitor['Name'] );
+xhtmlHeaders( __FILE__, translate('Function').' - '.$monitor['Name'] );
 ?>
 <body>
   <div id="page">
@@ -54,10 +54,10 @@ foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
           </select>
         </div>
         <div>
-          <label for="newEnabled"><?php echo $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
+          <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 } ?>/>
         </div>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Save'] ?>"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/mobile/views/login.php b/web/skins/mobile/views/login.php
index 4054432ba..6eb0b7db9 100644
--- a/web/skins/mobile/views/login.php
+++ b/web/skins/mobile/views/login.php
@@ -19,12 +19,12 @@
 //
 
 
-xhtmlHeaders( __FILE__, $SLANG['Login'] );
+xhtmlHeaders( __FILE__, translate('Login') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
+      <h1>ZoneMinder <?php echo translate('Login') ?></h1>
     </div>
     <div id="content">
       <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -36,16 +36,16 @@ xhtmlHeaders( __FILE__, $SLANG['Login'] );
         </div>
         <table id="contentTable" class="minor">
           <tr>
-            <th scope="row" class="colLeft"><?php echo $SLANG['Username'] ?></th>
+            <th scope="row" class="colLeft"><?php echo translate('Username') ?></th>
             <td class="colRight"><input type="text" name="username" value="<?php echo isset($username)?$username:"" ?>" size="12"/></td>
           </tr>
           <tr>
-            <th scope="row" class="colLeft"><?php echo $SLANG['Password'] ?></th>
+            <th scope="row" class="colLeft"><?php echo translate('Password') ?></th>
             <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
           </tr>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Login'] ?>"/>
+          <input type="submit" value="<?php echo translate('Login') ?>"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/mobile/views/montage.php b/web/skins/mobile/views/montage.php
index c15f2d3ab..347436a46 100644
--- a/web/skins/mobile/views/montage.php
+++ b/web/skins/mobile/views/montage.php
@@ -46,13 +46,13 @@ foreach( dbFetchAll( $sql ) as $row )
     $monitors[] = $row;
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Montage'] );
+xhtmlHeaders( __FILE__, translate('Montage') );
 ?>
 <body>
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>"><?php echo $SLANG['Refresh'] ?></a>
+        <a href="?view=<?php echo $_REQUEST['view'] ?>"><?php echo translate('Refresh') ?></a>
       </div>
     </div>
     <div id="content">
@@ -68,7 +68,7 @@ foreach( $monitors as $monitor )
 }
 ?>
       </div>
-      <div id="contentButtons"><a href="?view=console"><?php echo $SLANG['Console'] ?></a></div>
+      <div id="contentButtons"><a href="?view=console"><?php echo translate('Console') ?></a></div>
     </div>
   </div>
 </body>
diff --git a/web/skins/mobile/views/state.php b/web/skins/mobile/views/state.php
index dad01f4ca..51cf71624 100644
--- a/web/skins/mobile/views/state.php
+++ b/web/skins/mobile/views/state.php
@@ -27,12 +27,12 @@ $running = daemonCheck();
 
 $states = dbFetchAll( "select * from States" );
 
-xhtmlHeaders( __FILE__, $SLANG['State'] );
+xhtmlHeaders( __FILE__, translate('State') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo $SLANG['RunState'] ?></h2>
+      <h2><?php echo translate('RunState') ?></h2>
     </div>
     <div id="content">
       <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -47,14 +47,14 @@ xhtmlHeaders( __FILE__, $SLANG['State'] );
 if ( $running )
 {
 ?>
-          <option value="stop" selected="selected"><?php echo $SLANG['Stop'] ?></option>
-          <option value="restart"><?php echo $SLANG['Restart'] ?></option>
+          <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 $SLANG['Start'] ?></option>
+          <option value="start" selected="selected"><?php echo translate('Start') ?></option>
 <?php
 }
 ?>
@@ -68,7 +68,7 @@ foreach ( $states as $state )
 ?>
         </select>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
+          <input type="submit" value="<?php echo translate('Apply') ?>"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/mobile/views/video.php b/web/skins/mobile/views/video.php
index 6291b9972..8f7ac8654 100644
--- a/web/skins/mobile/views/video.php
+++ b/web/skins/mobile/views/video.php
@@ -105,7 +105,7 @@ if ( isset($_REQUEST['download']) )
     exit;
 }
 
-xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
+xhtmlHeaders( __FILE__, translate('Video').' - '.$event['Name'] );
 ?>
 <body>
   <div id="page">
@@ -120,19 +120,19 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
         </div>
         <table id="contentTable" class="minor">
           <tr>
-            <th scope="row"><?php echo $SLANG['VideoFormat'] ?></th>
+            <th scope="row"><?php echo translate('VideoFormat') ?></th>
             <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
           </tr>
           <tr>
-            <th scope="row"><?php echo $SLANG['FrameRate'] ?></th>
+            <th scope="row"><?php echo translate('FrameRate') ?></th>
             <td><?php echo buildSelect( "rate", $rates ) ?></td>
           </tr>
           <tr>
-            <th scope="row"><?php echo $SLANG['OverwriteExisting'] ?></th>
+            <th scope="row"><?php echo translate('OverwriteExisting') ?></th>
             <td><input type="checkbox" name="overwrite" value="1"<?php if ( isset($overwrite) ) { ?> checked="checked"<?php } ?>/></td>
           </tr>
         </table>
-        <div id="contentButtons"><input type="submit" value="<?php echo $SLANG['GenerateVideo'] ?>"/></div>
+        <div id="contentButtons"><input type="submit" value="<?php echo translate('GenerateVideo') ?>"/></div>
       </form>
 <?php
     if ( isset($videoFile) )
@@ -140,13 +140,13 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
         if ( $videoFile )
         {
 ?>
-      <p class="infoText"><?php echo $SLANG['VideoGenSucceeded'] ?></p>
+      <p class="infoText"><?php echo translate('VideoGenSucceeded') ?></p>
 <?php
         }
         else
         {
 ?>
-      <p class="errorText"><?php echo $SLANG['VideoGenFailed'] ?></p>
+      <p class="errorText"><?php echo translate('VideoGenFailed') ?></p>
 <?php
         }
     }
@@ -163,14 +163,14 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
     if ( count($videoFiles) )
     {
 ?>
-      <h3><?php echo $SLANG['VideoGenFiles'] ?></h3>
+      <h3><?php echo translate('VideoGenFiles') ?></h3>
       <table class="major">
         <tr>
-          <th><?php echo $SLANG['Format'] ?></th>
-          <th><?php echo $SLANG['Size'] ?></th>
-          <th><?php echo $SLANG['Rate'] ?></th>
-          <th><?php echo $SLANG['Scale'] ?></th>
-          <th><?php echo $SLANG['Action'] ?></th>
+          <th><?php echo translate('Format') ?></th>
+          <th><?php echo translate('Size') ?></th>
+          <th><?php echo translate('Rate') ?></th>
+          <th><?php echo translate('Scale') ?></th>
+          <th><?php echo translate('Action') ?></th>
         </tr>
 <?php
         if ( count($videoFiles) > 0 )
@@ -203,7 +203,7 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
           <td><?php echo filesize( $file ) ?></td>
           <td><?php echo $rateText ?></td>
           <td><?php echo $scaleText ?></td>
-          <td><a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;download=<?php echo $index ?>"><?php echo $SLANG['View'] ?></a>&nbsp;/&nbsp;<a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;delete=<?php echo $index ?>"><?php echo $SLANG['Delete'] ?></a></td>
+          <td><a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;download=<?php echo $index ?>"><?php echo translate('View') ?></a>&nbsp;/&nbsp;<a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;delete=<?php echo $index ?>"><?php echo translate('Delete') ?></a></td>
         </tr>
 <?php
                 $index++;
@@ -216,7 +216,7 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
     else
     {
 ?>
-      <p class="warnText"><?php echo $SLANG['VideoGenNoFiles'] ?></p>
+      <p class="warnText"><?php echo translate('VideoGenNoFiles') ?></p>
 <?php
     }
 ?>
diff --git a/web/skins/mobile/views/watch.php b/web/skins/mobile/views/watch.php
index 40849bd07..b61001db9 100644
--- a/web/skins/mobile/views/watch.php
+++ b/web/skins/mobile/views/watch.php
@@ -32,26 +32,26 @@ $showPtzControls = ( ZM_OPT_CONTROL && $monitor['Controllable'] && canView( 'Con
 $zmuCommand = getZmuCommand( " -m ".$_REQUEST['mid']." -s -f" );
 $zmuOutput = exec( escapeshellcmd( $zmuCommand ) );
 list( $status, $fps ) = explode( ' ', $zmuOutput );
-$statusString = $SLANG['Unknown'];
+$statusString = translate('Unknown');
 $fpsString = "--.--";
 $class = "infoText";
 if ( $status <= STATE_PREALARM )
 {
-    $statusString = $SLANG['Idle'];
+    $statusString = translate('Idle');
 }
 elseif ( $status == STATE_ALARM )
 {
-    $statusString = $SLANG['Alarm'];
+    $statusString = translate('Alarm');
     $class = "errorText";
 }
 elseif ( $status == STATE_ALERT )
 {
-    $statusString = $SLANG['Alert'];
+    $statusString = translate('Alert');
     $class = "warnText";
 }
 elseif ( $status == STATE_TAPE )
 {
-    $statusString = $SLANG['Record'];
+    $statusString = translate('Record');
 }
 $fpsString = sprintf( "%.2f", $fps );
 
@@ -99,7 +99,7 @@ else
     $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
 }
 
-xhtmlHeaders( __FILE__, $monitor['Name'].' - '.$SLANG['Watch'] );
+xhtmlHeaders( __FILE__, $monitor['Name'].' - '.translate('Watch') );
 ?>
 <body>
   <div id="page">
@@ -141,9 +141,9 @@ if ( $nextMid != $monitor['Id'] || $prevMid != $monitor['Id'] )
 {
 ?>
       <div id="contentButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $prevMid ?>"><?php echo $SLANG['Prev'] ?></a>
-        <a href="?view=console"><?php echo $SLANG['Console'] ?></a>
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $nextMid ?>"><?php echo $SLANG['Next'] ?></a>
+        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $prevMid ?>"><?php echo translate('Prev') ?></a>
+        <a href="?view=console"><?php echo translate('Console') ?></a>
+        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $nextMid ?>"><?php echo translate('Next') ?></a>
       </div>
 <?php
 }
diff --git a/web/skins/xml/includes/config.php b/web/skins/xml/includes/config.php
index 538938df2..66d3af5ee 100644
--- a/web/skins/xml/includes/config.php
+++ b/web/skins/xml/includes/config.php
@@ -56,7 +56,7 @@ $rates = array(
     "1000" => "10x",
     "400" => "4x",
     "200" => "2x",
-    "100" => $SLANG['Real'],
+    "100" => translate('Real'),
     "50" => "1/2x",
     "25" => "1/4x",
 );
@@ -66,7 +66,7 @@ $scales = array(
     "300" => "3x",
     "200" => "2x",
     "150" => "1.5x",
-    "100" => $SLANG['Actual'],
+    "100" => translate('Actual'),
     "75" => "3/4x",
     "50" => "1/2x",
     "33" => "1/3x",
@@ -74,9 +74,9 @@ $scales = array(
 );
 
 $bwArray = array(
-    "high" => $SLANG['High'],
-    "medium" => $SLANG['Medium'],
-    "low" => $SLANG['Low']
+    "high" => translate('High'),
+    "medium" => translate('Medium'),
+    "low" => translate('Low')
 );
 
 /* Check if ZM_WEB_L_CAN_STREAM and ZM_WEB_L_STREAM_METHOD are defined */
diff --git a/web/skins/xml/views/console.php b/web/skins/xml/views/console.php
index 86cf78768..b512bc13a 100644
--- a/web/skins/xml/views/console.php
+++ b/web/skins/xml/views/console.php
@@ -28,14 +28,14 @@
  */
 $eventCounts = array(
     array(
-        "title" => $SLANG['Events'],
+        "title" => translate('Events'),
         "filter" => array(
             "terms" => array(
             )
         ),
     ),
     array(
-        "title" => $SLANG['Hour'],
+        "title" => translate('Hour'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "0" ),
@@ -44,7 +44,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Day'],
+        "title" => translate('Day'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "0" ),
@@ -53,7 +53,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Week'],
+        "title" => translate('Week'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "0" ),
@@ -62,7 +62,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Month'],
+        "title" => translate('Month'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "0" ),
@@ -71,7 +71,7 @@ $eventCounts = array(
         ),
     ),
     array(
-        "title" => $SLANG['Archived'],
+        "title" => translate('Archived'),
         "filter" => array(
             "terms" => array(
                 array( "attr" => "Archived", "op" => "=", "val" => "1" ),
@@ -81,7 +81,7 @@ $eventCounts = array(
 );
 
 $running = daemonCheck();
-$status = $running?$SLANG['Running']:$SLANG['Stopped'];
+$status = $running?translate('Running'):translate('Stopped');
 
 if ( $group = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array(empty($_COOKIE['zmGroup'])?0:$_COOKIE['zmGroup']) ) ) 
     $groupIds = array_flip(split( ',', $group['MonitorIds'] ));
diff --git a/web/tools/mootools/Makefile.am b/web/tools/mootools/Makefile.am
index 958647796..89b17ab8d 100644
--- a/web/tools/mootools/Makefile.am
+++ b/web/tools/mootools/Makefile.am
@@ -3,16 +3,14 @@ AUTOMAKE_OPTIONS = gnu
 webdir = @WEB_PREFIX@/tools/mootools
 
 dist_web_DATA = \
-	mootools-core-1.3.2-nc.js \
-	mootools-core-1.3.2-yc.js \
-	mootools-more-1.3.2.1-nc.js \
-	mootools-more-1.3.2.1-yc.js
+	mootools-core-1.4.5-compat.js \
+	mootools-more-1.5.1.js
 
 # Yes, you are correct. This is a HACK!
 install-data-hook:
 	( cd $(DESTDIR)$(webdir); rm -f mootools-core.js mootools-more.js )
-	( cd $(DESTDIR)$(webdir); ln -s mootools-core-1.3.2-yc.js mootools-core.js )
-	( cd $(DESTDIR)$(webdir); ln -s mootools-more-1.3.2.1-yc.js mootools-more.js )
+	( cd $(DESTDIR)$(webdir); ln -sf mootools-core-1.4.5-compat.js mootools-core.js )
+	( cd $(DESTDIR)$(webdir); ln -sf mootools-more-1.5.1.js mootools-more.js )
 
 uninstall-hook:
 	@-( cd $(DESTDIR)$(webdir); rm -f mootools-* )
diff --git a/web/tools/mootools/mootools-core-1.3.2-yc.js b/web/tools/mootools/mootools-core-1.3.2-yc.js
deleted file mode 100644
index 71a263b81..000000000
--- a/web/tools/mootools/mootools-core-1.3.2-yc.js
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
----
-MooTools: the javascript framework
-
-web build:
- - http://mootools.net/core/7c56cfef9dddcf170a5d68e3fb61cfd7
-
-packager build:
- - packager build Core/Core Core/Array Core/String Core/Number Core/Function Core/Object Core/Event Core/Browser Core/Class Core/Class.Extras Core/Slick.Parser Core/Slick.Finder Core/Element Core/Element.Style Core/Element.Event Core/Element.Dimensions Core/Fx Core/Fx.CSS Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request Core/Request.HTML Core/Request.JSON Core/Cookie Core/JSON Core/DOMReady Core/Swiff
-
-copyrights:
-  - [MooTools](http://mootools.net)
-
-licenses:
-  - [MIT License](http://mootools.net/license.txt)
-...
-*/
-(function(){this.MooTools={version:"1.3.2",build:"c9f1ff10e9e7facb65e9481049ed1b450959d587"};var o=this.typeOf=function(i){if(i==null){return"null";}if(i.$family){return i.$family();
-}if(i.nodeName){if(i.nodeType==1){return"element";}if(i.nodeType==3){return(/\S/).test(i.nodeValue)?"textnode":"whitespace";}}else{if(typeof i.length=="number"){if(i.callee){return"arguments";
-}if("item" in i){return"collection";}}}return typeof i;};var j=this.instanceOf=function(t,i){if(t==null){return false;}var s=t.$constructor||t.constructor;
-while(s){if(s===i){return true;}s=s.parent;}return t instanceof i;};var f=this.Function;var p=true;for(var k in {toString:1}){p=null;}if(p){p=["hasOwnProperty","valueOf","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","constructor"];
-}f.prototype.overloadSetter=function(s){var i=this;return function(u,t){if(u==null){return this;}if(s||typeof u!="string"){for(var v in u){i.call(this,v,u[v]);
-}if(p){for(var w=p.length;w--;){v=p[w];if(u.hasOwnProperty(v)){i.call(this,v,u[v]);}}}}else{i.call(this,u,t);}return this;};};f.prototype.overloadGetter=function(s){var i=this;
-return function(u){var v,t;if(s||typeof u!="string"){v=u;}else{if(arguments.length>1){v=arguments;}}if(v){t={};for(var w=0;w<v.length;w++){t[v[w]]=i.call(this,v[w]);
-}}else{t=i.call(this,u);}return t;};};f.prototype.extend=function(i,s){this[i]=s;}.overloadSetter();f.prototype.implement=function(i,s){this.prototype[i]=s;
-}.overloadSetter();var n=Array.prototype.slice;f.from=function(i){return(o(i)=="function")?i:function(){return i;};};Array.from=function(i){if(i==null){return[];
-}return(a.isEnumerable(i)&&typeof i!="string")?(o(i)=="array")?i:n.call(i):[i];};Number.from=function(s){var i=parseFloat(s);return isFinite(i)?i:null;
-};String.from=function(i){return i+"";};f.implement({hide:function(){this.$hidden=true;return this;},protect:function(){this.$protected=true;return this;
-}});var a=this.Type=function(u,t){if(u){var s=u.toLowerCase();var i=function(v){return(o(v)==s);};a["is"+u]=i;if(t!=null){t.prototype.$family=(function(){return s;
-}).hide();}}if(t==null){return null;}t.extend(this);t.$constructor=a;t.prototype.$constructor=t;return t;};var e=Object.prototype.toString;a.isEnumerable=function(i){return(i!=null&&typeof i.length=="number"&&e.call(i)!="[object Function]");
-};var q={};var r=function(i){var s=o(i.prototype);return q[s]||(q[s]=[]);};var b=function(t,x){if(x&&x.$hidden){return;}var s=r(this);for(var u=0;u<s.length;
-u++){var w=s[u];if(o(w)=="type"){b.call(w,t,x);}else{w.call(this,t,x);}}var v=this.prototype[t];if(v==null||!v.$protected){this.prototype[t]=x;}if(this[t]==null&&o(x)=="function"){m.call(this,t,function(i){return x.apply(i,n.call(arguments,1));
-});}};var m=function(i,t){if(t&&t.$hidden){return;}var s=this[i];if(s==null||!s.$protected){this[i]=t;}};a.implement({implement:b.overloadSetter(),extend:m.overloadSetter(),alias:function(i,s){b.call(this,i,this.prototype[s]);
-}.overloadSetter(),mirror:function(i){r(this).push(i);return this;}});new a("Type",a);var d=function(s,w,u){var t=(w!=Object),A=w.prototype;if(t){w=new a(s,w);
-}for(var x=0,v=u.length;x<v;x++){var B=u[x],z=w[B],y=A[B];if(z){z.protect();}if(t&&y){delete A[B];A[B]=y.protect();}}if(t){w.implement(A);}return d;};d("String",String,["charAt","charCodeAt","concat","indexOf","lastIndexOf","match","quote","replace","search","slice","split","substr","substring","toLowerCase","toUpperCase"])("Array",Array,["pop","push","reverse","shift","sort","splice","unshift","concat","join","slice","indexOf","lastIndexOf","filter","forEach","every","map","some","reduce","reduceRight"])("Number",Number,["toExponential","toFixed","toLocaleString","toPrecision"])("Function",f,["apply","call","bind"])("RegExp",RegExp,["exec","test"])("Object",Object,["create","defineProperty","defineProperties","keys","getPrototypeOf","getOwnPropertyDescriptor","getOwnPropertyNames","preventExtensions","isExtensible","seal","isSealed","freeze","isFrozen"])("Date",Date,["now"]);
-Object.extend=m.overloadSetter();Date.extend("now",function(){return +(new Date);});new a("Boolean",Boolean);Number.prototype.$family=function(){return isFinite(this)?"number":"null";
-}.hide();Number.extend("random",function(s,i){return Math.floor(Math.random()*(i-s+1)+s);});var g=Object.prototype.hasOwnProperty;Object.extend("forEach",function(i,t,u){for(var s in i){if(g.call(i,s)){t.call(u,i[s],s,i);
-}}});Object.each=Object.forEach;Array.implement({forEach:function(u,v){for(var t=0,s=this.length;t<s;t++){if(t in this){u.call(v,this[t],t,this);}}},each:function(i,s){Array.forEach(this,i,s);
-return this;}});var l=function(i){switch(o(i)){case"array":return i.clone();case"object":return Object.clone(i);default:return i;}};Array.implement("clone",function(){var s=this.length,t=new Array(s);
-while(s--){t[s]=l(this[s]);}return t;});var h=function(s,i,t){switch(o(t)){case"object":if(o(s[i])=="object"){Object.merge(s[i],t);}else{s[i]=Object.clone(t);
-}break;case"array":s[i]=t.clone();break;default:s[i]=t;}return s;};Object.extend({merge:function(z,u,t){if(o(u)=="string"){return h(z,u,t);}for(var y=1,s=arguments.length;
-y<s;y++){var w=arguments[y];for(var x in w){h(z,x,w[x]);}}return z;},clone:function(i){var t={};for(var s in i){t[s]=l(i[s]);}return t;},append:function(w){for(var v=1,t=arguments.length;
-v<t;v++){var s=arguments[v]||{};for(var u in s){w[u]=s[u];}}return w;}});["Object","WhiteSpace","TextNode","Collection","Arguments"].each(function(i){new a(i);
-});var c=Date.now();String.extend("uniqueID",function(){return(c++).toString(36);});})();Array.implement({every:function(c,d){for(var b=0,a=this.length;
-b<a;b++){if((b in this)&&!c.call(d,this[b],b,this)){return false;}}return true;},filter:function(d,e){var c=[];for(var b=0,a=this.length;b<a;b++){if((b in this)&&d.call(e,this[b],b,this)){c.push(this[b]);
-}}return c;},indexOf:function(c,d){var a=this.length;for(var b=(d<0)?Math.max(0,a+d):d||0;b<a;b++){if(this[b]===c){return b;}}return -1;},map:function(d,e){var c=[];
-for(var b=0,a=this.length;b<a;b++){if(b in this){c[b]=d.call(e,this[b],b,this);}}return c;},some:function(c,d){for(var b=0,a=this.length;b<a;b++){if((b in this)&&c.call(d,this[b],b,this)){return true;
-}}return false;},clean:function(){return this.filter(function(a){return a!=null;});},invoke:function(a){var b=Array.slice(arguments,1);return this.map(function(c){return c[a].apply(c,b);
-});},associate:function(c){var d={},b=Math.min(this.length,c.length);for(var a=0;a<b;a++){d[c[a]]=this[a];}return d;},link:function(c){var a={};for(var e=0,b=this.length;
-e<b;e++){for(var d in c){if(c[d](this[e])){a[d]=this[e];delete c[d];break;}}}return a;},contains:function(a,b){return this.indexOf(a,b)!=-1;},append:function(a){this.push.apply(this,a);
-return this;},getLast:function(){return(this.length)?this[this.length-1]:null;},getRandom:function(){return(this.length)?this[Number.random(0,this.length-1)]:null;
-},include:function(a){if(!this.contains(a)){this.push(a);}return this;},combine:function(c){for(var b=0,a=c.length;b<a;b++){this.include(c[b]);}return this;
-},erase:function(b){for(var a=this.length;a--;){if(this[a]===b){this.splice(a,1);}}return this;},empty:function(){this.length=0;return this;},flatten:function(){var d=[];
-for(var b=0,a=this.length;b<a;b++){var c=typeOf(this[b]);if(c=="null"){continue;}d=d.concat((c=="array"||c=="collection"||c=="arguments"||instanceOf(this[b],Array))?Array.flatten(this[b]):this[b]);
-}return d;},pick:function(){for(var b=0,a=this.length;b<a;b++){if(this[b]!=null){return this[b];}}return null;},hexToRgb:function(b){if(this.length!=3){return null;
-}var a=this.map(function(c){if(c.length==1){c+=c;}return c.toInt(16);});return(b)?a:"rgb("+a+")";},rgbToHex:function(d){if(this.length<3){return null;}if(this.length==4&&this[3]==0&&!d){return"transparent";
-}var b=[];for(var a=0;a<3;a++){var c=(this[a]-0).toString(16);b.push((c.length==1)?"0"+c:c);}return(d)?b:"#"+b.join("");}});String.implement({test:function(a,b){return((typeOf(a)=="regexp")?a:new RegExp(""+a,b)).test(this);
-},contains:function(a,b){return(b)?(b+this+b).indexOf(b+a+b)>-1:this.indexOf(a)>-1;},trim:function(){return this.replace(/^\s+|\s+$/g,"");},clean:function(){return this.replace(/\s+/g," ").trim();
-},camelCase:function(){return this.replace(/-\D/g,function(a){return a.charAt(1).toUpperCase();});},hyphenate:function(){return this.replace(/[A-Z]/g,function(a){return("-"+a.charAt(0).toLowerCase());
-});},capitalize:function(){return this.replace(/\b[a-z]/g,function(a){return a.toUpperCase();});},escapeRegExp:function(){return this.replace(/([-.*+?^${}()|[\]\/\\])/g,"\\$1");
-},toInt:function(a){return parseInt(this,a||10);},toFloat:function(){return parseFloat(this);},hexToRgb:function(b){var a=this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
-return(a)?a.slice(1).hexToRgb(b):null;},rgbToHex:function(b){var a=this.match(/\d{1,3}/g);return(a)?a.rgbToHex(b):null;},substitute:function(a,b){return this.replace(b||(/\\?\{([^{}]+)\}/g),function(d,c){if(d.charAt(0)=="\\"){return d.slice(1);
-}return(a[c]!=null)?a[c]:"";});}});Number.implement({limit:function(b,a){return Math.min(a,Math.max(b,this));},round:function(a){a=Math.pow(10,a||0).toFixed(a<0?-a:0);
-return Math.round(this*a)/a;},times:function(b,c){for(var a=0;a<this;a++){b.call(c,a,this);}},toFloat:function(){return parseFloat(this);},toInt:function(a){return parseInt(this,a||10);
-}});Number.alias("each","times");(function(b){var a={};b.each(function(c){if(!Number[c]){a[c]=function(){return Math[c].apply(null,[this].concat(Array.from(arguments)));
-};}});Number.implement(a);})(["abs","acos","asin","atan","atan2","ceil","cos","exp","floor","log","max","min","pow","sin","sqrt","tan"]);Function.extend({attempt:function(){for(var b=0,a=arguments.length;
-b<a;b++){try{return arguments[b]();}catch(c){}}return null;}});Function.implement({attempt:function(a,c){try{return this.apply(c,Array.from(a));}catch(b){}return null;
-},bind:function(c){var a=this,b=(arguments.length>1)?Array.slice(arguments,1):null;return function(){if(!b&&!arguments.length){return a.call(c);}if(b&&arguments.length){return a.apply(c,b.concat(Array.from(arguments)));
-}return a.apply(c,b||arguments);};},pass:function(b,c){var a=this;if(b!=null){b=Array.from(b);}return function(){return a.apply(c,b||arguments);};},delay:function(b,c,a){return setTimeout(this.pass((a==null?[]:a),c),b);
-},periodical:function(c,b,a){return setInterval(this.pass((a==null?[]:a),b),c);}});(function(){var a=Object.prototype.hasOwnProperty;Object.extend({subset:function(d,g){var f={};
-for(var e=0,b=g.length;e<b;e++){var c=g[e];if(c in d){f[c]=d[c];}}return f;},map:function(b,e,f){var d={};for(var c in b){if(a.call(b,c)){d[c]=e.call(f,b[c],c,b);
-}}return d;},filter:function(b,e,g){var d={};for(var c in b){var f=b[c];if(a.call(b,c)&&e.call(g,f,c,b)){d[c]=f;}}return d;},every:function(b,d,e){for(var c in b){if(a.call(b,c)&&!d.call(e,b[c],c)){return false;
-}}return true;},some:function(b,d,e){for(var c in b){if(a.call(b,c)&&d.call(e,b[c],c)){return true;}}return false;},keys:function(b){var d=[];for(var c in b){if(a.call(b,c)){d.push(c);
-}}return d;},values:function(c){var b=[];for(var d in c){if(a.call(c,d)){b.push(c[d]);}}return b;},getLength:function(b){return Object.keys(b).length;},keyOf:function(b,d){for(var c in b){if(a.call(b,c)&&b[c]===d){return c;
-}}return null;},contains:function(b,c){return Object.keyOf(b,c)!=null;},toQueryString:function(b,c){var d=[];Object.each(b,function(h,g){if(c){g=c+"["+g+"]";
-}var f;switch(typeOf(h)){case"object":f=Object.toQueryString(h,g);break;case"array":var e={};h.each(function(k,j){e[j]=k;});f=Object.toQueryString(e,g);
-break;default:f=g+"="+encodeURIComponent(h);}if(h!=null){d.push(f);}});return d.join("&");}});})();(function(){var k=this.document;var i=k.window=this;
-var b=1;this.$uid=(i.ActiveXObject)?function(e){return(e.uid||(e.uid=[b++]))[0];}:function(e){return e.uid||(e.uid=b++);};$uid(i);$uid(k);var a=navigator.userAgent.toLowerCase(),c=navigator.platform.toLowerCase(),j=a.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/)||[null,"unknown",0],f=j[1]=="ie"&&k.documentMode;
-var o=this.Browser={extend:Function.prototype.extend,name:(j[1]=="version")?j[3]:j[1],version:f||parseFloat((j[1]=="opera"&&j[4])?j[4]:j[2]),Platform:{name:a.match(/ip(?:ad|od|hone)/)?"ios":(a.match(/(?:webos|android)/)||c.match(/mac|win|linux/)||["other"])[0]},Features:{xpath:!!(k.evaluate),air:!!(i.runtime),query:!!(k.querySelector),json:!!(i.JSON)},Plugins:{}};
-o[o.name]=true;o[o.name+parseInt(o.version,10)]=true;o.Platform[o.Platform.name]=true;o.Request=(function(){var q=function(){return new XMLHttpRequest();
-};var p=function(){return new ActiveXObject("MSXML2.XMLHTTP");};var e=function(){return new ActiveXObject("Microsoft.XMLHTTP");};return Function.attempt(function(){q();
-return q;},function(){p();return p;},function(){e();return e;});})();o.Features.xhr=!!(o.Request);var h=(Function.attempt(function(){return navigator.plugins["Shockwave Flash"].description;
-},function(){return new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version");})||"0 r0").match(/\d+/g);o.Plugins.Flash={version:Number(h[0]||"0."+h[1])||0,build:Number(h[2])||0};
-o.exec=function(p){if(!p){return p;}if(i.execScript){i.execScript(p);}else{var e=k.createElement("script");e.setAttribute("type","text/javascript");e.text=p;
-k.head.appendChild(e);k.head.removeChild(e);}return p;};String.implement("stripScripts",function(p){var e="";var q=this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi,function(r,s){e+=s+"\n";
-return"";});if(p===true){o.exec(e);}else{if(typeOf(p)=="function"){p(e,q);}}return q;});o.extend({Document:this.Document,Window:this.Window,Element:this.Element,Event:this.Event});
-this.Window=this.$constructor=new Type("Window",function(){});this.$family=Function.from("window").hide();Window.mirror(function(e,p){i[e]=p;});this.Document=k.$constructor=new Type("Document",function(){});
-k.$family=Function.from("document").hide();Document.mirror(function(e,p){k[e]=p;});k.html=k.documentElement;if(!k.head){k.head=k.getElementsByTagName("head")[0];
-}if(k.execCommand){try{k.execCommand("BackgroundImageCache",false,true);}catch(g){}}if(this.attachEvent&&!this.addEventListener){var d=function(){this.detachEvent("onunload",d);
-k.head=k.html=k.window=null;};this.attachEvent("onunload",d);}var m=Array.from;try{m(k.html.childNodes);}catch(g){Array.from=function(p){if(typeof p!="string"&&Type.isEnumerable(p)&&typeOf(p)!="array"){var e=p.length,q=new Array(e);
-while(e--){q[e]=p[e];}return q;}return m(p);};var l=Array.prototype,n=l.slice;["pop","push","reverse","shift","sort","splice","unshift","concat","join","slice"].each(function(e){var p=l[e];
-Array[e]=function(q){return p.apply(Array.from(q),n.call(arguments,1));};});}})();var Event=new Type("Event",function(a,i){if(!i){i=window;}var o=i.document;
-a=a||i.event;if(a.$extended){return a;}this.$extended=true;var n=a.type,k=a.target||a.srcElement,m={},c={},q=null,h,l,b,p;while(k&&k.nodeType==3){k=k.parentNode;
-}if(n.indexOf("key")!=-1){b=a.which||a.keyCode;p=Object.keyOf(Event.Keys,b);if(n=="keydown"){var d=b-111;if(d>0&&d<13){p="f"+d;}}if(!p){p=String.fromCharCode(b).toLowerCase();
-}}else{if((/click|mouse|menu/i).test(n)){o=(!o.compatMode||o.compatMode=="CSS1Compat")?o.html:o.body;m={x:(a.pageX!=null)?a.pageX:a.clientX+o.scrollLeft,y:(a.pageY!=null)?a.pageY:a.clientY+o.scrollTop};
-c={x:(a.pageX!=null)?a.pageX-i.pageXOffset:a.clientX,y:(a.pageY!=null)?a.pageY-i.pageYOffset:a.clientY};if((/DOMMouseScroll|mousewheel/).test(n)){l=(a.wheelDelta)?a.wheelDelta/120:-(a.detail||0)/3;
-}h=(a.which==3)||(a.button==2);if((/over|out/).test(n)){q=a.relatedTarget||a[(n=="mouseover"?"from":"to")+"Element"];var j=function(){while(q&&q.nodeType==3){q=q.parentNode;
-}return true;};var g=(Browser.firefox2)?j.attempt():j();q=(g)?q:null;}}else{if((/gesture|touch/i).test(n)){this.rotation=a.rotation;this.scale=a.scale;
-this.targetTouches=a.targetTouches;this.changedTouches=a.changedTouches;var f=this.touches=a.touches;if(f&&f[0]){var e=f[0];m={x:e.pageX,y:e.pageY};c={x:e.clientX,y:e.clientY};
-}}}}return Object.append(this,{event:a,type:n,page:m,client:c,rightClick:h,wheel:l,relatedTarget:document.id(q),target:document.id(k),code:b,key:p,shift:a.shiftKey,control:a.ctrlKey,alt:a.altKey,meta:a.metaKey});
-});Event.Keys={enter:13,up:38,down:40,left:37,right:39,esc:27,space:32,backspace:8,tab:9,"delete":46};Event.implement({stop:function(){return this.stopPropagation().preventDefault();
-},stopPropagation:function(){if(this.event.stopPropagation){this.event.stopPropagation();}else{this.event.cancelBubble=true;}return this;},preventDefault:function(){if(this.event.preventDefault){this.event.preventDefault();
-}else{this.event.returnValue=false;}return this;}});(function(){var a=this.Class=new Type("Class",function(h){if(instanceOf(h,Function)){h={initialize:h};
-}var g=function(){e(this);if(g.$prototyping){return this;}this.$caller=null;var i=(this.initialize)?this.initialize.apply(this,arguments):this;this.$caller=this.caller=null;
-return i;}.extend(this).implement(h);g.$constructor=a;g.prototype.$constructor=g;g.prototype.parent=c;return g;});var c=function(){if(!this.$caller){throw new Error('The method "parent" cannot be called.');
-}var g=this.$caller.$name,h=this.$caller.$owner.parent,i=(h)?h.prototype[g]:null;if(!i){throw new Error('The method "'+g+'" has no parent.');}return i.apply(this,arguments);
-};var e=function(g){for(var h in g){var j=g[h];switch(typeOf(j)){case"object":var i=function(){};i.prototype=j;g[h]=e(new i);break;case"array":g[h]=j.clone();
-break;}}return g;};var b=function(g,h,j){if(j.$origin){j=j.$origin;}var i=function(){if(j.$protected&&this.$caller==null){throw new Error('The method "'+h+'" cannot be called.');
-}var l=this.caller,m=this.$caller;this.caller=m;this.$caller=i;var k=j.apply(this,arguments);this.$caller=m;this.caller=l;return k;}.extend({$owner:g,$origin:j,$name:h});
-return i;};var f=function(h,i,g){if(a.Mutators.hasOwnProperty(h)){i=a.Mutators[h].call(this,i);if(i==null){return this;}}if(typeOf(i)=="function"){if(i.$hidden){return this;
-}this.prototype[h]=(g)?i:b(this,h,i);}else{Object.merge(this.prototype,h,i);}return this;};var d=function(g){g.$prototyping=true;var h=new g;delete g.$prototyping;
-return h;};a.implement("implement",f.overloadSetter());a.Mutators={Extends:function(g){this.parent=g;this.prototype=d(g);},Implements:function(g){Array.from(g).each(function(j){var h=new j;
-for(var i in h){f.call(this,i,h[i],true);}},this);}};})();(function(){this.Chain=new Class({$chain:[],chain:function(){this.$chain.append(Array.flatten(arguments));
-return this;},callChain:function(){return(this.$chain.length)?this.$chain.shift().apply(this,arguments):false;},clearChain:function(){this.$chain.empty();
-return this;}});var a=function(b){return b.replace(/^on([A-Z])/,function(c,d){return d.toLowerCase();});};this.Events=new Class({$events:{},addEvent:function(d,c,b){d=a(d);
-this.$events[d]=(this.$events[d]||[]).include(c);if(b){c.internal=true;}return this;},addEvents:function(b){for(var c in b){this.addEvent(c,b[c]);}return this;
-},fireEvent:function(e,c,b){e=a(e);var d=this.$events[e];if(!d){return this;}c=Array.from(c);d.each(function(f){if(b){f.delay(b,this,c);}else{f.apply(this,c);
-}},this);return this;},removeEvent:function(e,d){e=a(e);var c=this.$events[e];if(c&&!d.internal){var b=c.indexOf(d);if(b!=-1){delete c[b];}}return this;
-},removeEvents:function(d){var e;if(typeOf(d)=="object"){for(e in d){this.removeEvent(e,d[e]);}return this;}if(d){d=a(d);}for(e in this.$events){if(d&&d!=e){continue;
-}var c=this.$events[e];for(var b=c.length;b--;){if(b in c){this.removeEvent(e,c[b]);}}}return this;}});this.Options=new Class({setOptions:function(){var b=this.options=Object.merge.apply(null,[{},this.options].append(arguments));
-if(this.addEvent){for(var c in b){if(typeOf(b[c])!="function"||!(/^on[A-Z]/).test(c)){continue;}this.addEvent(c,b[c]);delete b[c];}}return this;}});})();
-(function(){var k,n,l,g,a={},c={},m=/\\/g;var e=function(q,p){if(q==null){return null;}if(q.Slick===true){return q;}q=(""+q).replace(/^\s+|\s+$/g,"");g=!!p;
-var o=(g)?c:a;if(o[q]){return o[q];}k={Slick:true,expressions:[],raw:q,reverse:function(){return e(this.raw,true);}};n=-1;while(q!=(q=q.replace(j,b))){}k.length=k.expressions.length;
-return o[k.raw]=(g)?h(k):k;};var i=function(o){if(o==="!"){return" ";}else{if(o===" "){return"!";}else{if((/^!/).test(o)){return o.replace(/^!/,"");}else{return"!"+o;
-}}}};var h=function(u){var r=u.expressions;for(var p=0;p<r.length;p++){var t=r[p];var q={parts:[],tag:"*",combinator:i(t[0].combinator)};for(var o=0;o<t.length;
-o++){var s=t[o];if(!s.reverseCombinator){s.reverseCombinator=" ";}s.combinator=s.reverseCombinator;delete s.reverseCombinator;}t.reverse().push(q);}return u;
-};var f=function(o){return o.replace(/[-[\]{}()*+?.\\^$|,#\s]/g,function(p){return"\\"+p;});};var j=new RegExp("^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)".replace(/<combinator>/,"["+f(">+~`!@$%^&={}\\;</")+"]").replace(/<unicode>/g,"(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])").replace(/<unicode1>/g,"(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])"));
-function b(x,s,D,z,r,C,q,B,A,y,u,F,G,v,p,w){if(s||n===-1){k.expressions[++n]=[];l=-1;if(s){return"";}}if(D||z||l===-1){D=D||" ";var t=k.expressions[n];
-if(g&&t[l]){t[l].reverseCombinator=i(D);}t[++l]={combinator:D,tag:"*"};}var o=k.expressions[n][l];if(r){o.tag=r.replace(m,"");}else{if(C){o.id=C.replace(m,"");
-}else{if(q){q=q.replace(m,"");if(!o.classList){o.classList=[];}if(!o.classes){o.classes=[];}o.classList.push(q);o.classes.push({value:q,regexp:new RegExp("(^|\\s)"+f(q)+"(\\s|$)")});
-}else{if(G){w=w||p;w=w?w.replace(m,""):null;if(!o.pseudos){o.pseudos=[];}o.pseudos.push({key:G.replace(m,""),value:w,type:F.length==1?"class":"element"});
-}else{if(B){B=B.replace(m,"");u=(u||"").replace(m,"");var E,H;switch(A){case"^=":H=new RegExp("^"+f(u));break;case"$=":H=new RegExp(f(u)+"$");break;case"~=":H=new RegExp("(^|\\s)"+f(u)+"(\\s|$)");
-break;case"|=":H=new RegExp("^"+f(u)+"(-|$)");break;case"=":E=function(I){return u==I;};break;case"*=":E=function(I){return I&&I.indexOf(u)>-1;};break;
-case"!=":E=function(I){return u!=I;};break;default:E=function(I){return !!I;};}if(u==""&&(/^[*$^]=$/).test(A)){E=function(){return false;};}if(!E){E=function(I){return I&&H.test(I);
-};}if(!o.attributes){o.attributes=[];}o.attributes.push({key:B,operator:A,value:u,test:E});}}}}}return"";}var d=(this.Slick||{});d.parse=function(o){return e(o);
-};d.escapeRegExp=f;if(!this.Slick){this.Slick=d;}}).apply((typeof exports!="undefined")?exports:this);(function(){var j={},l={},b=Object.prototype.toString;
-j.isNativeCode=function(c){return(/\{\s*\[native code\]\s*\}/).test(""+c);};j.isXML=function(c){return(!!c.xmlVersion)||(!!c.xml)||(b.call(c)=="[object XMLDocument]")||(c.nodeType==9&&c.documentElement.nodeName!="HTML");
-};j.setDocument=function(w){var t=w.nodeType;if(t==9){}else{if(t){w=w.ownerDocument;}else{if(w.navigator){w=w.document;}else{return;}}}if(this.document===w){return;
-}this.document=w;var y=w.documentElement,u=this.getUIDXML(y),o=l[u],A;if(o){for(A in o){this[A]=o[A];}return;}o=l[u]={};o.root=y;o.isXMLDocument=this.isXML(w);
-o.brokenStarGEBTN=o.starSelectsClosedQSA=o.idGetsName=o.brokenMixedCaseQSA=o.brokenGEBCN=o.brokenCheckedQSA=o.brokenEmptyAttributeQSA=o.isHTMLDocument=o.nativeMatchesSelector=false;
-var m,n,x,q,r;var s,c="slick_uniqueid";var z=w.createElement("div");var p=w.body||w.getElementsByTagName("body")[0]||y;p.appendChild(z);try{z.innerHTML='<a id="'+c+'"></a>';
-o.isHTMLDocument=!!w.getElementById(c);}catch(v){}if(o.isHTMLDocument){z.style.display="none";z.appendChild(w.createComment(""));n=(z.getElementsByTagName("*").length>1);
-try{z.innerHTML="foo</foo>";s=z.getElementsByTagName("*");m=(s&&!!s.length&&s[0].nodeName.charAt(0)=="/");}catch(v){}o.brokenStarGEBTN=n||m;try{z.innerHTML='<a name="'+c+'"></a><b id="'+c+'"></b>';
-o.idGetsName=w.getElementById(c)===z.firstChild;}catch(v){}if(z.getElementsByClassName){try{z.innerHTML='<a class="f"></a><a class="b"></a>';z.getElementsByClassName("b").length;
-z.firstChild.className="b";q=(z.getElementsByClassName("b").length!=2);}catch(v){}try{z.innerHTML='<a class="a"></a><a class="f b a"></a>';x=(z.getElementsByClassName("a").length!=2);
-}catch(v){}o.brokenGEBCN=q||x;}if(z.querySelectorAll){try{z.innerHTML="foo</foo>";s=z.querySelectorAll("*");o.starSelectsClosedQSA=(s&&!!s.length&&s[0].nodeName.charAt(0)=="/");
-}catch(v){}try{z.innerHTML='<a class="MiX"></a>';o.brokenMixedCaseQSA=!z.querySelectorAll(".MiX").length;}catch(v){}try{z.innerHTML='<select><option selected="selected">a</option></select>';
-o.brokenCheckedQSA=(z.querySelectorAll(":checked").length==0);}catch(v){}try{z.innerHTML='<a class=""></a>';o.brokenEmptyAttributeQSA=(z.querySelectorAll('[class*=""]').length!=0);
-}catch(v){}}try{z.innerHTML='<form action="s"><input id="action"/></form>';r=(z.firstChild.getAttribute("action")!="s");}catch(v){}o.nativeMatchesSelector=y.matchesSelector||y.mozMatchesSelector||y.webkitMatchesSelector;
-if(o.nativeMatchesSelector){try{o.nativeMatchesSelector.call(y,":slick");o.nativeMatchesSelector=null;}catch(v){}}}try{y.slick_expando=1;delete y.slick_expando;
-o.getUID=this.getUIDHTML;}catch(v){o.getUID=this.getUIDXML;}p.removeChild(z);z=s=p=null;o.getAttribute=(o.isHTMLDocument&&r)?function(D,B){var E=this.attributeGetters[B];
-if(E){return E.call(D);}var C=D.getAttributeNode(B);return(C)?C.nodeValue:null;}:function(C,B){var D=this.attributeGetters[B];return(D)?D.call(C):C.getAttribute(B);
-};o.hasAttribute=(y&&this.isNativeCode(y.hasAttribute))?function(C,B){return C.hasAttribute(B);}:function(C,B){C=C.getAttributeNode(B);return !!(C&&(C.specified||C.nodeValue));
-};o.contains=(y&&this.isNativeCode(y.contains))?function(B,C){return B.contains(C);}:(y&&y.compareDocumentPosition)?function(B,C){return B===C||!!(B.compareDocumentPosition(C)&16);
-}:function(B,C){if(C){do{if(C===B){return true;}}while((C=C.parentNode));}return false;};o.documentSorter=(y.compareDocumentPosition)?function(C,B){if(!C.compareDocumentPosition||!B.compareDocumentPosition){return 0;
-}return C.compareDocumentPosition(B)&4?-1:C===B?0:1;}:("sourceIndex" in y)?function(C,B){if(!C.sourceIndex||!B.sourceIndex){return 0;}return C.sourceIndex-B.sourceIndex;
-}:(w.createRange)?function(E,C){if(!E.ownerDocument||!C.ownerDocument){return 0;}var D=E.ownerDocument.createRange(),B=C.ownerDocument.createRange();D.setStart(E,0);
-D.setEnd(E,0);B.setStart(C,0);B.setEnd(C,0);return D.compareBoundaryPoints(Range.START_TO_END,B);}:null;y=null;for(A in o){this[A]=o[A];}};var e=/^([#.]?)((?:[\w-]+|\*))$/,g=/\[.+[*$^]=(?:""|'')?\]/,f={};
-j.search=function(U,z,H,s){var p=this.found=(s)?null:(H||[]);if(!U){return p;}else{if(U.navigator){U=U.document;}else{if(!U.nodeType){return p;}}}var F,O,V=this.uniques={},I=!!(H&&H.length),y=(U.nodeType==9);
-if(this.document!==(y?U:U.ownerDocument)){this.setDocument(U);}if(I){for(O=p.length;O--;){V[this.getUID(p[O])]=true;}}if(typeof z=="string"){var r=z.match(e);
-simpleSelectors:if(r){var u=r[1],v=r[2],A,E;if(!u){if(v=="*"&&this.brokenStarGEBTN){break simpleSelectors;}E=U.getElementsByTagName(v);if(s){return E[0]||null;
-}for(O=0;A=E[O++];){if(!(I&&V[this.getUID(A)])){p.push(A);}}}else{if(u=="#"){if(!this.isHTMLDocument||!y){break simpleSelectors;}A=U.getElementById(v);
-if(!A){return p;}if(this.idGetsName&&A.getAttributeNode("id").nodeValue!=v){break simpleSelectors;}if(s){return A||null;}if(!(I&&V[this.getUID(A)])){p.push(A);
-}}else{if(u=="."){if(!this.isHTMLDocument||((!U.getElementsByClassName||this.brokenGEBCN)&&U.querySelectorAll)){break simpleSelectors;}if(U.getElementsByClassName&&!this.brokenGEBCN){E=U.getElementsByClassName(v);
-if(s){return E[0]||null;}for(O=0;A=E[O++];){if(!(I&&V[this.getUID(A)])){p.push(A);}}}else{var T=new RegExp("(^|\\s)"+d.escapeRegExp(v)+"(\\s|$)");E=U.getElementsByTagName("*");
-for(O=0;A=E[O++];){className=A.className;if(!(className&&T.test(className))){continue;}if(s){return A;}if(!(I&&V[this.getUID(A)])){p.push(A);}}}}}}if(I){this.sort(p);
-}return(s)?null:p;}querySelector:if(U.querySelectorAll){if(!this.isHTMLDocument||f[z]||this.brokenMixedCaseQSA||(this.brokenCheckedQSA&&z.indexOf(":checked")>-1)||(this.brokenEmptyAttributeQSA&&g.test(z))||(!y&&z.indexOf(",")>-1)||d.disableQSA){break querySelector;
-}var S=z,x=U;if(!y){var C=x.getAttribute("id"),t="slickid__";x.setAttribute("id",t);S="#"+t+" "+S;U=x.parentNode;}try{if(s){return U.querySelector(S)||null;
-}else{E=U.querySelectorAll(S);}}catch(Q){f[z]=1;break querySelector;}finally{if(!y){if(C){x.setAttribute("id",C);}else{x.removeAttribute("id");}U=x;}}if(this.starSelectsClosedQSA){for(O=0;
-A=E[O++];){if(A.nodeName>"@"&&!(I&&V[this.getUID(A)])){p.push(A);}}}else{for(O=0;A=E[O++];){if(!(I&&V[this.getUID(A)])){p.push(A);}}}if(I){this.sort(p);
-}return p;}F=this.Slick.parse(z);if(!F.length){return p;}}else{if(z==null){return p;}else{if(z.Slick){F=z;}else{if(this.contains(U.documentElement||U,z)){(p)?p.push(z):p=z;
-return p;}else{return p;}}}}this.posNTH={};this.posNTHLast={};this.posNTHType={};this.posNTHTypeLast={};this.push=(!I&&(s||(F.length==1&&F.expressions[0].length==1)))?this.pushArray:this.pushUID;
-if(p==null){p=[];}var M,L,K;var B,J,D,c,q,G,W;var N,P,o,w,R=F.expressions;search:for(O=0;(P=R[O]);O++){for(M=0;(o=P[M]);M++){B="combinator:"+o.combinator;
-if(!this[B]){continue search;}J=(this.isXMLDocument)?o.tag:o.tag.toUpperCase();D=o.id;c=o.classList;q=o.classes;G=o.attributes;W=o.pseudos;w=(M===(P.length-1));
-this.bitUniques={};if(w){this.uniques=V;this.found=p;}else{this.uniques={};this.found=[];}if(M===0){this[B](U,J,D,q,G,W,c);if(s&&w&&p.length){break search;
-}}else{if(s&&w){for(L=0,K=N.length;L<K;L++){this[B](N[L],J,D,q,G,W,c);if(p.length){break search;}}}else{for(L=0,K=N.length;L<K;L++){this[B](N[L],J,D,q,G,W,c);
-}}}N=this.found;}}if(I||(F.expressions.length>1)){this.sort(p);}return(s)?(p[0]||null):p;};j.uidx=1;j.uidk="slick-uniqueid";j.getUIDXML=function(m){var c=m.getAttribute(this.uidk);
-if(!c){c=this.uidx++;m.setAttribute(this.uidk,c);}return c;};j.getUIDHTML=function(c){return c.uniqueNumber||(c.uniqueNumber=this.uidx++);};j.sort=function(c){if(!this.documentSorter){return c;
-}c.sort(this.documentSorter);return c;};j.cacheNTH={};j.matchNTH=/^([+-]?\d*)?([a-z]+)?([+-]\d+)?$/;j.parseNTHArgument=function(p){var n=p.match(this.matchNTH);
-if(!n){return false;}var o=n[2]||false;var m=n[1]||1;if(m=="-"){m=-1;}var c=+n[3]||0;n=(o=="n")?{a:m,b:c}:(o=="odd")?{a:2,b:1}:(o=="even")?{a:2,b:0}:{a:0,b:m};
-return(this.cacheNTH[p]=n);};j.createNTHPseudo=function(o,m,c,n){return function(r,p){var t=this.getUID(r);if(!this[c][t]){var z=r.parentNode;if(!z){return false;
-}var q=z[o],s=1;if(n){var y=r.nodeName;do{if(q.nodeName!=y){continue;}this[c][this.getUID(q)]=s++;}while((q=q[m]));}else{do{if(q.nodeType!=1){continue;
-}this[c][this.getUID(q)]=s++;}while((q=q[m]));}}p=p||"n";var u=this.cacheNTH[p]||this.parseNTHArgument(p);if(!u){return false;}var x=u.a,w=u.b,v=this[c][t];
-if(x==0){return w==v;}if(x>0){if(v<w){return false;}}else{if(w<v){return false;}}return((v-w)%x)==0;};};j.pushArray=function(o,c,q,n,m,p){if(this.matchSelector(o,c,q,n,m,p)){this.found.push(o);
-}};j.pushUID=function(p,c,r,o,m,q){var n=this.getUID(p);if(!this.uniques[n]&&this.matchSelector(p,c,r,o,m,q)){this.uniques[n]=true;this.found.push(p);}};
-j.matchNode=function(m,n){if(this.isHTMLDocument&&this.nativeMatchesSelector){try{return this.nativeMatchesSelector.call(m,n.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g,'[$1="$2"]'));
-}catch(u){}}var t=this.Slick.parse(n);if(!t){return true;}var r=t.expressions,p,s=0,q;for(q=0;(currentExpression=r[q]);q++){if(currentExpression.length==1){var o=currentExpression[0];
-if(this.matchSelector(m,(this.isXMLDocument)?o.tag:o.tag.toUpperCase(),o.id,o.classes,o.attributes,o.pseudos)){return true;}s++;}}if(s==t.length){return false;
-}var c=this.search(this.document,t),v;for(q=0;v=c[q++];){if(v===m){return true;}}return false;};j.matchPseudo=function(p,c,o){var m="pseudo:"+c;if(this[m]){return this[m](p,o);
-}var n=this.getAttribute(p,c);return(o)?o==n:!!n;};j.matchSelector=function(n,u,c,o,p,r){if(u){var s=(this.isXMLDocument)?n.nodeName:n.nodeName.toUpperCase();
-if(u=="*"){if(s<"@"){return false;}}else{if(s!=u){return false;}}}if(c&&n.getAttribute("id")!=c){return false;}var q,m,t;if(o){for(q=o.length;q--;){t=n.getAttribute("class")||n.className;
-if(!(t&&o[q].regexp.test(t))){return false;}}}if(p){for(q=p.length;q--;){m=p[q];if(m.operator?!m.test(this.getAttribute(n,m.key)):!this.hasAttribute(n,m.key)){return false;
-}}}if(r){for(q=r.length;q--;){m=r[q];if(!this.matchPseudo(n,m.key,m.value)){return false;}}}return true;};var i={" ":function(p,v,m,q,r,t,o){var s,u,n;
-if(this.isHTMLDocument){getById:if(m){u=this.document.getElementById(m);if((!u&&p.all)||(this.idGetsName&&u&&u.getAttributeNode("id").nodeValue!=m)){n=p.all[m];
-if(!n){return;}if(!n[0]){n=[n];}for(s=0;u=n[s++];){var c=u.getAttributeNode("id");if(c&&c.nodeValue==m){this.push(u,v,null,q,r,t);break;}}return;}if(!u){if(this.contains(this.root,p)){return;
-}else{break getById;}}else{if(this.document!==p&&!this.contains(p,u)){return;}}this.push(u,v,null,q,r,t);return;}getByClass:if(q&&p.getElementsByClassName&&!this.brokenGEBCN){n=p.getElementsByClassName(o.join(" "));
-if(!(n&&n.length)){break getByClass;}for(s=0;u=n[s++];){this.push(u,v,m,null,r,t);}return;}}getByTag:{n=p.getElementsByTagName(v);if(!(n&&n.length)){break getByTag;
-}if(!this.brokenStarGEBTN){v=null;}for(s=0;u=n[s++];){this.push(u,v,m,q,r,t);}}},">":function(o,c,q,n,m,p){if((o=o.firstChild)){do{if(o.nodeType==1){this.push(o,c,q,n,m,p);
-}}while((o=o.nextSibling));}},"+":function(o,c,q,n,m,p){while((o=o.nextSibling)){if(o.nodeType==1){this.push(o,c,q,n,m,p);break;}}},"^":function(o,c,q,n,m,p){o=o.firstChild;
-if(o){if(o.nodeType==1){this.push(o,c,q,n,m,p);}else{this["combinator:+"](o,c,q,n,m,p);}}},"~":function(p,c,r,o,m,q){while((p=p.nextSibling)){if(p.nodeType!=1){continue;
-}var n=this.getUID(p);if(this.bitUniques[n]){break;}this.bitUniques[n]=true;this.push(p,c,r,o,m,q);}},"++":function(o,c,q,n,m,p){this["combinator:+"](o,c,q,n,m,p);
-this["combinator:!+"](o,c,q,n,m,p);},"~~":function(o,c,q,n,m,p){this["combinator:~"](o,c,q,n,m,p);this["combinator:!~"](o,c,q,n,m,p);},"!":function(o,c,q,n,m,p){while((o=o.parentNode)){if(o!==this.document){this.push(o,c,q,n,m,p);
-}}},"!>":function(o,c,q,n,m,p){o=o.parentNode;if(o!==this.document){this.push(o,c,q,n,m,p);}},"!+":function(o,c,q,n,m,p){while((o=o.previousSibling)){if(o.nodeType==1){this.push(o,c,q,n,m,p);
-break;}}},"!^":function(o,c,q,n,m,p){o=o.lastChild;if(o){if(o.nodeType==1){this.push(o,c,q,n,m,p);}else{this["combinator:!+"](o,c,q,n,m,p);}}},"!~":function(p,c,r,o,m,q){while((p=p.previousSibling)){if(p.nodeType!=1){continue;
-}var n=this.getUID(p);if(this.bitUniques[n]){break;}this.bitUniques[n]=true;this.push(p,c,r,o,m,q);}}};for(var h in i){j["combinator:"+h]=i[h];}var k={empty:function(c){var m=c.firstChild;
-return !(m&&m.nodeType==1)&&!(c.innerText||c.textContent||"").length;},not:function(c,m){return !this.matchNode(c,m);},contains:function(c,m){return(c.innerText||c.textContent||"").indexOf(m)>-1;
-},"first-child":function(c){while((c=c.previousSibling)){if(c.nodeType==1){return false;}}return true;},"last-child":function(c){while((c=c.nextSibling)){if(c.nodeType==1){return false;
-}}return true;},"only-child":function(n){var m=n;while((m=m.previousSibling)){if(m.nodeType==1){return false;}}var c=n;while((c=c.nextSibling)){if(c.nodeType==1){return false;
-}}return true;},"nth-child":j.createNTHPseudo("firstChild","nextSibling","posNTH"),"nth-last-child":j.createNTHPseudo("lastChild","previousSibling","posNTHLast"),"nth-of-type":j.createNTHPseudo("firstChild","nextSibling","posNTHType",true),"nth-last-of-type":j.createNTHPseudo("lastChild","previousSibling","posNTHTypeLast",true),index:function(m,c){return this["pseudo:nth-child"](m,""+c+1);
-},even:function(c){return this["pseudo:nth-child"](c,"2n");},odd:function(c){return this["pseudo:nth-child"](c,"2n+1");},"first-of-type":function(c){var m=c.nodeName;
-while((c=c.previousSibling)){if(c.nodeName==m){return false;}}return true;},"last-of-type":function(c){var m=c.nodeName;while((c=c.nextSibling)){if(c.nodeName==m){return false;
-}}return true;},"only-of-type":function(n){var m=n,o=n.nodeName;while((m=m.previousSibling)){if(m.nodeName==o){return false;}}var c=n;while((c=c.nextSibling)){if(c.nodeName==o){return false;
-}}return true;},enabled:function(c){return !c.disabled;},disabled:function(c){return c.disabled;},checked:function(c){return c.checked||c.selected;},focus:function(c){return this.isHTMLDocument&&this.document.activeElement===c&&(c.href||c.type||this.hasAttribute(c,"tabindex"));
-},root:function(c){return(c===this.root);},selected:function(c){return c.selected;}};for(var a in k){j["pseudo:"+a]=k[a];}j.attributeGetters={"class":function(){return this.getAttribute("class")||this.className;
-},"for":function(){return("htmlFor" in this)?this.htmlFor:this.getAttribute("for");},href:function(){return("href" in this)?this.getAttribute("href",2):this.getAttribute("href");
-},style:function(){return(this.style)?this.style.cssText:this.getAttribute("style");},tabindex:function(){var c=this.getAttributeNode("tabindex");return(c&&c.specified)?c.nodeValue:null;
-},type:function(){return this.getAttribute("type");}};var d=j.Slick=(this.Slick||{});d.version="1.1.5";d.search=function(m,n,c){return j.search(m,n,c);
-};d.find=function(c,m){return j.search(c,m,null,true);};d.contains=function(c,m){j.setDocument(c);return j.contains(c,m);};d.getAttribute=function(m,c){return j.getAttribute(m,c);
-};d.match=function(m,c){if(!(m&&c)){return false;}if(!c||c===m){return true;}j.setDocument(m);return j.matchNode(m,c);};d.defineAttributeGetter=function(c,m){j.attributeGetters[c]=m;
-return this;};d.lookupAttributeGetter=function(c){return j.attributeGetters[c];};d.definePseudo=function(c,m){j["pseudo:"+c]=function(o,n){return m.call(o,n);
-};return this;};d.lookupPseudo=function(c){var m=j["pseudo:"+c];if(m){return function(n){return m.call(this,n);};}return null;};d.override=function(m,c){j.override(m,c);
-return this;};d.isXML=j.isXML;d.uidOf=function(c){return j.getUIDHTML(c);};if(!this.Slick){this.Slick=d;}}).apply((typeof exports!="undefined")?exports:this);
-var Element=function(b,g){var h=Element.Constructors[b];if(h){return h(g);}if(typeof b!="string"){return document.id(b).set(g);}if(!g){g={};}if(!(/^[\w-]+$/).test(b)){var e=Slick.parse(b).expressions[0][0];
-b=(e.tag=="*")?"div":e.tag;if(e.id&&g.id==null){g.id=e.id;}var d=e.attributes;if(d){for(var f=0,c=d.length;f<c;f++){var a=d[f];if(g[a.key]!=null){continue;
-}if(a.value!=null&&a.operator=="="){g[a.key]=a.value;}else{if(!a.value&&!a.operator){g[a.key]=true;}}}}if(e.classList&&g["class"]==null){g["class"]=e.classList.join(" ");
-}}return document.newElement(b,g);};if(Browser.Element){Element.prototype=Browser.Element.prototype;}new Type("Element",Element).mirror(function(a){if(Array.prototype[a]){return;
-}var b={};b[a]=function(){var h=[],e=arguments,j=true;for(var g=0,d=this.length;g<d;g++){var f=this[g],c=h[g]=f[a].apply(f,e);j=(j&&typeOf(c)=="element");
-}return(j)?new Elements(h):h;};Elements.implement(b);});if(!Browser.Element){Element.parent=Object;Element.Prototype={"$family":Function.from("element").hide()};
-Element.mirror(function(a,b){Element.Prototype[a]=b;});}Element.Constructors={};var IFrame=new Type("IFrame",function(){var e=Array.link(arguments,{properties:Type.isObject,iframe:function(f){return(f!=null);
-}});var c=e.properties||{},b;if(e.iframe){b=document.id(e.iframe);}var d=c.onload||function(){};delete c.onload;c.id=c.name=[c.id,c.name,b?(b.id||b.name):"IFrame_"+String.uniqueID()].pick();
-b=new Element(b||"iframe",c);var a=function(){d.call(b.contentWindow);};if(window.frames[c.id]){a();}else{b.addListener("load",a);}return b;});var Elements=this.Elements=function(a){if(a&&a.length){var e={},d;
-for(var c=0;d=a[c++];){var b=Slick.uidOf(d);if(!e[b]){e[b]=true;this.push(d);}}}};Elements.prototype={length:0};Elements.parent=Array;new Type("Elements",Elements).implement({filter:function(a,b){if(!a){return this;
-}return new Elements(Array.filter(this,(typeOf(a)=="string")?function(c){return c.match(a);}:a,b));}.protect(),push:function(){var d=this.length;for(var b=0,a=arguments.length;
-b<a;b++){var c=document.id(arguments[b]);if(c){this[d++]=c;}}return(this.length=d);}.protect(),unshift:function(){var b=[];for(var c=0,a=arguments.length;
-c<a;c++){var d=document.id(arguments[c]);if(d){b.push(d);}}return Array.prototype.unshift.apply(this,b);}.protect(),concat:function(){var b=new Elements(this);
-for(var c=0,a=arguments.length;c<a;c++){var d=arguments[c];if(Type.isEnumerable(d)){b.append(d);}else{b.push(d);}}return b;}.protect(),append:function(c){for(var b=0,a=c.length;
-b<a;b++){this.push(c[b]);}return this;}.protect(),empty:function(){while(this.length){delete this[--this.length];}return this;}.protect()});(function(){var g=Array.prototype.splice,b={"0":0,"1":1,length:2};
-g.call(b,1,1);if(b[1]==1){Elements.implement("splice",function(){var e=this.length;g.apply(this,arguments);while(e>=this.length){delete this[e--];}return this;
-}.protect());}Elements.implement(Array.prototype);Array.mirror(Elements);var f;try{var a=document.createElement("<input name=x>");f=(a.name=="x");}catch(c){}var d=function(e){return(""+e).replace(/&/g,"&amp;").replace(/"/g,"&quot;");
-};Document.implement({newElement:function(e,h){if(h&&h.checked!=null){h.defaultChecked=h.checked;}if(f&&h){e="<"+e;if(h.name){e+=' name="'+d(h.name)+'"';
-}if(h.type){e+=' type="'+d(h.type)+'"';}e+=">";delete h.name;delete h.type;}return this.id(this.createElement(e)).set(h);}});})();Document.implement({newTextNode:function(a){return this.createTextNode(a);
-},getDocument:function(){return this;},getWindow:function(){return this.window;},id:(function(){var a={string:function(d,c,b){d=Slick.find(b,"#"+d.replace(/(\W)/g,"\\$1"));
-return(d)?a.element(d,c):null;},element:function(b,c){$uid(b);if(!c&&!b.$family&&!(/^(?:object|embed)$/i).test(b.tagName)){Object.append(b,Element.Prototype);
-}return b;},object:function(c,d,b){if(c.toElement){return a.element(c.toElement(b),d);}return null;}};a.textnode=a.whitespace=a.window=a.document=function(b){return b;
-};return function(c,e,d){if(c&&c.$family&&c.uid){return c;}var b=typeOf(c);return(a[b])?a[b](c,e,d||document):null;};})()});if(window.$==null){Window.implement("$",function(a,b){return document.id(a,b,this.document);
-});}Window.implement({getDocument:function(){return this.document;},getWindow:function(){return this;}});[Document,Element].invoke("implement",{getElements:function(a){return Slick.search(this,a,new Elements);
-},getElement:function(a){return document.id(Slick.find(this,a));}});if(window.$$==null){Window.implement("$$",function(a){if(arguments.length==1){if(typeof a=="string"){return Slick.search(this.document,a,new Elements);
-}else{if(Type.isEnumerable(a)){return new Elements(a);}}}return new Elements(arguments);});}(function(){var k={},i={};var n={input:"checked",option:"selected",textarea:"value"};
-var e=function(p){return(i[p]||(i[p]={}));};var j=function(q){var p=q.uid;if(q.removeEvents){q.removeEvents();}if(q.clearAttributes){q.clearAttributes();
-}if(p!=null){delete k[p];delete i[p];}return q;};var o=["defaultValue","accessKey","cellPadding","cellSpacing","colSpan","frameBorder","maxLength","readOnly","rowSpan","tabIndex","useMap"];
-var d=["compact","nowrap","ismap","declare","noshade","checked","disabled","readOnly","multiple","selected","noresize","defer","defaultChecked"];var g={html:"innerHTML","class":"className","for":"htmlFor",text:(function(){var p=document.createElement("div");
-return(p.textContent==null)?"innerText":"textContent";})()};var m=["type"];var h=["value","defaultValue"];var l=/^(?:href|src|usemap)$/i;d=d.associate(d);
-o=o.associate(o.map(String.toLowerCase));m=m.associate(m);Object.append(g,h.associate(h));var c={before:function(q,p){var r=p.parentNode;if(r){r.insertBefore(q,p);
-}},after:function(q,p){var r=p.parentNode;if(r){r.insertBefore(q,p.nextSibling);}},bottom:function(q,p){p.appendChild(q);},top:function(q,p){p.insertBefore(q,p.firstChild);
-}};c.inside=c.bottom;var b=function(s,r){if(!s){return r;}s=Object.clone(Slick.parse(s));var q=s.expressions;for(var p=q.length;p--;){q[p][0].combinator=r;
-}return s;};Element.implement({set:function(r,q){var p=Element.Properties[r];(p&&p.set)?p.set.call(this,q):this.setProperty(r,q);}.overloadSetter(),get:function(q){var p=Element.Properties[q];
-return(p&&p.get)?p.get.apply(this):this.getProperty(q);}.overloadGetter(),erase:function(q){var p=Element.Properties[q];(p&&p.erase)?p.erase.apply(this):this.removeProperty(q);
-return this;},setProperty:function(q,r){q=o[q]||q;if(r==null){return this.removeProperty(q);}var p=g[q];(p)?this[p]=r:(d[q])?this[q]=!!r:this.setAttribute(q,""+r);
-return this;},setProperties:function(p){for(var q in p){this.setProperty(q,p[q]);}return this;},getProperty:function(q){q=o[q]||q;var p=g[q]||m[q];return(p)?this[p]:(d[q])?!!this[q]:(l.test(q)?this.getAttribute(q,2):(p=this.getAttributeNode(q))?p.nodeValue:null)||null;
-},getProperties:function(){var p=Array.from(arguments);return p.map(this.getProperty,this).associate(p);},removeProperty:function(q){q=o[q]||q;var p=g[q];
-(p)?this[p]="":(d[q])?this[q]=false:this.removeAttribute(q);return this;},removeProperties:function(){Array.each(arguments,this.removeProperty,this);return this;
-},hasClass:function(p){return this.className.clean().contains(p," ");},addClass:function(p){if(!this.hasClass(p)){this.className=(this.className+" "+p).clean();
-}return this;},removeClass:function(p){this.className=this.className.replace(new RegExp("(^|\\s)"+p+"(?:\\s|$)"),"$1");return this;},toggleClass:function(p,q){if(q==null){q=!this.hasClass(p);
-}return(q)?this.addClass(p):this.removeClass(p);},adopt:function(){var s=this,p,u=Array.flatten(arguments),t=u.length;if(t>1){s=p=document.createDocumentFragment();
-}for(var r=0;r<t;r++){var q=document.id(u[r],true);if(q){s.appendChild(q);}}if(p){this.appendChild(p);}return this;},appendText:function(q,p){return this.grab(this.getDocument().newTextNode(q),p);
-},grab:function(q,p){c[p||"bottom"](document.id(q,true),this);return this;},inject:function(q,p){c[p||"bottom"](this,document.id(q,true));return this;},replaces:function(p){p=document.id(p,true);
-p.parentNode.replaceChild(this,p);return this;},wraps:function(q,p){q=document.id(q,true);return this.replaces(q).grab(q,p);},getPrevious:function(p){return document.id(Slick.find(this,b(p,"!~")));
-},getAllPrevious:function(p){return Slick.search(this,b(p,"!~"),new Elements);},getNext:function(p){return document.id(Slick.find(this,b(p,"~")));},getAllNext:function(p){return Slick.search(this,b(p,"~"),new Elements);
-},getFirst:function(p){return document.id(Slick.search(this,b(p,">"))[0]);},getLast:function(p){return document.id(Slick.search(this,b(p,">")).getLast());
-},getParent:function(p){return document.id(Slick.find(this,b(p,"!")));},getParents:function(p){return Slick.search(this,b(p,"!"),new Elements);},getSiblings:function(p){return Slick.search(this,b(p,"~~"),new Elements);
-},getChildren:function(p){return Slick.search(this,b(p,">"),new Elements);},getWindow:function(){return this.ownerDocument.window;},getDocument:function(){return this.ownerDocument;
-},getElementById:function(p){return document.id(Slick.find(this,"#"+(""+p).replace(/(\W)/g,"\\$1")));},getSelected:function(){this.selectedIndex;return new Elements(Array.from(this.options).filter(function(p){return p.selected;
-}));},toQueryString:function(){var p=[];this.getElements("input, select, textarea").each(function(r){var q=r.type;if(!r.name||r.disabled||q=="submit"||q=="reset"||q=="file"||q=="image"){return;
-}var s=(r.get("tag")=="select")?r.getSelected().map(function(t){return document.id(t).get("value");}):((q=="radio"||q=="checkbox")&&!r.checked)?null:r.get("value");
-Array.from(s).each(function(t){if(typeof t!="undefined"){p.push(encodeURIComponent(r.name)+"="+encodeURIComponent(t));}});});return p.join("&");},destroy:function(){var p=j(this).getElementsByTagName("*");
-Array.each(p,j);Element.dispose(this);return null;},empty:function(){Array.from(this.childNodes).each(Element.dispose);return this;},dispose:function(){return(this.parentNode)?this.parentNode.removeChild(this):this;
-},match:function(p){return !p||Slick.match(this,p);}});var a=function(t,s,q){if(!q){t.setAttributeNode(document.createAttribute("id"));}if(t.clearAttributes){t.clearAttributes();
-t.mergeAttributes(s);t.removeAttribute("uid");if(t.options){var u=t.options,p=s.options;for(var r=u.length;r--;){u[r].selected=p[r].selected;}}}var v=n[s.tagName.toLowerCase()];
-if(v&&s[v]){t[v]=s[v];}};Element.implement("clone",function(r,p){r=r!==false;var w=this.cloneNode(r),q;if(r){var s=w.getElementsByTagName("*"),u=this.getElementsByTagName("*");
-for(q=s.length;q--;){a(s[q],u[q],p);}}a(w,this,p);if(Browser.ie){var t=w.getElementsByTagName("object"),v=this.getElementsByTagName("object");for(q=t.length;
-q--;){t[q].outerHTML=v[q].outerHTML;}}return document.id(w);});var f={contains:function(p){return Slick.contains(this,p);}};if(!document.contains){Document.implement(f);
-}if(!document.createElement("div").contains){Element.implement(f);}[Element,Window,Document].invoke("implement",{addListener:function(s,r){if(s=="unload"){var p=r,q=this;
-r=function(){q.removeListener("unload",r);p();};}else{k[$uid(this)]=this;}if(this.addEventListener){this.addEventListener(s,r,!!arguments[2]);}else{this.attachEvent("on"+s,r);
-}return this;},removeListener:function(q,p){if(this.removeEventListener){this.removeEventListener(q,p,!!arguments[2]);}else{this.detachEvent("on"+q,p);
-}return this;},retrieve:function(q,p){var s=e($uid(this)),r=s[q];if(p!=null&&r==null){r=s[q]=p;}return r!=null?r:null;},store:function(q,p){var r=e($uid(this));
-r[q]=p;return this;},eliminate:function(p){var q=e($uid(this));delete q[p];return this;}});if(window.attachEvent&&!window.addEventListener){window.addListener("unload",function(){Object.each(k,j);
-if(window.CollectGarbage){CollectGarbage();}});}})();Element.Properties={};Element.Properties.style={set:function(a){this.style.cssText=a;},get:function(){return this.style.cssText;
-},erase:function(){this.style.cssText="";}};Element.Properties.tag={get:function(){return this.tagName.toLowerCase();}};(function(a){if(a!=null){Element.Properties.maxlength=Element.Properties.maxLength={get:function(){var b=this.getAttribute("maxLength");
-return b==a?null:b;}};}})(document.createElement("input").getAttribute("maxLength"));Element.Properties.html=(function(){var c=Function.attempt(function(){var e=document.createElement("table");
-e.innerHTML="<tr><td></td></tr>";});var d=document.createElement("div");var a={table:[1,"<table>","</table>"],select:[1,"<select>","</select>"],tbody:[2,"<table><tbody>","</tbody></table>"],tr:[3,"<table><tbody><tr>","</tr></tbody></table>"]};
-a.thead=a.tfoot=a.tbody;var b={set:function(){var f=Array.flatten(arguments).join("");var g=(!c&&a[this.get("tag")]);if(g){var h=d;h.innerHTML=g[1]+f+g[2];
-for(var e=g[0];e--;){h=h.firstChild;}this.empty().adopt(h.childNodes);}else{this.innerHTML=f;}}};b.erase=b.set;return b;})();(function(){var c=document.html;
-Element.Properties.styles={set:function(f){this.setStyles(f);}};var e=(c.style.opacity!=null);var d=/alpha\(opacity=([\d.]+)\)/i;var b=function(g,f){if(!g.currentStyle||!g.currentStyle.hasLayout){g.style.zoom=1;
-}if(e){g.style.opacity=f;}else{f=(f*100).limit(0,100).round();f=(f==100)?"":"alpha(opacity="+f+")";var h=g.style.filter||g.getComputedStyle("filter")||"";
-g.style.filter=d.test(h)?h.replace(d,f):h+f;}};Element.Properties.opacity={set:function(g){var f=this.style.visibility;if(g==0&&f!="hidden"){this.style.visibility="hidden";
-}else{if(g!=0&&f!="visible"){this.style.visibility="visible";}}b(this,g);},get:(e)?function(){var f=this.style.opacity||this.getComputedStyle("opacity");
-return(f=="")?1:f;}:function(){var f,g=(this.style.filter||this.getComputedStyle("filter"));if(g){f=g.match(d);}return(f==null||g==null)?1:(f[1]/100);}};
-var a=(c.style.cssFloat==null)?"styleFloat":"cssFloat";Element.implement({getComputedStyle:function(h){if(this.currentStyle){return this.currentStyle[h.camelCase()];
-}var g=Element.getDocument(this).defaultView,f=g?g.getComputedStyle(this,null):null;return(f)?f.getPropertyValue((h==a)?"float":h.hyphenate()):null;},setOpacity:function(f){b(this,f);
-return this;},getOpacity:function(){return this.get("opacity");},setStyle:function(g,f){switch(g){case"opacity":return this.set("opacity",parseFloat(f));
-case"float":g=a;}g=g.camelCase();if(typeOf(f)!="string"){var h=(Element.Styles[g]||"@").split(" ");f=Array.from(f).map(function(k,j){if(!h[j]){return"";
-}return(typeOf(k)=="number")?h[j].replace("@",Math.round(k)):k;}).join(" ");}else{if(f==String(Number(f))){f=Math.round(f);}}this.style[g]=f;return this;
-},getStyle:function(l){switch(l){case"opacity":return this.get("opacity");case"float":l=a;}l=l.camelCase();var f=this.style[l];if(!f||l=="zIndex"){f=[];
-for(var k in Element.ShortStyles){if(l!=k){continue;}for(var j in Element.ShortStyles[k]){f.push(this.getStyle(j));}return f.join(" ");}f=this.getComputedStyle(l);
-}if(f){f=String(f);var h=f.match(/rgba?\([\d\s,]+\)/);if(h){f=f.replace(h[0],h[0].rgbToHex());}}if(Browser.opera||(Browser.ie&&isNaN(parseFloat(f)))){if((/^(height|width)$/).test(l)){var g=(l=="width")?["left","right"]:["top","bottom"],i=0;
-g.each(function(m){i+=this.getStyle("border-"+m+"-width").toInt()+this.getStyle("padding-"+m).toInt();},this);return this["offset"+l.capitalize()]-i+"px";
-}if(Browser.opera&&String(f).indexOf("px")!=-1){return f;}if((/^border(.+)Width|margin|padding/).test(l)){return"0px";}}return f;},setStyles:function(g){for(var f in g){this.setStyle(f,g[f]);
-}return this;},getStyles:function(){var f={};Array.flatten(arguments).each(function(g){f[g]=this.getStyle(g);},this);return f;}});Element.Styles={left:"@px",top:"@px",bottom:"@px",right:"@px",width:"@px",height:"@px",maxWidth:"@px",maxHeight:"@px",minWidth:"@px",minHeight:"@px",backgroundColor:"rgb(@, @, @)",backgroundPosition:"@px @px",color:"rgb(@, @, @)",fontSize:"@px",letterSpacing:"@px",lineHeight:"@px",clip:"rect(@px @px @px @px)",margin:"@px @px @px @px",padding:"@px @px @px @px",border:"@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",borderWidth:"@px @px @px @px",borderStyle:"@ @ @ @",borderColor:"rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",zIndex:"@",zoom:"@",fontWeight:"@",textIndent:"@px",opacity:"@"};
-Element.ShortStyles={margin:{},padding:{},border:{},borderWidth:{},borderStyle:{},borderColor:{}};["Top","Right","Bottom","Left"].each(function(l){var k=Element.ShortStyles;
-var g=Element.Styles;["margin","padding"].each(function(m){var n=m+l;k[m][n]=g[n]="@px";});var j="border"+l;k.border[j]=g[j]="@px @ rgb(@, @, @)";var i=j+"Width",f=j+"Style",h=j+"Color";
-k[j]={};k.borderWidth[i]=k[j][i]=g[i]="@px";k.borderStyle[f]=k[j][f]=g[f]="@";k.borderColor[h]=k[j][h]=g[h]="rgb(@, @, @)";});})();(function(){Element.Properties.events={set:function(b){this.addEvents(b);
-}};[Element,Window,Document].invoke("implement",{addEvent:function(f,h){var i=this.retrieve("events",{});if(!i[f]){i[f]={keys:[],values:[]};}if(i[f].keys.contains(h)){return this;
-}i[f].keys.push(h);var g=f,b=Element.Events[f],d=h,j=this;if(b){if(b.onAdd){b.onAdd.call(this,h);}if(b.condition){d=function(k){if(b.condition.call(this,k)){return h.call(this,k);
-}return true;};}g=b.base||g;}var e=function(){return h.call(j);};var c=Element.NativeEvents[g];if(c){if(c==2){e=function(k){k=new Event(k,j.getWindow());
-if(d.call(j,k)===false){k.stop();}};}this.addListener(g,e,arguments[2]);}i[f].values.push(e);return this;},removeEvent:function(e,d){var c=this.retrieve("events");
-if(!c||!c[e]){return this;}var h=c[e];var b=h.keys.indexOf(d);if(b==-1){return this;}var g=h.values[b];delete h.keys[b];delete h.values[b];var f=Element.Events[e];
-if(f){if(f.onRemove){f.onRemove.call(this,d);}e=f.base||e;}return(Element.NativeEvents[e])?this.removeListener(e,g,arguments[2]):this;},addEvents:function(b){for(var c in b){this.addEvent(c,b[c]);
-}return this;},removeEvents:function(b){var d;if(typeOf(b)=="object"){for(d in b){this.removeEvent(d,b[d]);}return this;}var c=this.retrieve("events");
-if(!c){return this;}if(!b){for(d in c){this.removeEvents(d);}this.eliminate("events");}else{if(c[b]){c[b].keys.each(function(e){this.removeEvent(b,e);},this);
-delete c[b];}}return this;},fireEvent:function(e,c,b){var d=this.retrieve("events");if(!d||!d[e]){return this;}c=Array.from(c);d[e].keys.each(function(f){if(b){f.delay(b,this,c);
-}else{f.apply(this,c);}},this);return this;},cloneEvents:function(e,d){e=document.id(e);var c=e.retrieve("events");if(!c){return this;}if(!d){for(var b in c){this.cloneEvents(e,b);
-}}else{if(c[d]){c[d].keys.each(function(f){this.addEvent(d,f);},this);}}return this;}});Element.NativeEvents={click:2,dblclick:2,mouseup:2,mousedown:2,contextmenu:2,mousewheel:2,DOMMouseScroll:2,mouseover:2,mouseout:2,mousemove:2,selectstart:2,selectend:2,keydown:2,keypress:2,keyup:2,orientationchange:2,touchstart:2,touchmove:2,touchend:2,touchcancel:2,gesturestart:2,gesturechange:2,gestureend:2,focus:2,blur:2,change:2,reset:2,select:2,submit:2,load:2,unload:1,beforeunload:2,resize:1,move:1,DOMContentLoaded:1,readystatechange:1,error:1,abort:1,scroll:1};
-var a=function(b){var c=b.relatedTarget;if(c==null){return true;}if(!c){return false;}return(c!=this&&c.prefix!="xul"&&typeOf(this)!="document"&&!this.contains(c));
-};Element.Events={mouseenter:{base:"mouseover",condition:a},mouseleave:{base:"mouseout",condition:a},mousewheel:{base:(Browser.firefox)?"DOMMouseScroll":"mousewheel"}};
-})();(function(){var h=document.createElement("div"),e=document.createElement("div");h.style.height="0";h.appendChild(e);var d=(e.offsetParent===h);h=e=null;
-var l=function(m){return k(m,"position")!="static"||a(m);};var i=function(m){return l(m)||(/^(?:table|td|th)$/i).test(m.tagName);};Element.implement({scrollTo:function(m,n){if(a(this)){this.getWindow().scrollTo(m,n);
-}else{this.scrollLeft=m;this.scrollTop=n;}return this;},getSize:function(){if(a(this)){return this.getWindow().getSize();}return{x:this.offsetWidth,y:this.offsetHeight};
-},getScrollSize:function(){if(a(this)){return this.getWindow().getScrollSize();}return{x:this.scrollWidth,y:this.scrollHeight};},getScroll:function(){if(a(this)){return this.getWindow().getScroll();
-}return{x:this.scrollLeft,y:this.scrollTop};},getScrolls:function(){var n=this.parentNode,m={x:0,y:0};while(n&&!a(n)){m.x+=n.scrollLeft;m.y+=n.scrollTop;
-n=n.parentNode;}return m;},getOffsetParent:d?function(){var m=this;if(a(m)||k(m,"position")=="fixed"){return null;}var n=(k(m,"position")=="static")?i:l;
-while((m=m.parentNode)){if(n(m)){return m;}}return null;}:function(){var m=this;if(a(m)||k(m,"position")=="fixed"){return null;}try{return m.offsetParent;
-}catch(n){}return null;},getOffsets:function(){if(this.getBoundingClientRect&&!Browser.Platform.ios){var r=this.getBoundingClientRect(),o=document.id(this.getDocument().documentElement),q=o.getScroll(),t=this.getScrolls(),s=(k(this,"position")=="fixed");
-return{x:r.left.toInt()+t.x+((s)?0:q.x)-o.clientLeft,y:r.top.toInt()+t.y+((s)?0:q.y)-o.clientTop};}var n=this,m={x:0,y:0};if(a(this)){return m;}while(n&&!a(n)){m.x+=n.offsetLeft;
-m.y+=n.offsetTop;if(Browser.firefox){if(!c(n)){m.x+=b(n);m.y+=g(n);}var p=n.parentNode;if(p&&k(p,"overflow")!="visible"){m.x+=b(p);m.y+=g(p);}}else{if(n!=this&&Browser.safari){m.x+=b(n);
-m.y+=g(n);}}n=n.offsetParent;}if(Browser.firefox&&!c(this)){m.x-=b(this);m.y-=g(this);}return m;},getPosition:function(p){if(a(this)){return{x:0,y:0};}var q=this.getOffsets(),n=this.getScrolls();
-var m={x:q.x-n.x,y:q.y-n.y};if(p&&(p=document.id(p))){var o=p.getPosition();return{x:m.x-o.x-b(p),y:m.y-o.y-g(p)};}return m;},getCoordinates:function(o){if(a(this)){return this.getWindow().getCoordinates();
-}var m=this.getPosition(o),n=this.getSize();var p={left:m.x,top:m.y,width:n.x,height:n.y};p.right=p.left+p.width;p.bottom=p.top+p.height;return p;},computePosition:function(m){return{left:m.x-j(this,"margin-left"),top:m.y-j(this,"margin-top")};
-},setPosition:function(m){return this.setStyles(this.computePosition(m));}});[Document,Window].invoke("implement",{getSize:function(){var m=f(this);return{x:m.clientWidth,y:m.clientHeight};
-},getScroll:function(){var n=this.getWindow(),m=f(this);return{x:n.pageXOffset||m.scrollLeft,y:n.pageYOffset||m.scrollTop};},getScrollSize:function(){var o=f(this),n=this.getSize(),m=this.getDocument().body;
-return{x:Math.max(o.scrollWidth,m.scrollWidth,n.x),y:Math.max(o.scrollHeight,m.scrollHeight,n.y)};},getPosition:function(){return{x:0,y:0};},getCoordinates:function(){var m=this.getSize();
-return{top:0,left:0,bottom:m.y,right:m.x,height:m.y,width:m.x};}});var k=Element.getComputedStyle;function j(m,n){return k(m,n).toInt()||0;}function c(m){return k(m,"-moz-box-sizing")=="border-box";
-}function g(m){return j(m,"border-top-width");}function b(m){return j(m,"border-left-width");}function a(m){return(/^(?:body|html)$/i).test(m.tagName);
-}function f(m){var n=m.getDocument();return(!n.compatMode||n.compatMode=="CSS1Compat")?n.html:n.body;}})();Element.alias({position:"setPosition"});[Window,Document,Element].invoke("implement",{getHeight:function(){return this.getSize().y;
-},getWidth:function(){return this.getSize().x;},getScrollTop:function(){return this.getScroll().y;},getScrollLeft:function(){return this.getScroll().x;
-},getScrollHeight:function(){return this.getScrollSize().y;},getScrollWidth:function(){return this.getScrollSize().x;},getTop:function(){return this.getPosition().y;
-},getLeft:function(){return this.getPosition().x;}});(function(){var f=this.Fx=new Class({Implements:[Chain,Events,Options],options:{fps:60,unit:false,duration:500,frames:null,frameSkip:true,link:"ignore"},initialize:function(g){this.subject=this.subject||this;
-this.setOptions(g);},getTransition:function(){return function(g){return -(Math.cos(Math.PI*g)-1)/2;};},step:function(g){if(this.options.frameSkip){var h=(this.time!=null)?(g-this.time):0,i=h/this.frameInterval;
-this.time=g;this.frame+=i;}else{this.frame++;}if(this.frame<this.frames){var j=this.transition(this.frame/this.frames);this.set(this.compute(this.from,this.to,j));
-}else{this.frame=this.frames;this.set(this.compute(this.from,this.to,1));this.stop();}},set:function(g){return g;},compute:function(i,h,g){return f.compute(i,h,g);
-},check:function(){if(!this.isRunning()){return true;}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.pass(arguments,this));
-return false;}return false;},start:function(k,j){if(!this.check(k,j)){return this;}this.from=k;this.to=j;this.frame=(this.options.frameSkip)?0:-1;this.time=null;
-this.transition=this.getTransition();var i=this.options.frames,h=this.options.fps,g=this.options.duration;this.duration=f.Durations[g]||g.toInt();this.frameInterval=1000/h;
-this.frames=i||Math.round(this.duration/this.frameInterval);this.fireEvent("start",this.subject);b.call(this,h);return this;},stop:function(){if(this.isRunning()){this.time=null;
-d.call(this,this.options.fps);if(this.frames==this.frame){this.fireEvent("complete",this.subject);if(!this.callChain()){this.fireEvent("chainComplete",this.subject);
-}}else{this.fireEvent("stop",this.subject);}}return this;},cancel:function(){if(this.isRunning()){this.time=null;d.call(this,this.options.fps);this.frame=this.frames;
-this.fireEvent("cancel",this.subject).clearChain();}return this;},pause:function(){if(this.isRunning()){this.time=null;d.call(this,this.options.fps);}return this;
-},resume:function(){if((this.frame<this.frames)&&!this.isRunning()){b.call(this,this.options.fps);}return this;},isRunning:function(){var g=e[this.options.fps];
-return g&&g.contains(this);}});f.compute=function(i,h,g){return(h-i)*g+i;};f.Durations={"short":250,normal:500,"long":1000};var e={},c={};var a=function(){var h=Date.now();
-for(var j=this.length;j--;){var g=this[j];if(g){g.step(h);}}};var b=function(h){var g=e[h]||(e[h]=[]);g.push(this);if(!c[h]){c[h]=a.periodical(Math.round(1000/h),g);
-}};var d=function(h){var g=e[h];if(g){g.erase(this);if(!g.length&&c[h]){delete e[h];c[h]=clearInterval(c[h]);}}};})();Fx.CSS=new Class({Extends:Fx,prepare:function(c,d,b){b=Array.from(b);
-if(b[1]==null){b[1]=b[0];b[0]=c.getStyle(d);}var a=b.map(this.parse);return{from:a[0],to:a[1]};},parse:function(a){a=Function.from(a)();a=(typeof a=="string")?a.split(" "):Array.from(a);
-return a.map(function(c){c=String(c);var b=false;Object.each(Fx.CSS.Parsers,function(f,e){if(b){return;}var d=f.parse(c);if(d||d===0){b={value:d,parser:f};
-}});b=b||{value:c,parser:Fx.CSS.Parsers.String};return b;});},compute:function(d,c,b){var a=[];(Math.min(d.length,c.length)).times(function(e){a.push({value:d[e].parser.compute(d[e].value,c[e].value,b),parser:d[e].parser});
-});a.$family=Function.from("fx:css:value");return a;},serve:function(c,b){if(typeOf(c)!="fx:css:value"){c=this.parse(c);}var a=[];c.each(function(d){a=a.concat(d.parser.serve(d.value,b));
-});return a;},render:function(a,d,c,b){a.setStyle(d,this.serve(c,b));},search:function(a){if(Fx.CSS.Cache[a]){return Fx.CSS.Cache[a];}var c={},b=new RegExp("^"+a.escapeRegExp()+"$");
-Array.each(document.styleSheets,function(f,e){var d=f.href;if(d&&d.contains("://")&&!d.contains(document.domain)){return;}var g=f.rules||f.cssRules;Array.each(g,function(k,h){if(!k.style){return;
-}var j=(k.selectorText)?k.selectorText.replace(/^\w+/,function(i){return i.toLowerCase();}):null;if(!j||!b.test(j)){return;}Object.each(Element.Styles,function(l,i){if(!k.style[i]||Element.ShortStyles[i]){return;
-}l=String(k.style[i]);c[i]=((/^rgb/).test(l))?l.rgbToHex():l;});});});return Fx.CSS.Cache[a]=c;}});Fx.CSS.Cache={};Fx.CSS.Parsers={Color:{parse:function(a){if(a.match(/^#[0-9a-f]{3,6}$/i)){return a.hexToRgb(true);
-}return((a=a.match(/(\d+),\s*(\d+),\s*(\d+)/)))?[a[1],a[2],a[3]]:false;},compute:function(c,b,a){return c.map(function(e,d){return Math.round(Fx.compute(c[d],b[d],a));
-});},serve:function(a){return a.map(Number);}},Number:{parse:parseFloat,compute:Fx.compute,serve:function(b,a){return(a)?b+a:b;}},String:{parse:Function.from(false),compute:function(b,a){return a;
-},serve:function(a){return a;}}};Fx.Tween=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a);},set:function(b,a){if(arguments.length==1){a=b;
-b=this.property||this.options.property;}this.render(this.element,b,a,this.options.unit);return this;},start:function(c,e,d){if(!this.check(c,e,d)){return this;
-}var b=Array.flatten(arguments);this.property=this.options.property||b.shift();var a=this.prepare(this.element,this.property,b);return this.parent(a.from,a.to);
-}});Element.Properties.tween={set:function(a){this.get("tween").cancel().setOptions(a);return this;},get:function(){var a=this.retrieve("tween");if(!a){a=new Fx.Tween(this,{link:"cancel"});
-this.store("tween",a);}return a;}};Element.implement({tween:function(a,c,b){this.get("tween").start(arguments);return this;},fade:function(c){var e=this.get("tween"),d="opacity",a;
-c=[c,"toggle"].pick();switch(c){case"in":e.start(d,1);break;case"out":e.start(d,0);break;case"show":e.set(d,1);break;case"hide":e.set(d,0);break;case"toggle":var b=this.retrieve("fade:flag",this.get("opacity")==1);
-e.start(d,(b)?0:1);this.store("fade:flag",!b);a=true;break;default:e.start(d,arguments);}if(!a){this.eliminate("fade:flag");}return this;},highlight:function(c,a){if(!a){a=this.retrieve("highlight:original",this.getStyle("background-color"));
-a=(a=="transparent")?"#fff":a;}var b=this.get("tween");b.start("background-color",c||"#ffff88",a).chain(function(){this.setStyle("background-color",this.retrieve("highlight:original"));
-b.callChain();}.bind(this));return this;}});Fx.Morph=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a);
-},set:function(a){if(typeof a=="string"){a=this.search(a);}for(var b in a){this.render(this.element,b,a[b],this.options.unit);}return this;},compute:function(e,d,c){var a={};
-for(var b in e){a[b]=this.parent(e[b],d[b],c);}return a;},start:function(b){if(!this.check(b)){return this;}if(typeof b=="string"){b=this.search(b);}var e={},d={};
-for(var c in b){var a=this.prepare(this.element,c,b[c]);e[c]=a.from;d[c]=a.to;}return this.parent(e,d);}});Element.Properties.morph={set:function(a){this.get("morph").cancel().setOptions(a);
-return this;},get:function(){var a=this.retrieve("morph");if(!a){a=new Fx.Morph(this,{link:"cancel"});this.store("morph",a);}return a;}};Element.implement({morph:function(a){this.get("morph").start(a);
-return this;}});Fx.implement({getTransition:function(){var a=this.options.transition||Fx.Transitions.Sine.easeInOut;if(typeof a=="string"){var b=a.split(":");
-a=Fx.Transitions;a=a[b[0]]||a[b[0].capitalize()];if(b[1]){a=a["ease"+b[1].capitalize()+(b[2]?b[2].capitalize():"")];}}return a;}});Fx.Transition=function(c,b){b=Array.from(b);
-var a=function(d){return c(d,b);};return Object.append(a,{easeIn:a,easeOut:function(d){return 1-c(1-d,b);},easeInOut:function(d){return(d<=0.5?c(2*d,b):(2-c(2*(1-d),b)))/2;
-}});};Fx.Transitions={linear:function(a){return a;}};Fx.Transitions.extend=function(a){for(var b in a){Fx.Transitions[b]=new Fx.Transition(a[b]);}};Fx.Transitions.extend({Pow:function(b,a){return Math.pow(b,a&&a[0]||6);
-},Expo:function(a){return Math.pow(2,8*(a-1));},Circ:function(a){return 1-Math.sin(Math.acos(a));},Sine:function(a){return 1-Math.cos(a*Math.PI/2);},Back:function(b,a){a=a&&a[0]||1.618;
-return Math.pow(b,2)*((a+1)*b-a);},Bounce:function(f){var e;for(var d=0,c=1;1;d+=c,c/=2){if(f>=(7-4*d)/11){e=c*c-Math.pow((11-6*d-11*f)/4,2);break;}}return e;
-},Elastic:function(b,a){return Math.pow(2,10*--b)*Math.cos(20*b*Math.PI*(a&&a[0]||1)/3);}});["Quad","Cubic","Quart","Quint"].each(function(b,a){Fx.Transitions[b]=new Fx.Transition(function(c){return Math.pow(c,a+2);
-});});(function(){var d=function(){},a=("onprogress" in new Browser.Request);var c=this.Request=new Class({Implements:[Chain,Events,Options],options:{url:"",data:"",headers:{"X-Requested-With":"XMLHttpRequest",Accept:"text/javascript, text/html, application/xml, text/xml, */*"},async:true,format:false,method:"post",link:"ignore",isSuccess:null,emulation:true,urlEncoded:true,encoding:"utf-8",evalScripts:false,evalResponse:false,timeout:0,noCache:false},initialize:function(e){this.xhr=new Browser.Request();
-this.setOptions(e);this.headers=this.options.headers;},onStateChange:function(){var e=this.xhr;if(e.readyState!=4||!this.running){return;}this.running=false;
-this.status=0;Function.attempt(function(){var f=e.status;this.status=(f==1223)?204:f;}.bind(this));e.onreadystatechange=d;if(a){e.onprogress=e.onloadstart=d;
-}clearTimeout(this.timer);this.response={text:this.xhr.responseText||"",xml:this.xhr.responseXML};if(this.options.isSuccess.call(this,this.status)){this.success(this.response.text,this.response.xml);
-}else{this.failure();}},isSuccess:function(){var e=this.status;return(e>=200&&e<300);},isRunning:function(){return !!this.running;},processScripts:function(e){if(this.options.evalResponse||(/(ecma|java)script/).test(this.getHeader("Content-type"))){return Browser.exec(e);
-}return e.stripScripts(this.options.evalScripts);},success:function(f,e){this.onSuccess(this.processScripts(f),e);},onSuccess:function(){this.fireEvent("complete",arguments).fireEvent("success",arguments).callChain();
-},failure:function(){this.onFailure();},onFailure:function(){this.fireEvent("complete").fireEvent("failure",this.xhr);},loadstart:function(e){this.fireEvent("loadstart",[e,this.xhr]);
-},progress:function(e){this.fireEvent("progress",[e,this.xhr]);},timeout:function(){this.fireEvent("timeout",this.xhr);},setHeader:function(e,f){this.headers[e]=f;
-return this;},getHeader:function(e){return Function.attempt(function(){return this.xhr.getResponseHeader(e);}.bind(this));},check:function(){if(!this.running){return true;
-}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.pass(arguments,this));return false;}return false;},send:function(o){if(!this.check(o)){return this;
-}this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.running=true;var l=typeOf(o);if(l=="string"||l=="element"){o={data:o};}var h=this.options;
-o=Object.append({data:h.data,url:h.url,method:h.method},o);var j=o.data,f=String(o.url),e=o.method.toLowerCase();switch(typeOf(j)){case"element":j=document.id(j).toQueryString();
-break;case"object":case"hash":j=Object.toQueryString(j);}if(this.options.format){var m="format="+this.options.format;j=(j)?m+"&"+j:m;}if(this.options.emulation&&!["get","post"].contains(e)){var k="_method="+e;
-j=(j)?k+"&"+j:k;e="post";}if(this.options.urlEncoded&&["post","put"].contains(e)){var g=(this.options.encoding)?"; charset="+this.options.encoding:"";this.headers["Content-type"]="application/x-www-form-urlencoded"+g;
-}if(!f){f=document.location.pathname;}var i=f.lastIndexOf("/");if(i>-1&&(i=f.indexOf("#"))>-1){f=f.substr(0,i);}if(this.options.noCache){f+=(f.contains("?")?"&":"?")+String.uniqueID();
-}if(j&&e=="get"){f+=(f.contains("?")?"&":"?")+j;j=null;}var n=this.xhr;if(a){n.onloadstart=this.loadstart.bind(this);n.onprogress=this.progress.bind(this);
-}n.open(e.toUpperCase(),f,this.options.async,this.options.user,this.options.password);if(this.options.user&&"withCredentials" in n){n.withCredentials=true;
-}n.onreadystatechange=this.onStateChange.bind(this);Object.each(this.headers,function(q,p){try{n.setRequestHeader(p,q);}catch(r){this.fireEvent("exception",[p,q]);
-}},this);this.fireEvent("request");n.send(j);if(!this.options.async){this.onStateChange();}if(this.options.timeout){this.timer=this.timeout.delay(this.options.timeout,this);
-}return this;},cancel:function(){if(!this.running){return this;}this.running=false;var e=this.xhr;e.abort();clearTimeout(this.timer);e.onreadystatechange=d;
-if(a){e.onprogress=e.onloadstart=d;}this.xhr=new Browser.Request();this.fireEvent("cancel");return this;}});var b={};["get","post","put","delete","GET","POST","PUT","DELETE"].each(function(e){b[e]=function(g){var f={method:e};
-if(g!=null){f.data=g;}return this.send(f);};});c.implement(b);Element.Properties.send={set:function(e){var f=this.get("send").cancel();f.setOptions(e);
-return this;},get:function(){var e=this.retrieve("send");if(!e){e=new c({data:this,link:"cancel",method:this.get("method")||"post",url:this.get("action")});
-this.store("send",e);}return e;}};Element.implement({send:function(e){var f=this.get("send");f.send({data:this,url:e||f.options.url});return this;}});})();
-Request.HTML=new Class({Extends:Request,options:{update:false,append:false,evalScripts:true,filter:false,headers:{Accept:"text/html, application/xml, text/xml, */*"}},success:function(e){var d=this.options,b=this.response;
-b.html=e.stripScripts(function(f){b.javascript=f;});var c=b.html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);if(c){b.html=c[1];}var a=new Element("div").set("html",b.html);
-b.tree=a.childNodes;b.elements=a.getElements("*");if(d.filter){b.tree=b.elements.filter(d.filter);}if(d.update){document.id(d.update).empty().set("html",b.html);
-}else{if(d.append){document.id(d.append).adopt(a.getChildren());}}if(d.evalScripts){Browser.exec(b.javascript);}this.onSuccess(b.tree,b.elements,b.html,b.javascript);
-}});Element.Properties.load={set:function(a){var b=this.get("load").cancel();b.setOptions(a);return this;},get:function(){var a=this.retrieve("load");if(!a){a=new Request.HTML({data:this,link:"cancel",update:this,method:"get"});
-this.store("load",a);}return a;}};Element.implement({load:function(){this.get("load").send(Array.link(arguments,{data:Type.isObject,url:Type.isString}));
-return this;}});if(typeof JSON=="undefined"){this.JSON={};}(function(){var special={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"};
-var escape=function(chr){return special[chr]||"\\u"+("0000"+chr.charCodeAt(0).toString(16)).slice(-4);};JSON.validate=function(string){string=string.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"");
-return(/^[\],:{}\s]*$/).test(string);};JSON.encode=JSON.stringify?function(obj){return JSON.stringify(obj);}:function(obj){if(obj&&obj.toJSON){obj=obj.toJSON();
-}switch(typeOf(obj)){case"string":return'"'+obj.replace(/[\x00-\x1f\\"]/g,escape)+'"';case"array":return"["+obj.map(JSON.encode).clean()+"]";case"object":case"hash":var string=[];
-Object.each(obj,function(value,key){var json=JSON.encode(value);if(json){string.push(JSON.encode(key)+":"+json);}});return"{"+string+"}";case"number":case"boolean":return""+obj;
-case"null":return"null";}return null;};JSON.decode=function(string,secure){if(!string||typeOf(string)!="string"){return null;}if(secure||JSON.secure){if(JSON.parse){return JSON.parse(string);
-}if(!JSON.validate(string)){throw new Error("JSON could not decode the input; security is enabled and the value is not secure.");}}return eval("("+string+")");
-};})();Request.JSON=new Class({Extends:Request,options:{secure:true},initialize:function(a){this.parent(a);Object.append(this.headers,{Accept:"application/json","X-Request":"JSON"});
-},success:function(c){var b;try{b=this.response.json=JSON.decode(c,this.options.secure);}catch(a){this.fireEvent("error",[c,a]);return;}if(b==null){this.onFailure();
-}else{this.onSuccess(b,c);}}});var Cookie=new Class({Implements:Options,options:{path:"/",domain:false,duration:false,secure:false,document:document,encode:true},initialize:function(b,a){this.key=b;
-this.setOptions(a);},write:function(b){if(this.options.encode){b=encodeURIComponent(b);}if(this.options.domain){b+="; domain="+this.options.domain;}if(this.options.path){b+="; path="+this.options.path;
-}if(this.options.duration){var a=new Date();a.setTime(a.getTime()+this.options.duration*24*60*60*1000);b+="; expires="+a.toGMTString();}if(this.options.secure){b+="; secure";
-}this.options.document.cookie=this.key+"="+b;return this;},read:function(){var a=this.options.document.cookie.match("(?:^|;)\\s*"+this.key.escapeRegExp()+"=([^;]*)");
-return(a)?decodeURIComponent(a[1]):null;},dispose:function(){new Cookie(this.key,Object.merge({},this.options,{duration:-1})).write("");return this;}});
-Cookie.write=function(b,c,a){return new Cookie(b,a).write(c);};Cookie.read=function(a){return new Cookie(a).read();};Cookie.dispose=function(b,a){return new Cookie(b,a).dispose();
-};(function(i,k){var l,f,e=[],c,b,d=k.createElement("div");var g=function(){clearTimeout(b);if(l){return;}Browser.loaded=l=true;k.removeListener("DOMContentLoaded",g).removeListener("readystatechange",a);
-k.fireEvent("domready");i.fireEvent("domready");};var a=function(){for(var m=e.length;m--;){if(e[m]()){g();return true;}}return false;};var j=function(){clearTimeout(b);
-if(!a()){b=setTimeout(j,10);}};k.addListener("DOMContentLoaded",g);var h=function(){try{d.doScroll();return true;}catch(m){}return false;};if(d.doScroll&&!h()){e.push(h);
-c=true;}if(k.readyState){e.push(function(){var m=k.readyState;return(m=="loaded"||m=="complete");});}if("onreadystatechange" in k){k.addListener("readystatechange",a);
-}else{c=true;}if(c){j();}Element.Events.domready={onAdd:function(m){if(l){m.call(this);}}};Element.Events.load={base:"load",onAdd:function(m){if(f&&this==i){m.call(this);
-}},condition:function(){if(this==i){g();delete Element.Events.load;}return true;}};i.addEvent("load",function(){f=true;});})(window,document);(function(){var Swiff=this.Swiff=new Class({Implements:Options,options:{id:null,height:1,width:1,container:null,properties:{},params:{quality:"high",allowScriptAccess:"always",wMode:"window",swLiveConnect:true},callBacks:{},vars:{}},toElement:function(){return this.object;
-},initialize:function(path,options){this.instance="Swiff_"+String.uniqueID();this.setOptions(options);options=this.options;var id=this.id=options.id||this.instance;
-var container=document.id(options.container);Swiff.CallBacks[this.instance]={};var params=options.params,vars=options.vars,callBacks=options.callBacks;
-var properties=Object.append({height:options.height,width:options.width},options.properties);var self=this;for(var callBack in callBacks){Swiff.CallBacks[this.instance][callBack]=(function(option){return function(){return option.apply(self.object,arguments);
-};})(callBacks[callBack]);vars[callBack]="Swiff.CallBacks."+this.instance+"."+callBack;}params.flashVars=Object.toQueryString(vars);if(Browser.ie){properties.classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
-params.movie=path;}else{properties.type="application/x-shockwave-flash";}properties.data=path;var build='<object id="'+id+'"';for(var property in properties){build+=" "+property+'="'+properties[property]+'"';
-}build+=">";for(var param in params){if(params[param]){build+='<param name="'+param+'" value="'+params[param]+'" />';}}build+="</object>";this.object=((container)?container.empty():new Element("div")).set("html",build).firstChild;
-},replaces:function(element){element=document.id(element,true);element.parentNode.replaceChild(this.toElement(),element);return this;},inject:function(element){document.id(element,true).appendChild(this.toElement());
-return this;},remote:function(){return Swiff.remote.apply(Swiff,[this.toElement()].append(arguments));}});Swiff.CallBacks={};Swiff.remote=function(obj,fn){var rs=obj.CallFunction('<invoke name="'+fn+'" returntype="javascript">'+__flash__argumentsToXML(arguments,2)+"</invoke>");
-return eval(rs);};})();
\ No newline at end of file
diff --git a/web/tools/mootools/mootools-core-1.3.2-nc.js b/web/tools/mootools/mootools-core-1.4.5-compat.js
similarity index 76%
rename from web/tools/mootools/mootools-core-1.3.2-nc.js
rename to web/tools/mootools/mootools-core-1.4.5-compat.js
index cba97ef7f..574c9411a 100644
--- a/web/tools/mootools/mootools-core-1.3.2-nc.js
+++ b/web/tools/mootools/mootools-core-1.4.5-compat.js
@@ -3,10 +3,13 @@
 MooTools: the javascript framework
 
 web build:
- - http://mootools.net/core/7c56cfef9dddcf170a5d68e3fb61cfd7
+ - http://mootools.net/core/76bf47062d6c1983d66ce47ad66aa0e0
 
 packager build:
- - packager build Core/Core Core/Array Core/String Core/Number Core/Function Core/Object Core/Event Core/Browser Core/Class Core/Class.Extras Core/Slick.Parser Core/Slick.Finder Core/Element Core/Element.Style Core/Element.Event Core/Element.Dimensions Core/Fx Core/Fx.CSS Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request Core/Request.HTML Core/Request.JSON Core/Cookie Core/JSON Core/DOMReady Core/Swiff
+ - packager build Core/Core Core/Array Core/String Core/Number Core/Function Core/Object Core/Event Core/Browser Core/Class Core/Class.Extras Core/Slick.Parser Core/Slick.Finder Core/Element Core/Element.Style Core/Element.Event Core/Element.Delegation Core/Element.Dimensions Core/Fx Core/Fx.CSS Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request Core/Request.HTML Core/Request.JSON Core/Cookie Core/JSON Core/DOMReady Core/Swiff
+
+...
+*/
 
 /*
 ---
@@ -17,7 +20,7 @@ description: The heart of MooTools.
 
 license: MIT-style license.
 
-copyright: Copyright (c) 2006-2010 [Valerio Proietti](http://mad4milk.net/).
+copyright: Copyright (c) 2006-2012 [Valerio Proietti](http://mad4milk.net/).
 
 authors: The MooTools production team (http://mootools.net/developers/)
 
@@ -33,15 +36,15 @@ provides: [Core, MooTools, Type, typeOf, instanceOf, Native]
 (function(){
 
 this.MooTools = {
-	version: '1.3.2',
-	build: 'c9f1ff10e9e7facb65e9481049ed1b450959d587'
+	version: '1.4.5',
+	build: 'ab8ea8824dc3b24b6666867a2c4ed58ebb762cf0'
 };
 
 // typeOf, instanceOf
 
 var typeOf = this.typeOf = function(item){
 	if (item == null) return 'null';
-	if (item.$family) return item.$family();
+	if (item.$family != null) return item.$family();
 
 	if (item.nodeName){
 		if (item.nodeType == 1) return 'element';
@@ -61,6 +64,9 @@ var instanceOf = this.instanceOf = function(item, object){
 		if (constructor === object) return true;
 		constructor = constructor.parent;
 	}
+	/*<ltIE8>*/
+	if (!item.hasOwnProperty) return false;
+	/*</ltIE8>*/
 	return item instanceof object;
 };
 
@@ -93,8 +99,9 @@ Function.prototype.overloadGetter = function(usePlural){
 	var self = this;
 	return function(a){
 		var args, result;
-		if (usePlural || typeof a != 'string') args = a;
+		if (typeof a != 'string') args = a;
 		else if (arguments.length > 1) args = arguments;
+		else if (usePlural) args = [a];
 		if (args){
 			result = {};
 			for (var i = 0; i < args.length; i++) result[args[i]] = self.call(this, args[i]);
@@ -167,7 +174,9 @@ var Type = this.Type = function(name, object){
 			object.prototype.$family = (function(){
 				return lower;
 			}).hide();
-			
+			//<1.2compat>
+			object.type = typeCheck;
+			//</1.2compat>
 		}
 	}
 
@@ -203,7 +212,7 @@ var implement = function(name, method){
 		if (typeOf(hook) == 'type') implement.call(hook, name, method);
 		else hook.call(this, name, method);
 	}
-	
+
 	var previous = this.prototype[name];
 	if (previous == null || !previous.$protected) this.prototype[name] = method;
 
@@ -251,21 +260,25 @@ var force = function(name, object, methods){
 			proto = prototype[key];
 
 		if (generic) generic.protect();
-
-		if (isType && proto){
-			delete prototype[key];
-			prototype[key] = proto.protect();
-		}
+		if (isType && proto) object.implement(key, proto.protect());
 	}
 
-	if (isType) object.implement(prototype);
+	if (isType){
+		var methodsEnumerable = prototype.propertyIsEnumerable(methods[0]);
+		object.forEachMethod = function(fn){
+			if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++){
+				fn.call(prototype, prototype[methods[i]], methods[i]);
+			}
+			for (var key in prototype) fn.call(prototype, prototype[key], key)
+		};
+	}
 
 	return force;
 };
 
 force('String', String, [
 	'charAt', 'charCodeAt', 'concat', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
-	'slice', 'split', 'substr', 'substring', 'toLowerCase', 'toUpperCase'
+	'slice', 'split', 'substr', 'substring', 'trim', 'toLowerCase', 'toUpperCase'
 ])('Array', Array, [
 	'pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice',
 	'indexOf', 'lastIndexOf', 'filter', 'forEach', 'every', 'map', 'some', 'reduce', 'reduceRight'
@@ -396,7 +409,125 @@ String.extend('uniqueID', function(){
 	return (UID++).toString(36);
 });
 
+//<1.2compat>
 
+var Hash = this.Hash = new Type('Hash', function(object){
+	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
+	for (var key in object) this[key] = object[key];
+	return this;
+});
+
+Hash.implement({
+
+	forEach: function(fn, bind){
+		Object.forEach(this, fn, bind);
+	},
+
+	getClean: function(){
+		var clean = {};
+		for (var key in this){
+			if (this.hasOwnProperty(key)) clean[key] = this[key];
+		}
+		return clean;
+	},
+
+	getLength: function(){
+		var length = 0;
+		for (var key in this){
+			if (this.hasOwnProperty(key)) length++;
+		}
+		return length;
+	}
+
+});
+
+Hash.alias('each', 'forEach');
+
+Object.type = Type.isObject;
+
+var Native = this.Native = function(properties){
+	return new Type(properties.name, properties.initialize);
+};
+
+Native.type = Type.type;
+
+Native.implement = function(objects, methods){
+	for (var i = 0; i < objects.length; i++) objects[i].implement(methods);
+	return Native;
+};
+
+var arrayType = Array.type;
+Array.type = function(item){
+	return instanceOf(item, Array) || arrayType(item);
+};
+
+this.$A = function(item){
+	return Array.from(item).slice();
+};
+
+this.$arguments = function(i){
+	return function(){
+		return arguments[i];
+	};
+};
+
+this.$chk = function(obj){
+	return !!(obj || obj === 0);
+};
+
+this.$clear = function(timer){
+	clearTimeout(timer);
+	clearInterval(timer);
+	return null;
+};
+
+this.$defined = function(obj){
+	return (obj != null);
+};
+
+this.$each = function(iterable, fn, bind){
+	var type = typeOf(iterable);
+	((type == 'arguments' || type == 'collection' || type == 'array' || type == 'elements') ? Array : Object).each(iterable, fn, bind);
+};
+
+this.$empty = function(){};
+
+this.$extend = function(original, extended){
+	return Object.append(original, extended);
+};
+
+this.$H = function(object){
+	return new Hash(object);
+};
+
+this.$merge = function(){
+	var args = Array.slice(arguments);
+	args.unshift({});
+	return Object.merge.apply(null, args);
+};
+
+this.$lambda = Function.from;
+this.$mixin = Object.merge;
+this.$random = Number.random;
+this.$splat = Array.from;
+this.$time = Date.now;
+
+this.$type = function(object){
+	var type = typeOf(object);
+	if (type == 'elements') return 'array';
+	return (type == 'null') ? false : type;
+};
+
+this.$unlink = function(object){
+	switch (typeOf(object)){
+		case 'object': return Object.clone(object);
+		case 'array': return Array.clone(object);
+		case 'hash': return new Hash(object);
+		default: return object;
+	}
+};
+
+//</1.2compat>
 
 })();
 
@@ -421,7 +552,7 @@ Array.implement({
 
 	/*<!ES5>*/
 	every: function(fn, bind){
-		for (var i = 0, l = this.length; i < l; i++){
+		for (var i = 0, l = this.length >>> 0; i < l; i++){
 			if ((i in this) && !fn.call(bind, this[i], i, this)) return false;
 		}
 		return true;
@@ -429,30 +560,31 @@ Array.implement({
 
 	filter: function(fn, bind){
 		var results = [];
-		for (var i = 0, l = this.length; i < l; i++){
-			if ((i in this) && fn.call(bind, this[i], i, this)) results.push(this[i]);
+		for (var value, i = 0, l = this.length >>> 0; i < l; i++) if (i in this){
+			value = this[i];
+			if (fn.call(bind, value, i, this)) results.push(value);
 		}
 		return results;
 	},
 
 	indexOf: function(item, from){
-		var len = this.length;
-		for (var i = (from < 0) ? Math.max(0, len + from) : from || 0; i < len; i++){
+		var length = this.length >>> 0;
+		for (var i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++){
 			if (this[i] === item) return i;
 		}
 		return -1;
 	},
 
 	map: function(fn, bind){
-		var results = [];
-		for (var i = 0, l = this.length; i < l; i++){
+		var length = this.length >>> 0, results = Array(length);
+		for (var i = 0; i < length; i++){
 			if (i in this) results[i] = fn.call(bind, this[i], i, this);
 		}
 		return results;
 	},
 
 	some: function(fn, bind){
-		for (var i = 0, l = this.length; i < l; i++){
+		for (var i = 0, l = this.length >>> 0; i < l; i++){
 			if ((i in this) && fn.call(bind, this[i], i, this)) return true;
 		}
 		return false;
@@ -570,7 +702,15 @@ Array.implement({
 
 });
 
+//<1.2compat>
 
+Array.alias('extend', 'append');
+
+var $pick = function(){
+	return Array.from(arguments).pick();
+};
+
+//</1.2compat>
 
 
 /*
@@ -596,37 +736,37 @@ String.implement({
 	},
 
 	contains: function(string, separator){
-		return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : this.indexOf(string) > -1;
+		return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : String(this).indexOf(string) > -1;
 	},
 
 	trim: function(){
-		return this.replace(/^\s+|\s+$/g, '');
+		return String(this).replace(/^\s+|\s+$/g, '');
 	},
 
 	clean: function(){
-		return this.replace(/\s+/g, ' ').trim();
+		return String(this).replace(/\s+/g, ' ').trim();
 	},
 
 	camelCase: function(){
-		return this.replace(/-\D/g, function(match){
+		return String(this).replace(/-\D/g, function(match){
 			return match.charAt(1).toUpperCase();
 		});
 	},
 
 	hyphenate: function(){
-		return this.replace(/[A-Z]/g, function(match){
+		return String(this).replace(/[A-Z]/g, function(match){
 			return ('-' + match.charAt(0).toLowerCase());
 		});
 	},
 
 	capitalize: function(){
-		return this.replace(/\b[a-z]/g, function(match){
+		return String(this).replace(/\b[a-z]/g, function(match){
 			return match.toUpperCase();
 		});
 	},
 
 	escapeRegExp: function(){
-		return this.replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1');
+		return String(this).replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1');
 	},
 
 	toInt: function(base){
@@ -638,17 +778,17 @@ String.implement({
 	},
 
 	hexToRgb: function(array){
-		var hex = this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
+		var hex = String(this).match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
 		return (hex) ? hex.slice(1).hexToRgb(array) : null;
 	},
 
 	rgbToHex: function(array){
-		var rgb = this.match(/\d{1,3}/g);
+		var rgb = String(this).match(/\d{1,3}/g);
 		return (rgb) ? rgb.rgbToHex(array) : null;
 	},
 
 	substitute: function(object, regexp){
-		return this.replace(regexp || (/\\?\{([^{}]+)\}/g), function(match, name){
+		return String(this).replace(regexp || (/\\?\{([^{}]+)\}/g), function(match, name){
 			if (match.charAt(0) == '\\') return match.slice(1);
 			return (object[name] != null) ? object[name] : '';
 		});
@@ -746,22 +886,30 @@ Function.implement({
 		try {
 			return this.apply(bind, Array.from(args));
 		} catch (e){}
-		
+
 		return null;
 	},
 
-	/*<!ES5>*/
-	bind: function(bind){
+	/*<!ES5-bind>*/
+	bind: function(that){
 		var self = this,
-			args = (arguments.length > 1) ? Array.slice(arguments, 1) : null;
-		
-		return function(){
-			if (!args && !arguments.length) return self.call(bind);
-			if (args && arguments.length) return self.apply(bind, args.concat(Array.from(arguments)));
-			return self.apply(bind, args || arguments);
+			args = arguments.length > 1 ? Array.slice(arguments, 1) : null,
+			F = function(){};
+
+		var bound = function(){
+			var context = that, length = arguments.length;
+			if (this instanceof bound){
+				F.prototype = self.prototype;
+				context = new F;
+			}
+			var result = (!args && !length)
+				? self.call(context)
+				: self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
+			return context == that ? result : context;
 		};
+		return bound;
 	},
-	/*</!ES5>*/
+	/*</!ES5-bind>*/
 
 	pass: function(args, bind){
 		var self = this;
@@ -781,7 +929,56 @@ Function.implement({
 
 });
 
+//<1.2compat>
 
+delete Function.prototype.bind;
+
+Function.implement({
+
+	create: function(options){
+		var self = this;
+		options = options || {};
+		return function(event){
+			var args = options.arguments;
+			args = (args != null) ? Array.from(args) : Array.slice(arguments, (options.event) ? 1 : 0);
+			if (options.event) args = [event || window.event].extend(args);
+			var returns = function(){
+				return self.apply(options.bind || null, args);
+			};
+			if (options.delay) return setTimeout(returns, options.delay);
+			if (options.periodical) return setInterval(returns, options.periodical);
+			if (options.attempt) return Function.attempt(returns);
+			return returns();
+		};
+	},
+
+	bind: function(bind, args){
+		var self = this;
+		if (args != null) args = Array.from(args);
+		return function(){
+			return self.apply(bind, args || arguments);
+		};
+	},
+
+	bindWithEvent: function(bind, args){
+		var self = this;
+		if (args != null) args = Array.from(args);
+		return function(event){
+			return self.apply(bind, (args == null) ? arguments : [event].concat(args));
+		};
+	},
+
+	run: function(args, bind){
+		return this.apply(bind, Array.from(args));
+	}
+
+});
+
+if (Object.create == Function.prototype.create) Object.create = null;
+
+var $try = Function.attempt;
+
+//</1.2compat>
 
 
 /*
@@ -904,7 +1101,95 @@ Object.extend({
 
 })();
 
+//<1.2compat>
 
+Hash.implement({
+
+	has: Object.prototype.hasOwnProperty,
+
+	keyOf: function(value){
+		return Object.keyOf(this, value);
+	},
+
+	hasValue: function(value){
+		return Object.contains(this, value);
+	},
+
+	extend: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.set(this, key, value);
+		}, this);
+		return this;
+	},
+
+	combine: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.include(this, key, value);
+		}, this);
+		return this;
+	},
+
+	erase: function(key){
+		if (this.hasOwnProperty(key)) delete this[key];
+		return this;
+	},
+
+	get: function(key){
+		return (this.hasOwnProperty(key)) ? this[key] : null;
+	},
+
+	set: function(key, value){
+		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
+		return this;
+	},
+
+	empty: function(){
+		Hash.each(this, function(value, key){
+			delete this[key];
+		}, this);
+		return this;
+	},
+
+	include: function(key, value){
+		if (this[key] == null) this[key] = value;
+		return this;
+	},
+
+	map: function(fn, bind){
+		return new Hash(Object.map(this, fn, bind));
+	},
+
+	filter: function(fn, bind){
+		return new Hash(Object.filter(this, fn, bind));
+	},
+
+	every: function(fn, bind){
+		return Object.every(this, fn, bind);
+	},
+
+	some: function(fn, bind){
+		return Object.some(this, fn, bind);
+	},
+
+	getKeys: function(){
+		return Object.keys(this);
+	},
+
+	getValues: function(){
+		return Object.values(this);
+	},
+
+	toQueryString: function(base){
+		return Object.toQueryString(this, base);
+	}
+
+});
+
+Hash.extend = Object.append;
+
+Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
+
+//</1.2compat>
 
 
 /*
@@ -928,17 +1213,6 @@ provides: [Browser, Window, Document]
 var document = this.document;
 var window = document.window = this;
 
-var UID = 1;
-
-this.$uid = (window.ActiveXObject) ? function(item){
-	return (item.uid || (item.uid = [UID++]))[0];
-} : function(item){
-	return item.uid || (item.uid = UID++);
-};
-
-$uid(window);
-$uid(document);
-
 var ua = navigator.userAgent.toLowerCase(),
 	platform = navigator.platform.toLowerCase(),
 	UA = ua.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/) || [null, 'unknown', 0],
@@ -1108,7 +1382,67 @@ try {
 }
 /*</ltIE9>*/
 
+//<1.2compat>
 
+if (Browser.Platform.ios) Browser.Platform.ipod = true;
+
+Browser.Engine = {};
+
+var setEngine = function(name, version){
+	Browser.Engine.name = name;
+	Browser.Engine[name + version] = true;
+	Browser.Engine.version = version;
+};
+
+if (Browser.ie){
+	Browser.Engine.trident = true;
+
+	switch (Browser.version){
+		case 6: setEngine('trident', 4); break;
+		case 7: setEngine('trident', 5); break;
+		case 8: setEngine('trident', 6);
+	}
+}
+
+if (Browser.firefox){
+	Browser.Engine.gecko = true;
+
+	if (Browser.version >= 3) setEngine('gecko', 19);
+	else setEngine('gecko', 18);
+}
+
+if (Browser.safari || Browser.chrome){
+	Browser.Engine.webkit = true;
+
+	switch (Browser.version){
+		case 2: setEngine('webkit', 419); break;
+		case 3: setEngine('webkit', 420); break;
+		case 4: setEngine('webkit', 525);
+	}
+}
+
+if (Browser.opera){
+	Browser.Engine.presto = true;
+
+	if (Browser.version >= 9.6) setEngine('presto', 960);
+	else if (Browser.version >= 9.5) setEngine('presto', 950);
+	else setEngine('presto', 925);
+}
+
+if (Browser.name == 'unknown'){
+	switch ((ua.match(/(?:webkit|khtml|gecko)/) || [])[0]){
+		case 'webkit':
+		case 'khtml':
+			Browser.Engine.webkit = true;
+		break;
+		case 'gecko':
+			Browser.Engine.gecko = true;
+	}
+}
+
+this.$exec = Browser.exec;
+
+//</1.2compat>
 
 })();
 
@@ -1118,7 +1452,7 @@ try {
 
 name: Event
 
-description: Contains the Event Class, to make the event object cross-browser.
+description: Contains the Event Type, to make the event object cross-browser.
 
 license: MIT-style license.
 
@@ -1129,52 +1463,54 @@ provides: Event
 ...
 */
 
-var Event = new Type('Event', function(event, win){
+(function() {
+
+var _keys = {};
+
+var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
 	if (!win) win = window;
-	var doc = win.document;
 	event = event || win.event;
 	if (event.$extended) return event;
+	this.event = event;
 	this.$extended = true;
-	var type = event.type,
-		target = event.target || event.srcElement,
-		page = {},
-		client = {},
-		related = null,
-		rightClick, wheel, code, key;
+	this.shift = event.shiftKey;
+	this.control = event.ctrlKey;
+	this.alt = event.altKey;
+	this.meta = event.metaKey;
+	var type = this.type = event.type;
+	var target = event.target || event.srcElement;
 	while (target && target.nodeType == 3) target = target.parentNode;
+	this.target = document.id(target);
 
-	if (type.indexOf('key') != -1){
-		code = event.which || event.keyCode;
-		key = Object.keyOf(Event.Keys, code);
+	if (type.indexOf('key') == 0){
+		var code = this.code = (event.which || event.keyCode);
+		this.key = _keys[code]/*<1.3compat>*/ || Object.keyOf(Event.Keys, code)/*</1.3compat>*/;
 		if (type == 'keydown'){
-			var fKey = code - 111;
-			if (fKey > 0 && fKey < 13) key = 'f' + fKey;
+			if (code > 111 && code < 124) this.key = 'f' + (code - 111);
+			else if (code > 95 && code < 106) this.key = code - 96;
 		}
-		if (!key) key = String.fromCharCode(code).toLowerCase();
-	} else if ((/click|mouse|menu/i).test(type)){
+		if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
+	} else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
+		var doc = win.document;
 		doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
-		page = {
+		this.page = {
 			x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
 			y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
 		};
-		client = {
+		this.client = {
 			x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
 			y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
 		};
-		if ((/DOMMouseScroll|mousewheel/).test(type)){
-			wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+		if (type == 'DOMMouseScroll' || type == 'mousewheel')
+			this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
+
+		this.rightClick = (event.which == 3 || event.button == 2);
+		if (type == 'mouseover' || type == 'mouseout'){
+			var related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
+			while (related && related.nodeType == 3) related = related.parentNode;
+			this.relatedTarget = document.id(related);
 		}
-		rightClick = (event.which == 3) || (event.button == 2);
-		if ((/over|out/).test(type)){
-			related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
-			var testRelated = function(){
-				while (related && related.nodeType == 3) related = related.parentNode;
-				return true;
-			};
-			var hasRelated = (Browser.firefox2) ? testRelated.attempt() : testRelated();
-			related = (hasRelated) ? related : null;
-		}
-	} else if ((/gesture|touch/i).test(type)){
+	} else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
 		this.rotation = event.rotation;
 		this.scale = event.scale;
 		this.targetTouches = event.targetTouches;
@@ -1182,53 +1518,19 @@ var Event = new Type('Event', function(event, win){
 		var touches = this.touches = event.touches;
 		if (touches && touches[0]){
 			var touch = touches[0];
-			page = {x: touch.pageX, y: touch.pageY};
-			client = {x: touch.clientX, y: touch.clientY};
+			this.page = {x: touch.pageX, y: touch.pageY};
+			this.client = {x: touch.clientX, y: touch.clientY};
 		}
 	}
 
-	return Object.append(this, {
-		event: event,
-		type: type,
-
-		page: page,
-		client: client,
-		rightClick: rightClick,
-
-		wheel: wheel,
-
-		relatedTarget: document.id(related),
-		target: document.id(target),
-
-		code: code,
-		key: key,
-
-		shift: event.shiftKey,
-		control: event.ctrlKey,
-		alt: event.altKey,
-		meta: event.metaKey
-	});
+	if (!this.client) this.client = {};
+	if (!this.page) this.page = {};
 });
 
-Event.Keys = {
-	'enter': 13,
-	'up': 38,
-	'down': 40,
-	'left': 37,
-	'right': 39,
-	'esc': 27,
-	'space': 32,
-	'backspace': 8,
-	'tab': 9,
-	'delete': 46
-};
-
-
-
-Event.implement({
+DOMEvent.implement({
 
 	stop: function(){
-		return this.stopPropagation().preventDefault();
+		return this.preventDefault().stopPropagation();
 	},
 
 	stopPropagation: function(){
@@ -1245,6 +1547,32 @@ Event.implement({
 
 });
 
+DOMEvent.defineKey = function(code, key){
+	_keys[code] = key;
+	return this;
+};
+
+DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
+
+DOMEvent.defineKeys({
+	'38': 'up', '40': 'down', '37': 'left', '39': 'right',
+	'27': 'esc', '32': 'space', '8': 'backspace', '9': 'tab',
+	'46': 'delete', '13': 'enter'
+});
+
+})();
+
+/*<1.3compat>*/
+var Event = DOMEvent;
+Event.Keys = {};
+/*</1.3compat>*/
+
+/*<1.2compat>*/
+
+Event.Keys = new Hash(Event.Keys);
+
+/*</1.2compat>*/
+
 
 /*
 ---
@@ -1414,7 +1742,9 @@ this.Events = new Class({
 	addEvent: function(type, fn, internal){
 		type = removeOn(type);
 
-		
+		/*<1.2compat>*/
+		if (fn == $empty) return this;
+		/*</1.2compat>*/
 
 		this.$events[type] = (this.$events[type] || []).include(fn);
 		if (internal) fn.internal = true;
@@ -1437,7 +1767,7 @@ this.Events = new Class({
 		}, this);
 		return this;
 	},
-	
+
 	removeEvent: function(type, fn){
 		type = removeOn(type);
 		var events = this.$events[type];
@@ -1792,7 +2122,7 @@ local.setDocument = function(document){
 
 	var selected, id = 'slick_uniqueid';
 	var testNode = document.createElement('div');
-	
+
 	var testRoot = document.body || document.getElementsByTagName('body')[0] || root;
 	testRoot.appendChild(testNode);
 
@@ -1843,7 +2173,7 @@ local.setDocument = function(document){
 
 			features.brokenGEBCN = cachedGetElementsByClassName || brokenSecondClassNameGEBCN;
 		}
-		
+
 		if (testNode.querySelectorAll){
 			// IE 8 returns closed nodes (EG:"</foo>") for querySelectorAll('*') for some documents
 			try {
@@ -1923,8 +2253,14 @@ local.setDocument = function(document){
 
 	// contains
 	// FIXME: Add specs: local.contains should be different for xml and html documents?
-	features.contains = (root && this.isNativeCode(root.contains)) ? function(context, node){
+	var nativeRootContains = root && this.isNativeCode(root.contains),
+		nativeDocumentContains = document && this.isNativeCode(document.contains);
+
+	features.contains = (nativeRootContains && nativeDocumentContains) ? function(context, node){
 		return context.contains(node);
+	} : (nativeRootContains && !nativeDocumentContains) ? function(context, node){
+		// IE8 does not have .contains on document.
+		return context === node || ((context === document) ? document.documentElement : context).contains(node);
 	} : (root && root.compareDocumentPosition) ? function(context, node){
 		return context === node || !!(context.compareDocumentPosition(node) & 16);
 	} : function(context, node){
@@ -1969,7 +2305,7 @@ var reSimpleSelector = /^([#.]?)((?:[\w-]+|\*))$/,
 local.search = function(context, expression, append, first){
 
 	var found = this.found = (first) ? null : (append || []);
-	
+
 	if (!context) return found;
 	else if (context.navigator) context = context.document; // Convert the node from a window to a document
 	else if (!context.nodeType) return found;
@@ -2275,12 +2611,12 @@ local.matchNode = function(node, selector){
 			return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
 		} catch(matchError) {}
 	}
-	
+
 	var parsed = this.Slick.parse(selector);
 	if (!parsed) return true;
 
 	// simple (single) selectors
-	var expressions = parsed.expressions, reversedExpressions, simpleExpCounter = 0, i;
+	var expressions = parsed.expressions, simpleExpCounter = 0, i;
 	for (i = 0; (currentExpression = expressions[i]); i++){
 		if (currentExpression.length == 1){
 			var exp = currentExpression[0];
@@ -2319,7 +2655,7 @@ local.matchSelector = function(node, tag, id, classes, attributes, pseudos){
 
 	var i, part, cls;
 	if (classes) for (i = classes.length; i--;){
-		cls = node.getAttribute('class') || node.className;
+		cls = this.getAttribute(node, 'class');
 		if (!(cls && classes[i].regexp.test(cls))) return false;
 	}
 	if (attributes) for (i = attributes.length; i--;){
@@ -2354,7 +2690,7 @@ var combinators = {
 							this.push(item, tag, null, classes, attributes, pseudos);
 							break;
 						}
-					} 
+					}
 					return;
 				}
 				if (!item){
@@ -2505,7 +2841,7 @@ var pseudos = {
 	'nth-last-of-type': local.createNTHPseudo('lastChild', 'previousSibling', 'posNTHTypeLast', true),
 
 	'index': function(node, index){
-		return this['pseudo:nth-child'](node, '' + index + 1);
+		return this['pseudo:nth-child'](node, '' + (index + 1));
 	},
 
 	'even': function(node){
@@ -2563,7 +2899,7 @@ var pseudos = {
 	'root': function(node){
 		return (node === this.root);
 	},
-	
+
 	'selected': function(node){
 		return node.selected;
 	}
@@ -2575,11 +2911,7 @@ for (var p in pseudos) local['pseudo:' + p] = pseudos[p];
 
 // attributes methods
 
-local.attributeGetters = {
-
-	'class': function(){
-		return this.getAttribute('class') || this.className;
-	},
+var attributeGetters = local.attributeGetters = {
 
 	'for': function(){
 		return ('htmlFor' in this) ? this.htmlFor : this.getAttribute('for');
@@ -2592,7 +2924,7 @@ local.attributeGetters = {
 	'style': function(){
 		return (this.style) ? this.style.cssText : this.getAttribute('style');
 	},
-	
+
 	'tabindex': function(){
 		var attributeNode = this.getAttributeNode('tabindex');
 		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
@@ -2600,15 +2932,22 @@ local.attributeGetters = {
 
 	'type': function(){
 		return this.getAttribute('type');
+	},
+
+	'maxlength': function(){
+		var attributeNode = this.getAttributeNode('maxLength');
+		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
 	}
 
 };
 
+attributeGetters.MAXLENGTH = attributeGetters.maxLength = attributeGetters.maxlength;
+
 // Slick
 
 var Slick = local.Slick = (this.Slick || {});
 
-Slick.version = '1.1.5';
+Slick.version = '1.1.7';
 
 // Slick finder
 
@@ -2630,9 +2969,15 @@ Slick.contains = function(container, node){
 // Slick attribute getter
 
 Slick.getAttribute = function(node, name){
+	local.setDocument(node);
 	return local.getAttribute(node, name);
 };
 
+Slick.hasAttribute = function(node, name){
+	local.setDocument(node);
+	return local.hasAttribute(node, name);
+};
+
 // Slick matcher
 
 Slick.match = function(node, selector){
@@ -2697,7 +3042,7 @@ description: One of the most important items in MooTools. Contains the dollar fu
 
 license: MIT-style license.
 
-requires: [Window, Document, Array, String, Function, Number, Slick.Parser, Slick.Finder]
+requires: [Window, Document, Array, String, Function, Object, Number, Slick.Parser, Slick.Finder]
 
 provides: [Element, Elements, $, $$, Iframe, Selectors]
 
@@ -2717,8 +3062,8 @@ var Element = function(tag, props){
 		if (parsed.id && props.id == null) props.id = parsed.id;
 
 		var attributes = parsed.attributes;
-		if (attributes) for (var i = 0, l = attributes.length; i < l; i++){
-			var attr = attributes[i];
+		if (attributes) for (var attr, i = 0, l = attributes.length; i < l; i++){
+			attr = attributes[i];
 			if (props[attr.key] != null) continue;
 
 			if (attr.value != null && attr.operator == '=') props[attr.key] = attr.value;
@@ -2731,7 +3076,16 @@ var Element = function(tag, props){
 	return document.newElement(tag, props);
 };
 
-if (Browser.Element) Element.prototype = Browser.Element.prototype;
+
+if (Browser.Element){
+	Element.prototype = Browser.Element.prototype;
+	// IE8 and IE9 require the wrapping.
+	Element.prototype._fireEvent = (function(fireEvent){
+		return function(type, event){
+			return fireEvent.call(this, type, event);
+		};
+	})(Element.prototype.fireEvent);
+}
 
 new Type('Element', Element).mirror(function(name){
 	if (Array.prototype[name]) return;
@@ -2752,7 +3106,10 @@ new Type('Element', Element).mirror(function(name){
 if (!Browser.Element){
 	Element.parent = Object;
 
-	Element.Prototype = {'$family': Function.from('element').hide()};
+	Element.Prototype = {
+		'$constructor': Element,
+		'$family': Function.from('element').hide()
+	};
 
 	Element.mirror(function(name, method){
 		Element.Prototype[name] = method;
@@ -2761,7 +3118,11 @@ if (!Browser.Element){
 
 Element.Constructors = {};
 
+//<1.2compat>
 
+Element.Constructors = new Hash;
+
+//</1.2compat>
 
 var IFrame = new Type('IFrame', function(){
 	var params = Array.link(arguments, {
@@ -2852,7 +3213,11 @@ new Type('Elements', Elements).implement({
 
 });
 
+//<1.2compat>
 
+Elements.alias('extend', 'append');
+
+//</1.2compat>
 
 (function(){
 
@@ -2862,21 +3227,22 @@ var splice = Array.prototype.splice, object = {'0': 0, '1': 1, length: 2};
 splice.call(object, 1, 1);
 if (object[1] == 1) Elements.implement('splice', function(){
 	var length = this.length;
-	splice.apply(this, arguments);
+	var result = splice.apply(this, arguments);
 	while (length >= this.length) delete this[length--];
-	return this;
+	return result;
 }.protect());
 
-Elements.implement(Array.prototype);
+Array.forEachMethod(function(method, name){
+	Elements.implement(name, method);
+});
 
 Array.mirror(Elements);
 
 /*<ltIE8>*/
 var createElementAcceptsHTML;
 try {
-	var x = document.createElement('<input name=x>');
-	createElementAcceptsHTML = (x.name == 'x');
-} catch(e){}
+    createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
+} catch (e){}
 
 var escapeQuotes = function(html){
 	return ('' + html).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
@@ -2904,6 +3270,11 @@ Document.implement({
 
 })();
 
+(function(){
+
+Slick.uidOf(window);
+Slick.uidOf(document);
+
 Document.implement({
 
 	newTextNode: function(text){
@@ -2928,8 +3299,13 @@ Document.implement({
 			},
 
 			element: function(el, nocash){
-				$uid(el);
+				Slick.uidOf(el);
 				if (!nocash && !el.$family && !(/^(?:object|embed)$/i).test(el.tagName)){
+					var fireEvent = el.fireEvent;
+					// wrapping needed in IE7, or else crash
+					el._fireEvent = function(type, event){
+						return fireEvent(type, event);
+					};
 					Object.append(el, Element.Prototype);
 				}
 				return el;
@@ -2947,7 +3323,7 @@ Document.implement({
 		};
 
 		return function(el, nocash, doc){
-			if (el && el.$family && el.uid) return el;
+			if (el && el.$family && el.uniqueNumber) return el;
 			var type = typeOf(el);
 			return (types[type]) ? types[type](el, nocash, doc || document) : null;
 		};
@@ -2984,7 +3360,131 @@ Window.implement({
 
 });
 
+var contains = {contains: function(element){
+	return Slick.contains(this, element);
+}};
 
+if (!document.contains) Document.implement(contains);
+if (!document.createElement('div').contains) Element.implement(contains);
+
+//<1.2compat>
+
+Element.implement('hasChild', function(element){
+	return this !== element && this.contains(element);
+});
+
+(function(search, find, match){
+
+	this.Selectors = {};
+	var pseudos = this.Selectors.Pseudo = new Hash();
+
+	var addSlickPseudos = function(){
+		for (var name in pseudos) if (pseudos.hasOwnProperty(name)){
+			Slick.definePseudo(name, pseudos[name]);
+			delete pseudos[name];
+		}
+	};
+
+	Slick.search = function(context, expression, append){
+		addSlickPseudos();
+		return search.call(this, context, expression, append);
+	};
+
+	Slick.find = function(context, expression){
+		addSlickPseudos();
+		return find.call(this, context, expression);
+	};
+
+	Slick.match = function(node, selector){
+		addSlickPseudos();
+		return match.call(this, node, selector);
+	};
+
+})(Slick.search, Slick.find, Slick.match);
+
+//</1.2compat>
+
+// tree walking
+
+var injectCombinator = function(expression, combinator){
+	if (!expression) return combinator;
+
+	expression = Object.clone(Slick.parse(expression));
+
+	var expressions = expression.expressions;
+	for (var i = expressions.length; i--;)
+		expressions[i][0].combinator = combinator;
+
+	return expression;
+};
+
+Object.forEach({
+	getNext: '~',
+	getPrevious: '!~',
+	getParent: '!'
+}, function(combinator, method){
+	Element.implement(method, function(expression){
+		return this.getElement(injectCombinator(expression, combinator));
+	});
+});
+
+Object.forEach({
+	getAllNext: '~',
+	getAllPrevious: '!~',
+	getSiblings: '~~',
+	getChildren: '>',
+	getParents: '!'
+}, function(combinator, method){
+	Element.implement(method, function(expression){
+		return this.getElements(injectCombinator(expression, combinator));
+	});
+});
+
+Element.implement({
+
+	getFirst: function(expression){
+		return document.id(Slick.search(this, injectCombinator(expression, '>'))[0]);
+	},
+
+	getLast: function(expression){
+		return document.id(Slick.search(this, injectCombinator(expression, '>')).getLast());
+	},
+
+	getWindow: function(){
+		return this.ownerDocument.window;
+	},
+
+	getDocument: function(){
+		return this.ownerDocument;
+	},
+
+	getElementById: function(id){
+		return document.id(Slick.find(this, '#' + ('' + id).replace(/(\W)/g, '\\$1')));
+	},
+
+	match: function(expression){
+		return !expression || Slick.match(this, expression);
+	}
+
+});
+
+//<1.2compat>
+
+if (window.$$ == null) Window.implement('$$', function(selector){
+	var elements = new Elements;
+	if (arguments.length == 1 && typeof selector == 'string') return Slick.search(this.document, selector, elements);
+	var args = Array.flatten(arguments);
+	for (var i = 0, l = args.length; i < l; i++){
+		var item = args[i];
+		switch (typeOf(item)){
+			case 'element': elements.push(item); break;
+			case 'string': Slick.search(this.document, item, elements);
+		}
+	}
+	return elements;
+});
+
+//</1.2compat>
 
 if (window.$$ == null) Window.implement('$$', function(selector){
 	if (arguments.length == 1){
@@ -2994,50 +3494,7 @@ if (window.$$ == null) Window.implement('$$', function(selector){
 	return new Elements(arguments);
 });
 
-(function(){
-
-var collected = {}, storage = {};
-var formProps = {input: 'checked', option: 'selected', textarea: 'value'};
-
-var get = function(uid){
-	return (storage[uid] || (storage[uid] = {}));
-};
-
-var clean = function(item){
-	var uid = item.uid;
-	if (item.removeEvents) item.removeEvents();
-	if (item.clearAttributes) item.clearAttributes();
-	if (uid != null){
-		delete collected[uid];
-		delete storage[uid];
-	}
-	return item;
-};
-
-var camels = ['defaultValue', 'accessKey', 'cellPadding', 'cellSpacing', 'colSpan', 'frameBorder', 'maxLength', 'readOnly',
-	'rowSpan', 'tabIndex', 'useMap'
-];
-var bools = ['compact', 'nowrap', 'ismap', 'declare', 'noshade', 'checked', 'disabled', 'readOnly', 'multiple', 'selected',
-	'noresize', 'defer', 'defaultChecked'
-];
- var attributes = {
-	'html': 'innerHTML',
-	'class': 'className',
-	'for': 'htmlFor',
-	'text': (function(){
-		var temp = document.createElement('div');
-		return (temp.textContent == null) ? 'innerText' : 'textContent';
-	})()
-};
-var readOnly = ['type'];
-var expandos = ['value', 'defaultValue'];
-var uriAttrs = /^(?:href|src|usemap)$/i;
-
-bools = bools.associate(bools);
-camels = camels.associate(camels.map(String.toLowerCase));
-readOnly = readOnly.associate(readOnly);
-
-Object.append(attributes, expandos.associate(expandos));
+// Inserters
 
 var inserters = {
 
@@ -3063,22 +3520,199 @@ var inserters = {
 
 inserters.inside = inserters.bottom;
 
+//<1.2compat>
 
+Object.each(inserters, function(inserter, where){
 
-var injectCombinator = function(expression, combinator){
-	if (!expression) return combinator;
+	where = where.capitalize();
 
-	expression = Object.clone(Slick.parse(expression));
+	var methods = {};
 
-	var expressions = expression.expressions;
-	for (var i = expressions.length; i--;)
-		expressions[i][0].combinator = combinator;
+	methods['inject' + where] = function(el){
+		inserter(this, document.id(el, true));
+		return this;
+	};
 
-	return expression;
+	methods['grab' + where] = function(el){
+		inserter(document.id(el, true), this);
+		return this;
+	};
+
+	Element.implement(methods);
+
+});
+
+//</1.2compat>
+
+// getProperty / setProperty
+
+var propertyGetters = {}, propertySetters = {};
+
+// properties
+
+var properties = {};
+Array.forEach([
+	'type', 'value', 'defaultValue', 'accessKey', 'cellPadding', 'cellSpacing', 'colSpan',
+	'frameBorder', 'rowSpan', 'tabIndex', 'useMap'
+], function(property){
+	properties[property.toLowerCase()] = property;
+});
+
+properties.html = 'innerHTML';
+properties.text = (document.createElement('div').textContent == null) ? 'innerText': 'textContent';
+
+Object.forEach(properties, function(real, key){
+	propertySetters[key] = function(node, value){
+		node[real] = value;
+	};
+	propertyGetters[key] = function(node){
+		return node[real];
+	};
+});
+
+// Booleans
+
+var bools = [
+	'compact', 'nowrap', 'ismap', 'declare', 'noshade', 'checked',
+	'disabled', 'readOnly', 'multiple', 'selected', 'noresize',
+	'defer', 'defaultChecked', 'autofocus', 'controls', 'autoplay',
+	'loop'
+];
+
+var booleans = {};
+Array.forEach(bools, function(bool){
+	var lower = bool.toLowerCase();
+	booleans[lower] = bool;
+	propertySetters[lower] = function(node, value){
+		node[bool] = !!value;
+	};
+	propertyGetters[lower] = function(node){
+		return !!node[bool];
+	};
+});
+
+// Special cases
+
+Object.append(propertySetters, {
+
+	'class': function(node, value){
+		('className' in node) ? node.className = (value || '') : node.setAttribute('class', value);
+	},
+
+	'for': function(node, value){
+		('htmlFor' in node) ? node.htmlFor = value : node.setAttribute('for', value);
+	},
+
+	'style': function(node, value){
+		(node.style) ? node.style.cssText = value : node.setAttribute('style', value);
+	},
+
+	'value': function(node, value){
+		node.value = (value != null) ? value : '';
+	}
+
+});
+
+propertyGetters['class'] = function(node){
+	return ('className' in node) ? node.className || null : node.getAttribute('class');
 };
 
+/* <webkit> */
+var el = document.createElement('button');
+// IE sets type as readonly and throws
+try { el.type = 'button'; } catch(e){}
+if (el.type != 'button') propertySetters.type = function(node, value){
+	node.setAttribute('type', value);
+};
+el = null;
+/* </webkit> */
+
+/*<IE>*/
+var input = document.createElement('input');
+input.value = 't';
+input.type = 'submit';
+if (input.value != 't') propertySetters.type = function(node, type){
+	var value = node.value;
+	node.type = type;
+	node.value = value;
+};
+input = null;
+/*</IE>*/
+
+/* getProperty, setProperty */
+
+/* <ltIE9> */
+var pollutesGetAttribute = (function(div){
+	div.random = 'attribute';
+	return (div.getAttribute('random') == 'attribute');
+})(document.createElement('div'));
+
+/* <ltIE9> */
+
 Element.implement({
 
+	setProperty: function(name, value){
+		var setter = propertySetters[name.toLowerCase()];
+		if (setter){
+			setter(this, value);
+		} else {
+			/* <ltIE9> */
+			if (pollutesGetAttribute) var attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+			/* </ltIE9> */
+
+			if (value == null){
+				this.removeAttribute(name);
+				/* <ltIE9> */
+				if (pollutesGetAttribute) delete attributeWhiteList[name];
+				/* </ltIE9> */
+			} else {
+				this.setAttribute(name, '' + value);
+				/* <ltIE9> */
+				if (pollutesGetAttribute) attributeWhiteList[name] = true;
+				/* </ltIE9> */
+			}
+		}
+		return this;
+	},
+
+	setProperties: function(attributes){
+		for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]);
+		return this;
+	},
+
+	getProperty: function(name){
+		var getter = propertyGetters[name.toLowerCase()];
+		if (getter) return getter(this);
+		/* <ltIE9> */
+		if (pollutesGetAttribute){
+			var attr = this.getAttributeNode(name), attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+			if (!attr) return null;
+			if (attr.expando && !attributeWhiteList[name]){
+				var outer = this.outerHTML;
+				// segment by the opening tag and find mention of attribute name
+				if (outer.substr(0, outer.search(/\/?['"]?>(?![^<]*<['"])/)).indexOf(name) < 0) return null;
+				attributeWhiteList[name] = true;
+			}
+		}
+		/* </ltIE9> */
+		var result = Slick.getAttribute(this, name);
+		return (!result && !Slick.hasAttribute(this, name)) ? null : result;
+	},
+
+	getProperties: function(){
+		var args = Array.from(arguments);
+		return args.map(this.getProperty, this).associate(args);
+	},
+
+	removeProperty: function(name){
+		return this.setProperty(name, null);
+	},
+
+	removeProperties: function(){
+		Array.each(arguments, this.removeProperty, this);
+		return this;
+	},
+
 	set: function(prop, value){
 		var property = Element.Properties[prop];
 		(property && property.set) ? property.set.call(this, value) : this.setProperty(prop, value);
@@ -3095,47 +3729,6 @@ Element.implement({
 		return this;
 	},
 
-	setProperty: function(attribute, value){
-		attribute = camels[attribute] || attribute;
-		if (value == null) return this.removeProperty(attribute);
-		var key = attributes[attribute];
-		(key) ? this[key] = value :
-			(bools[attribute]) ? this[attribute] = !!value : this.setAttribute(attribute, '' + value);
-		return this;
-	},
-
-	setProperties: function(attributes){
-		for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]);
-		return this;
-	},
-
-	getProperty: function(attribute){
-		attribute = camels[attribute] || attribute;
-		var key = attributes[attribute] || readOnly[attribute];
-		return (key) ? this[key] :
-			(bools[attribute]) ? !!this[attribute] :
-			(uriAttrs.test(attribute) ? this.getAttribute(attribute, 2) :
-			(key = this.getAttributeNode(attribute)) ? key.nodeValue : null) || null;
-	},
-
-	getProperties: function(){
-		var args = Array.from(arguments);
-		return args.map(this.getProperty, this).associate(args);
-	},
-
-	removeProperty: function(attribute){
-		attribute = camels[attribute] || attribute;
-		var key = attributes[attribute];
-		(key) ? this[key] = '' :
-			(bools[attribute]) ? this[attribute] = false : this.removeAttribute(attribute);
-		return this;
-	},
-
-	removeProperties: function(){
-		Array.each(arguments, this.removeProperty, this);
-		return this;
-	},
-
 	hasClass: function(className){
 		return this.className.clean().contains(className, ' ');
 	},
@@ -3194,58 +3787,6 @@ Element.implement({
 		return this.replaces(el).grab(el, where);
 	},
 
-	getPrevious: function(expression){
-		return document.id(Slick.find(this, injectCombinator(expression, '!~')));
-	},
-
-	getAllPrevious: function(expression){
-		return Slick.search(this, injectCombinator(expression, '!~'), new Elements);
-	},
-
-	getNext: function(expression){
-		return document.id(Slick.find(this, injectCombinator(expression, '~')));
-	},
-
-	getAllNext: function(expression){
-		return Slick.search(this, injectCombinator(expression, '~'), new Elements);
-	},
-
-	getFirst: function(expression){
-		return document.id(Slick.search(this, injectCombinator(expression, '>'))[0]);
-	},
-
-	getLast: function(expression){
-		return document.id(Slick.search(this, injectCombinator(expression, '>')).getLast());
-	},
-
-	getParent: function(expression){
-		return document.id(Slick.find(this, injectCombinator(expression, '!')));
-	},
-
-	getParents: function(expression){
-		return Slick.search(this, injectCombinator(expression, '!'), new Elements);
-	},
-
-	getSiblings: function(expression){
-		return Slick.search(this, injectCombinator(expression, '~~'), new Elements);
-	},
-
-	getChildren: function(expression){
-		return Slick.search(this, injectCombinator(expression, '>'), new Elements);
-	},
-
-	getWindow: function(){
-		return this.ownerDocument.window;
-	},
-
-	getDocument: function(){
-		return this.ownerDocument;
-	},
-
-	getElementById: function(id){
-		return document.id(Slick.find(this, '#' + ('' + id).replace(/(\W)/g, '\\$1')));
-	},
-
 	getSelected: function(){
 		this.selectedIndex; // Safari 3.2.1
 		return new Elements(Array.from(this.options).filter(function(option){
@@ -3269,7 +3810,30 @@ Element.implement({
 			});
 		});
 		return queryString.join('&');
-	},
+	}
+
+});
+
+var collected = {}, storage = {};
+
+var get = function(uid){
+	return (storage[uid] || (storage[uid] = {}));
+};
+
+var clean = function(item){
+	var uid = item.uniqueNumber;
+	if (item.removeEvents) item.removeEvents();
+	if (item.clearAttributes) item.clearAttributes();
+	if (uid != null){
+		delete collected[uid];
+		delete storage[uid];
+	}
+	return item;
+};
+
+var formProps = {input: 'checked', option: 'selected', textarea: 'value'};
+
+Element.implement({
 
 	destroy: function(){
 		var children = clean(this).getElementsByTagName('*');
@@ -3287,55 +3851,44 @@ Element.implement({
 		return (this.parentNode) ? this.parentNode.removeChild(this) : this;
 	},
 
-	match: function(expression){
-		return !expression || Slick.match(this, expression);
-	}
+	clone: function(contents, keepid){
+		contents = contents !== false;
+		var clone = this.cloneNode(contents), ce = [clone], te = [this], i;
 
-});
-
-var cleanClone = function(node, element, keepid){
-	if (!keepid) node.setAttributeNode(document.createAttribute('id'));
-	if (node.clearAttributes){
-		node.clearAttributes();
-		node.mergeAttributes(element);
-		node.removeAttribute('uid');
-		if (node.options){
-			var no = node.options, eo = element.options;
-			for (var i = no.length; i--;) no[i].selected = eo[i].selected;
+		if (contents){
+			ce.append(Array.from(clone.getElementsByTagName('*')));
+			te.append(Array.from(this.getElementsByTagName('*')));
 		}
+
+		for (i = ce.length; i--;){
+			var node = ce[i], element = te[i];
+			if (!keepid) node.removeAttribute('id');
+			/*<ltIE9>*/
+			if (node.clearAttributes){
+				node.clearAttributes();
+				node.mergeAttributes(element);
+				node.removeAttribute('uniqueNumber');
+				if (node.options){
+					var no = node.options, eo = element.options;
+					for (var j = no.length; j--;) no[j].selected = eo[j].selected;
+				}
+			}
+			/*</ltIE9>*/
+			var prop = formProps[element.tagName.toLowerCase()];
+			if (prop && element[prop]) node[prop] = element[prop];
+		}
+
+		/*<ltIE9>*/
+		if (Browser.ie){
+			var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
+			for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
+		}
+		/*</ltIE9>*/
+		return document.id(clone);
 	}
 
-	var prop = formProps[element.tagName.toLowerCase()];
-	if (prop && element[prop]) node[prop] = element[prop];
-};
-
-Element.implement('clone', function(contents, keepid){
-	contents = contents !== false;
-	var clone = this.cloneNode(contents), i;
-
-	if (contents){
-		var ce = clone.getElementsByTagName('*'), te = this.getElementsByTagName('*');
-		for (i = ce.length; i--;) cleanClone(ce[i], te[i], keepid);
-	}
-
-	cleanClone(clone, this, keepid);
-
-	if (Browser.ie){
-		var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
-		for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
-	}
-	return document.id(clone);
 });
 
-var contains = {contains: function(element){
-	return Slick.contains(this, element);
-}};
-
-if (!document.contains) Document.implement(contains);
-if (!document.createElement('div').contains) Element.implement(contains);
-
-
-
 [Element, Window, Document].invoke('implement', {
 
 	addListener: function(type, fn){
@@ -3346,7 +3899,7 @@ if (!document.createElement('div').contains) Element.implement(contains);
 				old();
 			};
 		} else {
-			collected[$uid(this)] = this;
+			collected[Slick.uidOf(this)] = this;
 		}
 		if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]);
 		else this.attachEvent('on' + type, fn);
@@ -3360,19 +3913,19 @@ if (!document.createElement('div').contains) Element.implement(contains);
 	},
 
 	retrieve: function(property, dflt){
-		var storage = get($uid(this)), prop = storage[property];
+		var storage = get(Slick.uidOf(this)), prop = storage[property];
 		if (dflt != null && prop == null) prop = storage[property] = dflt;
 		return prop != null ? prop : null;
 	},
 
 	store: function(property, value){
-		var storage = get($uid(this));
+		var storage = get(Slick.uidOf(this));
 		storage[property] = value;
 		return this;
 	},
 
 	eliminate: function(property){
-		var storage = get($uid(this));
+		var storage = get(Slick.uidOf(this));
 		delete storage[property];
 		return this;
 	}
@@ -3386,11 +3939,13 @@ if (window.attachEvent && !window.addEventListener) window.addListener('unload',
 });
 /*</ltIE9>*/
 
-})();
-
 Element.Properties = {};
 
+//<1.2compat>
 
+Element.Properties = new Hash;
+
+//</1.2compat>
 
 Element.Properties.style = {
 
@@ -3416,55 +3971,126 @@ Element.Properties.tag = {
 
 };
 
+Element.Properties.html = {
+
+	set: function(html){
+		if (html == null) html = '';
+		else if (typeOf(html) == 'array') html = html.join('');
+		this.innerHTML = html;
+	},
+
+	erase: function(){
+		this.innerHTML = '';
+	}
+
+};
+
 /*<ltIE9>*/
-(function(maxLength){
-	if (maxLength != null) Element.Properties.maxlength = Element.Properties.maxLength = {
-		get: function(){
-			var maxlength = this.getAttribute('maxLength');
-			return maxlength == maxLength ? null : maxlength;
-		}
-	};
-})(document.createElement('input').getAttribute('maxLength'));
+// technique by jdbarlett - http://jdbartlett.com/innershiv/
+var div = document.createElement('div');
+div.innerHTML = '<nav></nav>';
+var supportsHTML5Elements = (div.childNodes.length == 1);
+if (!supportsHTML5Elements){
+	var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' '),
+		fragment = document.createDocumentFragment(), l = tags.length;
+	while (l--) fragment.createElement(tags[l]);
+}
+div = null;
 /*</ltIE9>*/
 
-/*<!webkit>*/
-Element.Properties.html = (function(){
+/*<IE>*/
+var supportsTableInnerHTML = Function.attempt(function(){
+	var table = document.createElement('table');
+	table.innerHTML = '<tr><td></td></tr>';
+	return true;
+});
 
-	var tableTest = Function.attempt(function(){
-		var table = document.createElement('table');
-		table.innerHTML = '<tr><td></td></tr>';
-	});
+/*<ltFF4>*/
+var tr = document.createElement('tr'), html = '<td></td>';
+tr.innerHTML = html;
+var supportsTRInnerHTML = (tr.innerHTML == html);
+tr = null;
+/*</ltFF4>*/
 
-	var wrapper = document.createElement('div');
+if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements){
 
-	var translations = {
-		table: [1, '<table>', '</table>'],
-		select: [1, '<select>', '</select>'],
-		tbody: [2, '<table><tbody>', '</tbody></table>'],
-		tr: [3, '<table><tbody><tr>', '</tr></tbody></table>']
-	};
-	translations.thead = translations.tfoot = translations.tbody;
+	Element.Properties.html.set = (function(set){
 
-	var html = {
-		set: function(){
-			var html = Array.flatten(arguments).join('');
-			var wrap = (!tableTest && translations[this.get('tag')]);
-			if (wrap){
-				var first = wrapper;
-				first.innerHTML = wrap[1] + html + wrap[2];
-				for (var i = wrap[0]; i--;) first = first.firstChild;
-				this.empty().adopt(first.childNodes);
-			} else {
-				this.innerHTML = html;
-			}
+		var translations = {
+			table: [1, '<table>', '</table>'],
+			select: [1, '<select>', '</select>'],
+			tbody: [2, '<table><tbody>', '</tbody></table>'],
+			tr: [3, '<table><tbody><tr>', '</tr></tbody></table>']
+		};
+
+		translations.thead = translations.tfoot = translations.tbody;
+
+		return function(html){
+			var wrap = translations[this.get('tag')];
+			if (!wrap && !supportsHTML5Elements) wrap = [0, '', ''];
+			if (!wrap) return set.call(this, html);
+
+			var level = wrap[0], wrapper = document.createElement('div'), target = wrapper;
+			if (!supportsHTML5Elements) fragment.appendChild(wrapper);
+			wrapper.innerHTML = [wrap[1], html, wrap[2]].flatten().join('');
+			while (level--) target = target.firstChild;
+			this.empty().adopt(target.childNodes);
+			if (!supportsHTML5Elements) fragment.removeChild(wrapper);
+			wrapper = null;
+		};
+
+	})(Element.Properties.html.set);
+}
+/*</IE>*/
+
+/*<ltIE9>*/
+var testForm = document.createElement('form');
+testForm.innerHTML = '<select><option>s</option></select>';
+
+if (testForm.firstChild.value != 's') Element.Properties.value = {
+
+	set: function(value){
+		var tag = this.get('tag');
+		if (tag != 'select') return this.setProperty('value', value);
+		var options = this.getElements('option');
+		for (var i = 0; i < options.length; i++){
+			var option = options[i],
+				attr = option.getAttributeNode('value'),
+				optionValue = (attr && attr.specified) ? option.value : option.get('text');
+			if (optionValue == value) return option.selected = true;
 		}
-	};
+	},
 
-	html.erase = html.set;
+	get: function(){
+		var option = this, tag = option.get('tag');
+
+		if (tag != 'select' && tag != 'option') return this.getProperty('value');
+
+		if (tag == 'select' && !(option = option.getSelected()[0])) return '';
+
+		var attr = option.getAttributeNode('value');
+		return (attr && attr.specified) ? option.value : option.get('text');
+	}
+
+};
+testForm = null;
+/*</ltIE9>*/
+
+/*<IE>*/
+if (document.createElement('div').getAttributeNode('id')) Element.Properties.id = {
+	set: function(id){
+		this.id = this.getAttributeNode('id').value = id;
+	},
+	get: function(){
+		return this.id || null;
+	},
+	erase: function(){
+		this.id = this.getAttributeNode('id').value = '';
+	}
+};
+/*</IE>*/
 
-	return html;
 })();
-/*</!webkit>*/
 
 
 /*
@@ -3487,45 +4113,53 @@ provides: Element.Style
 
 var html = document.html;
 
+//<ltIE9>
+// Check for oldIE, which does not remove styles when they're set to null
+var el = document.createElement('div');
+el.style.color = 'red';
+el.style.color = null;
+var doesNotRemoveStyles = el.style.color == 'red';
+el = null;
+//</ltIE9>
+
 Element.Properties.styles = {set: function(styles){
 	this.setStyles(styles);
 }};
 
-var hasOpacity = (html.style.opacity != null);
-var reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+var hasOpacity = (html.style.opacity != null),
+	hasFilter = (html.style.filter != null),
+	reAlpha = /alpha\(opacity=([\d.]+)\)/i;
 
-var setOpacity = function(element, opacity){
-	if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
-	if (hasOpacity){
-		element.style.opacity = opacity;
-	} else {
-		opacity = (opacity * 100).limit(0, 100).round();
-		opacity = (opacity == 100) ? '' : 'alpha(opacity=' + opacity + ')';
-		var filter = element.style.filter || element.getComputedStyle('filter') || '';
-		element.style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
-	}
+var setVisibility = function(element, opacity){
+	element.store('$opacity', opacity);
+	element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
 };
 
-Element.Properties.opacity = {
+var setOpacity = (hasOpacity ? function(element, opacity){
+	element.style.opacity = opacity;
+} : (hasFilter ? function(element, opacity){
+	var style = element.style;
+	if (!element.currentStyle || !element.currentStyle.hasLayout) style.zoom = 1;
+	if (opacity == null || opacity == 1) opacity = '';
+	else opacity = 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')';
+	var filter = style.filter || element.getComputedStyle('filter') || '';
+	style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
+	if (!style.filter) style.removeAttribute('filter');
+} : setVisibility));
 
-	set: function(opacity){
-		var visibility = this.style.visibility;
-		if (opacity == 0 && visibility != 'hidden') this.style.visibility = 'hidden';
-		else if (opacity != 0 && visibility != 'visible') this.style.visibility = 'visible';
-
-		setOpacity(this, opacity);
-	},
-
-	get: (hasOpacity) ? function(){
-		var opacity = this.style.opacity || this.getComputedStyle('opacity');
-		return (opacity == '') ? 1 : opacity;
-	} : function(){
-		var opacity, filter = (this.style.filter || this.getComputedStyle('filter'));
-		if (filter) opacity = filter.match(reAlpha);
-		return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
-	}
-
-};
+var getOpacity = (hasOpacity ? function(element){
+	var opacity = element.style.opacity || element.getComputedStyle('opacity');
+	return (opacity == '') ? 1 : opacity.toFloat();
+} : (hasFilter ? function(element){
+	var filter = (element.style.filter || element.getComputedStyle('filter')),
+		opacity;
+	if (filter) opacity = filter.match(reAlpha);
+	return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
+} : function(element){
+	var opacity = element.retrieve('$opacity');
+	if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
+	return opacity;
+}));
 
 var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat';
 
@@ -3538,21 +4172,13 @@ Element.implement({
 		return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : null;
 	},
 
-	setOpacity: function(value){
-		setOpacity(this, value);
-		return this;
-	},
-
-	getOpacity: function(){
-		return this.get('opacity');
-	},
-
 	setStyle: function(property, value){
-		switch (property){
-			case 'opacity': return this.set('opacity', parseFloat(value));
-			case 'float': property = floatName;
+		if (property == 'opacity'){
+			if (value != null) value = parseFloat(value);
+			setOpacity(this, value);
+			return this;
 		}
-		property = property.camelCase();
+		property = (property == 'float' ? floatName : property).camelCase();
 		if (typeOf(value) != 'string'){
 			var map = (Element.Styles[property] || '@').split(' ');
 			value = Array.from(value).map(function(val, i){
@@ -3563,15 +4189,17 @@ Element.implement({
 			value = Math.round(value);
 		}
 		this.style[property] = value;
+		//<ltIE9>
+		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
+			this.style.removeAttribute(property);
+		}
+		//</ltIE9>
 		return this;
 	},
 
 	getStyle: function(property){
-		switch (property){
-			case 'opacity': return this.get('opacity');
-			case 'float': property = floatName;
-		}
-		property = property.camelCase();
+		if (property == 'opacity') return getOpacity(this);
+		property = (property == 'float' ? floatName : property).camelCase();
 		var result = this.style[property];
 		if (!result || property == 'zIndex'){
 			result = [];
@@ -3587,16 +4215,17 @@ Element.implement({
 			var color = result.match(/rgba?\([\d\s,]+\)/);
 			if (color) result = result.replace(color[0], color[0].rgbToHex());
 		}
-		if (Browser.opera || (Browser.ie && isNaN(parseFloat(result)))){
-			if ((/^(height|width)$/).test(property)){
+		if (Browser.opera || Browser.ie){
+			if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
 				var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
 				values.each(function(value){
 					size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
 				}, this);
 				return this['offset' + property.capitalize()] - size + 'px';
 			}
-			if (Browser.opera && String(result).indexOf('px') != -1) return result;
-			if ((/^border(.+)Width|margin|padding/).test(property)) return '0px';
+			if (Browser.ie && (/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
+				return '0px';
+			}
 		}
 		return result;
 	},
@@ -3626,7 +4255,41 @@ Element.Styles = {
 	zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@'
 };
 
+//<1.3compat>
 
+Element.implement({
+
+	setOpacity: function(value){
+		setOpacity(this, value);
+		return this;
+	},
+
+	getOpacity: function(){
+		return getOpacity(this);
+	}
+
+});
+
+Element.Properties.opacity = {
+
+	set: function(opacity){
+		setOpacity(this, opacity);
+		setVisibility(this, opacity);
+	},
+
+	get: function(){
+		return getOpacity(this);
+	}
+
+};
+
+//</1.3compat>
+
+//<1.2compat>
+
+Element.Styles = new Hash(Element.Styles);
+
+//</1.2compat>
 
 Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
 
@@ -3654,7 +4317,7 @@ Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, bor
 
 name: Element.Event
 
-description: Contains Element methods for dealing with events. This file also includes mouseenter and mouseleave custom Element Events.
+description: Contains Element methods for dealing with events. This file also includes mouseenter and mouseleave custom Element Events, if necessary.
 
 license: MIT-style license.
 
@@ -3683,14 +4346,14 @@ Element.Properties.events = {set: function(events){
 			condition = fn,
 			self = this;
 		if (custom){
-			if (custom.onAdd) custom.onAdd.call(this, fn);
+			if (custom.onAdd) custom.onAdd.call(this, fn, type);
 			if (custom.condition){
 				condition = function(event){
-					if (custom.condition.call(this, event)) return fn.call(this, event);
+					if (custom.condition.call(this, event, type)) return fn.call(this, event);
 					return true;
 				};
 			}
-			realType = custom.base || realType;
+			if (custom.base) realType = Function.from(custom.base).call(this, type);
 		}
 		var defn = function(){
 			return fn.call(self);
@@ -3699,7 +4362,7 @@ Element.Properties.events = {set: function(events){
 		if (nativeEvent){
 			if (nativeEvent == 2){
 				defn = function(event){
-					event = new Event(event, self.getWindow());
+					event = new DOMEvent(event, self.getWindow());
 					if (condition.call(self, event) === false) event.stop();
 				};
 			}
@@ -3720,8 +4383,8 @@ Element.Properties.events = {set: function(events){
 		delete list.values[index];
 		var custom = Element.Events[type];
 		if (custom){
-			if (custom.onRemove) custom.onRemove.call(this, fn);
-			type = custom.base || type;
+			if (custom.onRemove) custom.onRemove.call(this, fn, type);
+			if (custom.base) type = Function.from(custom.base).call(this, type);
 		}
 		return (Element.NativeEvents[type]) ? this.removeListener(type, value, arguments[2]) : this;
 	},
@@ -3787,37 +4450,257 @@ Element.NativeEvents = {
 	orientationchange: 2, // mobile
 	touchstart: 2, touchmove: 2, touchend: 2, touchcancel: 2, // touch
 	gesturestart: 2, gesturechange: 2, gestureend: 2, // gesture
-	focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, //form elements
+	focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, paste: 2, input: 2, //form elements
 	load: 2, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window
 	error: 1, abort: 1, scroll: 1 //misc
 };
 
-var check = function(event){
-	var related = event.relatedTarget;
-	if (related == null) return true;
-	if (!related) return false;
-	return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
-};
+Element.Events = {mousewheel: {
+	base: (Browser.firefox) ? 'DOMMouseScroll' : 'mousewheel'
+}};
 
-Element.Events = {
+if ('onmouseenter' in document.documentElement){
+	Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
+} else {
+	var check = function(event){
+		var related = event.relatedTarget;
+		if (related == null) return true;
+		if (!related) return false;
+		return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
+	};
 
-	mouseenter: {
+	Element.Events.mouseenter = {
 		base: 'mouseover',
 		condition: check
-	},
+	};
 
-	mouseleave: {
+	Element.Events.mouseleave = {
 		base: 'mouseout',
 		condition: check
+	};
+}
+
+/*<ltIE9>*/
+if (!window.addEventListener){
+	Element.NativeEvents.propertychange = 2;
+	Element.Events.change = {
+		base: function(){
+			var type = this.type;
+			return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change'
+		},
+		condition: function(event){
+			return this.type != 'radio' || (event.event.propertyName == 'checked' && this.checked);
+		}
+	}
+}
+/*</ltIE9>*/
+
+//<1.2compat>
+
+Element.Events = new Hash(Element.Events);
+
+//</1.2compat>
+
+})();
+
+
+/*
+---
+
+name: Element.Delegation
+
+description: Extends the Element native object to include the delegate method for more efficient event management.
+
+license: MIT-style license.
+
+requires: [Element.Event]
+
+provides: [Element.Delegation]
+
+...
+*/
+
+(function(){
+
+var eventListenerSupport = !!window.addEventListener;
+
+Element.NativeEvents.focusin = Element.NativeEvents.focusout = 2;
+
+var bubbleUp = function(self, match, fn, event, target){
+	while (target && target != self){
+		if (match(target, event)) return fn.call(target, event, target);
+		target = document.id(target.parentNode);
+	}
+};
+
+var map = {
+	mouseenter: {
+		base: 'mouseover'
+	},
+	mouseleave: {
+		base: 'mouseout'
+	},
+	focus: {
+		base: 'focus' + (eventListenerSupport ? '' : 'in'),
+		capture: true
+	},
+	blur: {
+		base: eventListenerSupport ? 'blur' : 'focusout',
+		capture: true
+	}
+};
+
+/*<ltIE9>*/
+var _key = '$delegation:';
+var formObserver = function(type){
+
+	return {
+
+		base: 'focusin',
+
+		remove: function(self, uid){
+			var list = self.retrieve(_key + type + 'listeners', {})[uid];
+			if (list && list.forms) for (var i = list.forms.length; i--;){
+				list.forms[i].removeEvent(type, list.fns[i]);
+			}
+		},
+
+		listen: function(self, match, fn, event, target, uid){
+			var form = (target.get('tag') == 'form') ? target : event.target.getParent('form');
+			if (!form) return;
+
+			var listeners = self.retrieve(_key + type + 'listeners', {}),
+				listener = listeners[uid] || {forms: [], fns: []},
+				forms = listener.forms, fns = listener.fns;
+
+			if (forms.indexOf(form) != -1) return;
+			forms.push(form);
+
+			var _fn = function(event){
+				bubbleUp(self, match, fn, event, target);
+			};
+			form.addEvent(type, _fn);
+			fns.push(_fn);
+
+			listeners[uid] = listener;
+			self.store(_key + type + 'listeners', listeners);
+		}
+	};
+};
+
+var inputObserver = function(type){
+	return {
+		base: 'focusin',
+		listen: function(self, match, fn, event, target){
+			var events = {blur: function(){
+				this.removeEvents(events);
+			}};
+			events[type] = function(event){
+				bubbleUp(self, match, fn, event, target);
+			};
+			event.target.addEvents(events);
+		}
+	};
+};
+
+if (!eventListenerSupport) Object.append(map, {
+	submit: formObserver('submit'),
+	reset: formObserver('reset'),
+	change: inputObserver('change'),
+	select: inputObserver('select')
+});
+/*</ltIE9>*/
+
+var proto = Element.prototype,
+	addEvent = proto.addEvent,
+	removeEvent = proto.removeEvent;
+
+var relay = function(old, method){
+	return function(type, fn, useCapture){
+		if (type.indexOf(':relay') == -1) return old.call(this, type, fn, useCapture);
+		var parsed = Slick.parse(type).expressions[0][0];
+		if (parsed.pseudos[0].key != 'relay') return old.call(this, type, fn, useCapture);
+		var newType = parsed.tag;
+		parsed.pseudos.slice(1).each(function(pseudo){
+			newType += ':' + pseudo.key + (pseudo.value ? '(' + pseudo.value + ')' : '');
+		});
+		old.call(this, type, fn);
+		return method.call(this, newType, parsed.pseudos[0].value, fn);
+	};
+};
+
+var delegation = {
+
+	addEvent: function(type, match, fn){
+		var storage = this.retrieve('$delegates', {}), stored = storage[type];
+		if (stored) for (var _uid in stored){
+			if (stored[_uid].fn == fn && stored[_uid].match == match) return this;
+		}
+
+		var _type = type, _match = match, _fn = fn, _map = map[type] || {};
+		type = _map.base || _type;
+
+		match = function(target){
+			return Slick.match(target, _match);
+		};
+
+		var elementEvent = Element.Events[_type];
+		if (elementEvent && elementEvent.condition){
+			var __match = match, condition = elementEvent.condition;
+			match = function(target, event){
+				return __match(target, event) && condition.call(target, event, type);
+			};
+		}
+
+		var self = this, uid = String.uniqueID();
+		var delegator = _map.listen ? function(event, target){
+			if (!target && event && event.target) target = event.target;
+			if (target) _map.listen(self, match, fn, event, target, uid);
+		} : function(event, target){
+			if (!target && event && event.target) target = event.target;
+			if (target) bubbleUp(self, match, fn, event, target);
+		};
+
+		if (!stored) stored = {};
+		stored[uid] = {
+			match: _match,
+			fn: _fn,
+			delegator: delegator
+		};
+		storage[_type] = stored;
+		return addEvent.call(this, type, delegator, _map.capture);
 	},
 
-	mousewheel: {
-		base: (Browser.firefox) ? 'DOMMouseScroll' : 'mousewheel'
+	removeEvent: function(type, match, fn, _uid){
+		var storage = this.retrieve('$delegates', {}), stored = storage[type];
+		if (!stored) return this;
+
+		if (_uid){
+			var _type = type, delegator = stored[_uid].delegator, _map = map[type] || {};
+			type = _map.base || _type;
+			if (_map.remove) _map.remove(this, _uid);
+			delete stored[_uid];
+			storage[_type] = stored;
+			return removeEvent.call(this, type, delegator);
+		}
+
+		var __uid, s;
+		if (fn) for (__uid in stored){
+			s = stored[__uid];
+			if (s.match == match && s.fn == fn) return delegation.removeEvent.call(this, type, match, fn, __uid);
+		} else for (__uid in stored){
+			s = stored[__uid];
+			if (s.match == match) delegation.removeEvent.call(this, type, match, s.fn, __uid);
+		}
+		return this;
 	}
 
 };
 
-
+[Element, Window, Document].invoke('implement', {
+	addEvent: relay(addEvent, delegation.addEvent),
+	removeEvent: relay(removeEvent, delegation.removeEvent)
+});
 
 })();
 
@@ -3961,14 +4844,13 @@ Element.implement({
 	},
 
 	getPosition: function(relative){
-		if (isBody(this)) return {x: 0, y: 0};
 		var offset = this.getOffsets(),
 			scroll = this.getScrolls();
 		var position = {
 			x: offset.x - scroll.x,
 			y: offset.y - scroll.y
 		};
-		
+
 		if (relative && (relative = document.id(relative))){
 			var relativePosition = relative.getPosition();
 			return {x: position.x - relativePosition.x - leftBorder(relative), y: position.y - relativePosition.y - topBorder(relative)};
@@ -4162,7 +5044,7 @@ var Fx = this.Fx = new Class({
 		} else {
 			this.frame++;
 		}
-		
+
 		if (this.frame < this.frames){
 			var delta = this.transition(this.frame / this.frames);
 			this.set(this.compute(this.from, this.to, delta));
@@ -4205,7 +5087,7 @@ var Fx = this.Fx = new Class({
 		pushInstance.call(this, fps);
 		return this;
 	},
-	
+
 	stop: function(){
 		if (this.isRunning()){
 			this.time = null;
@@ -4219,7 +5101,7 @@ var Fx = this.Fx = new Class({
 		}
 		return this;
 	},
-	
+
 	cancel: function(){
 		if (this.isRunning()){
 			this.time = null;
@@ -4229,7 +5111,7 @@ var Fx = this.Fx = new Class({
 		}
 		return this;
 	},
-	
+
 	pause: function(){
 		if (this.isRunning()){
 			this.time = null;
@@ -4237,12 +5119,12 @@ var Fx = this.Fx = new Class({
 		}
 		return this;
 	},
-	
+
 	resume: function(){
 		if ((this.frame < this.frames) && !this.isRunning()) pushInstance.call(this, this.options.fps);
 		return this;
 	},
-	
+
 	isRunning: function(){
 		var list = instances[this.options.fps];
 		return list && list.contains(this);
@@ -4312,12 +5194,31 @@ Fx.CSS = new Class({
 
 	prepare: function(element, property, values){
 		values = Array.from(values);
-		if (values[1] == null){
-			values[1] = values[0];
-			values[0] = element.getStyle(property);
+		var from = values[0], to = values[1];
+		if (to == null){
+			to = from;
+			from = element.getStyle(property);
+			var unit = this.options.unit;
+			// adapted from: https://github.com/ryanmorr/fx/blob/master/fx.js#L299
+			if (unit && from.slice(-unit.length) != unit && parseFloat(from) != 0){
+				element.setStyle(property, to + unit);
+				var value = element.getComputedStyle(property);
+				// IE and Opera support pixelLeft or pixelWidth
+				if (!(/px$/.test(value))){
+					value = element.style[('pixel-' + property).camelCase()];
+					if (value == null){
+						// adapted from Dean Edwards' http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+						var left = element.style.left;
+						element.style.left = to + unit;
+						value = element.style.pixelLeft;
+						element.style.left = left;
+					}
+				}
+				from = (to || 1) / (parseFloat(value) || 1) * (parseFloat(from) || 0);
+				element.setStyle(property, from + unit);
+			}
 		}
-		var parsed = values.map(this.parse);
-		return {from: parsed[0], to: parsed[1]};
+		return {from: this.parse(from), to: this.parse(to)};
 	},
 
 	//parses a value into an array
@@ -4432,7 +5333,11 @@ Fx.CSS.Parsers = {
 
 };
 
+//<1.2compat>
 
+Fx.CSS.Parsers = new Hash(Fx.CSS.Parsers);
+
+//</1.2compat>
 
 
 /*
@@ -4500,27 +5405,35 @@ Element.Properties.tween = {
 Element.implement({
 
 	tween: function(property, from, to){
-		this.get('tween').start(arguments);
+		this.get('tween').start(property, from, to);
 		return this;
 	},
 
 	fade: function(how){
-		var fade = this.get('tween'), o = 'opacity', toggle;
-		how = [how, 'toggle'].pick();
-		switch (how){
-			case 'in': fade.start(o, 1); break;
-			case 'out': fade.start(o, 0); break;
-			case 'show': fade.set(o, 1); break;
-			case 'hide': fade.set(o, 0); break;
+		var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
+		if (args[1] == null) args[1] = 'toggle';
+		switch (args[1]){
+			case 'in': method = 'start'; args[1] = 1; break;
+			case 'out': method = 'start'; args[1] = 0; break;
+			case 'show': method = 'set'; args[1] = 1; break;
+			case 'hide': method = 'set'; args[1] = 0; break;
 			case 'toggle':
-				var flag = this.retrieve('fade:flag', this.get('opacity') == 1);
-				fade.start(o, (flag) ? 0 : 1);
+				var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
+				method = 'start';
+				args[1] = flag ? 0 : 1;
 				this.store('fade:flag', !flag);
 				toggle = true;
 			break;
-			default: fade.start(o, arguments);
+			default: method = 'start';
 		}
 		if (!toggle) this.eliminate('fade:flag');
+		fade[method].apply(fade, args);
+		var to = args[args.length - 1];
+		if (method == 'set' || to != 0) this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
+		else fade.chain(function(){
+			this.element.setStyle('visibility', 'hidden');
+			this.callChain();
+		});
 		return this;
 	},
 
@@ -4677,7 +5590,11 @@ Fx.Transitions = {
 
 };
 
+//<1.2compat>
 
+Fx.Transitions = new Hash(Fx.Transitions);
+
+//</1.2compat>
 
 Fx.Transitions.extend = function(transitions){
 	for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
@@ -4805,7 +5722,7 @@ var Request = this.Request = new Class({
 		xhr.onreadystatechange = empty;
 		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
 		clearTimeout(this.timer);
-		
+
 		this.response = {text: this.xhr.responseText || '', xml: this.xhr.responseXML};
 		if (this.options.isSuccess.call(this, this.status))
 			this.success(this.response.text, this.response.xml);
@@ -4842,15 +5759,15 @@ var Request = this.Request = new Class({
 	onFailure: function(){
 		this.fireEvent('complete').fireEvent('failure', this.xhr);
 	},
-	
+
 	loadstart: function(event){
 		this.fireEvent('loadstart', [event, this.xhr]);
 	},
-	
+
 	progress: function(event){
 		this.fireEvent('progress', [event, this.xhr]);
 	},
-	
+
 	timeout: function(){
 		this.fireEvent('timeout', this.xhr);
 	},
@@ -4874,7 +5791,7 @@ var Request = this.Request = new Class({
 		}
 		return false;
 	},
-	
+
 	send: function(options){
 		if (!this.check(options)) return this;
 
@@ -4910,7 +5827,7 @@ var Request = this.Request = new Class({
 		}
 
 		if (!url) url = document.location.pathname;
-		
+
 		var trimPosition = url.lastIndexOf('/');
 		if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
 
@@ -4930,7 +5847,7 @@ var Request = this.Request = new Class({
 
 		xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
 		if (this.options.user && 'withCredentials' in xhr) xhr.withCredentials = true;
-		
+
 		xhr.onreadystatechange = this.onStateChange.bind(this);
 
 		Object.each(this.headers, function(value, key){
@@ -4944,7 +5861,7 @@ var Request = this.Request = new Class({
 		this.fireEvent('request');
 		xhr.send(data);
 		if (!this.options.async) this.onStateChange();
-		if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
+		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
 		return this;
 	},
 
@@ -5009,6 +5926,7 @@ Element.implement({
 
 })();
 
+
 /*
 ---
 
@@ -5051,11 +5969,18 @@ Request.HTML = new Class({
 		var temp = new Element('div').set('html', response.html);
 
 		response.tree = temp.childNodes;
-		response.elements = temp.getElements('*');
+		response.elements = temp.getElements(options.filter || '*');
 
-		if (options.filter) response.tree = response.elements.filter(options.filter);
-		if (options.update) document.id(options.update).empty().set('html', response.html);
-		else if (options.append) document.id(options.append).adopt(temp.getChildren());
+		if (options.filter) response.tree = response.elements;
+		if (options.update){
+			var update = document.id(options.update).empty();
+			if (options.filter) update.adopt(response.elements);
+			else update.set('html', response.html);
+		} else if (options.append){
+			var append = document.id(options.append);
+			if (options.filter) response.elements.reverse().inject(append);
+			else append.adopt(temp.getChildren());
+		}
 		if (options.evalScripts) Browser.exec(response.javascript);
 
 		this.onSuccess(response.tree, response.elements, response.html, response.javascript);
@@ -5101,7 +6026,7 @@ description: JSON encoder and decoder.
 
 license: MIT-style license.
 
-See Also: <http://www.json.org/>
+SeeAlso: <http://www.json.org/>
 
 requires: [Array, String, Number, Function]
 
@@ -5112,7 +6037,14 @@ provides: JSON
 
 if (typeof JSON == 'undefined') this.JSON = {};
 
+//<1.2compat>
 
+JSON = new Hash({
+	stringify: JSON.stringify,
+	parse: JSON.parse
+});
+
+//</1.2compat>
 
 (function(){
 
@@ -5322,7 +6254,7 @@ var domready = function(){
 	if (ready) return;
 	Browser.loaded = ready = true;
 	document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
-	
+
 	document.fireEvent('domready');
 	window.fireEvent('domready');
 };
@@ -5351,7 +6283,7 @@ var doScrollWorks = function(){
 		return true;
 	} catch (e){}
 	return false;
-}
+};
 // If doScroll works already, it can't be used to determine domready
 //   e.g. in an iframe
 if (testElement.doScroll && !doScrollWorks()){
diff --git a/web/tools/mootools/mootools-more-1.3.2.1-yc.js b/web/tools/mootools/mootools-more-1.3.2.1-yc.js
deleted file mode 100644
index 807e27ecf..000000000
--- a/web/tools/mootools/mootools-more-1.3.2.1-yc.js
+++ /dev/null
@@ -1,742 +0,0 @@
-// MooTools: the javascript framework.
-// Load this file's selection again by visiting: http://mootools.net/more/09f3e47813269cd5026cbf8c1f828e72 
-// Or build this file again with packager using: packager build More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos.Keys More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/Table More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Locale.en-GB.Date
-/*
----
-copyrights:
-  - [MooTools](http://mootools.net)
-
-licenses:
-  - [MIT License](http://mootools.net/license.txt)
-...
-*/
-MooTools.More={version:"1.3.2.1",build:"e586bcd2496e9b22acfde32e12f84d49ce09e59d"};(function(){var a={wait:function(b){return this.chain(function(){this.callChain.delay(b==null?500:b,this);
-return this;}.bind(this));}};Chain.implement(a);if(this.Fx){Fx.implement(a);}if(this.Element&&Element.implement&&this.Fx){Element.implement({chains:function(b){Array.from(b||["tween","morph","reveal"]).each(function(c){c=this.get(c);
-if(!c){return;}c.setOptions({link:"chain"});},this);return this;},pauseFx:function(c,b){this.chains(b).get(b||"tween").wait(c);return this;}});}})();(function(a){Array.implement({min:function(){return Math.min.apply(null,this);
-},max:function(){return Math.max.apply(null,this);},average:function(){return this.length?this.sum()/this.length:0;},sum:function(){var b=0,c=this.length;
-if(c){while(c--){b+=this[c];}}return b;},unique:function(){return[].combine(this);},shuffle:function(){for(var c=this.length;c&&--c;){var b=this[c],d=Math.floor(Math.random()*(c+1));
-this[c]=this[d];this[d]=b;}return this;},reduce:function(d,e){for(var c=0,b=this.length;c<b;c++){if(c in this){e=e===a?this[c]:d.call(null,e,this[c],c,this);
-}}return e;},reduceRight:function(c,d){var b=this.length;while(b--){if(b in this){d=d===a?this[b]:c.call(null,d,this[b],b,this);}}return d;}});})();(function(){var b=function(c){return c!=null;
-};var a=Object.prototype.hasOwnProperty;Object.extend({getFromPath:function(e,f){if(typeof f=="string"){f=f.split(".");}for(var d=0,c=f.length;d<c;d++){if(a.call(e,f[d])){e=e[f[d]];
-}else{return null;}}return e;},cleanValues:function(c,e){e=e||b;for(var d in c){if(!e(c[d])){delete c[d];}}return c;},erase:function(c,d){if(a.call(c,d)){delete c[d];
-}return c;},run:function(d){var c=Array.slice(arguments,1);for(var e in d){if(d[e].apply){d[e].apply(d,c);}}return d;}});})();(function(){var b=null,a={},d={};
-var c=function(f){if(instanceOf(f,e.Set)){return f;}else{return a[f];}};var e=this.Locale={define:function(f,j,h,i){var g;if(instanceOf(f,e.Set)){g=f.name;
-if(g){a[g]=f;}}else{g=f;if(!a[g]){a[g]=new e.Set(g);}f=a[g];}if(j){f.define(j,h,i);}if(!b){b=f;}return f;},use:function(f){f=c(f);if(f){b=f;this.fireEvent("change",f);
-}return this;},getCurrent:function(){return b;},get:function(g,f){return(b)?b.get(g,f):"";},inherit:function(f,g,h){f=c(f);if(f){f.inherit(g,h);}return this;
-},list:function(){return Object.keys(a);}};Object.append(e,new Events);e.Set=new Class({sets:{},inherits:{locales:[],sets:{}},initialize:function(f){this.name=f||"";
-},define:function(i,g,h){var f=this.sets[i];if(!f){f={};}if(g){if(typeOf(g)=="object"){f=Object.merge(f,g);}else{f[g]=h;}}this.sets[i]=f;return this;},get:function(r,j,q){var p=Object.getFromPath(this.sets,r);
-if(p!=null){var m=typeOf(p);if(m=="function"){p=p.apply(null,Array.from(j));}else{if(m=="object"){p=Object.clone(p);}}return p;}var h=r.indexOf("."),o=h<0?r:r.substr(0,h),k=(this.inherits.sets[o]||[]).combine(this.inherits.locales).include("en-US");
-if(!q){q=[];}for(var g=0,f=k.length;g<f;g++){if(q.contains(k[g])){continue;}q.include(k[g]);var n=a[k[g]];if(!n){continue;}p=n.get(r,j,q);if(p!=null){return p;
-}}return"";},inherit:function(g,h){g=Array.from(g);if(h&&!this.inherits.sets[h]){this.inherits.sets[h]=[];}var f=g.length;while(f--){(h?this.inherits.sets[h]:this.inherits.locales).unshift(g[f]);
-}return this;}});})();Locale.define("en-US","Date",{months:["January","February","March","April","May","June","July","August","September","October","November","December"],months_abbr:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],days_abbr:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dateOrder:["month","date","year"],shortDate:"%m/%d/%Y",shortTime:"%I:%M%p",AM:"AM",PM:"PM",firstDayOfWeek:0,ordinal:function(a){return(a>3&&a<21)?"th":["th","st","nd","rd","th"][Math.min(a%10,4)];
-},lessThanMinuteAgo:"less than a minute ago",minuteAgo:"about a minute ago",minutesAgo:"{delta} minutes ago",hourAgo:"about an hour ago",hoursAgo:"about {delta} hours ago",dayAgo:"1 day ago",daysAgo:"{delta} days ago",weekAgo:"1 week ago",weeksAgo:"{delta} weeks ago",monthAgo:"1 month ago",monthsAgo:"{delta} months ago",yearAgo:"1 year ago",yearsAgo:"{delta} years ago",lessThanMinuteUntil:"less than a minute from now",minuteUntil:"about a minute from now",minutesUntil:"{delta} minutes from now",hourUntil:"about an hour from now",hoursUntil:"about {delta} hours from now",dayUntil:"1 day from now",daysUntil:"{delta} days from now",weekUntil:"1 week from now",weeksUntil:"{delta} weeks from now",monthUntil:"1 month from now",monthsUntil:"{delta} months from now",yearUntil:"1 year from now",yearsUntil:"{delta} years from now"});
-(function(){var a=this.Date;var f=a.Methods={ms:"Milliseconds",year:"FullYear",min:"Minutes",mo:"Month",sec:"Seconds",hr:"Hours"};["Date","Day","FullYear","Hours","Milliseconds","Minutes","Month","Seconds","Time","TimezoneOffset","Week","Timezone","GMTOffset","DayOfYear","LastMonth","LastDayOfMonth","UTCDate","UTCDay","UTCFullYear","AMPM","Ordinal","UTCHours","UTCMilliseconds","UTCMinutes","UTCMonth","UTCSeconds","UTCMilliseconds"].each(function(t){a.Methods[t.toLowerCase()]=t;
-});var p=function(v,u,t){if(u==1){return v;}return v<Math.pow(10,u-1)?(t||"0")+p(v,u-1,t):v;};a.implement({set:function(v,t){v=v.toLowerCase();var u=f[v]&&"set"+f[v];
-if(u&&this[u]){this[u](t);}return this;}.overloadSetter(),get:function(u){u=u.toLowerCase();var t=f[u]&&"get"+f[u];if(t&&this[t]){return this[t]();}return null;
-}.overloadGetter(),clone:function(){return new a(this.get("time"));},increment:function(t,v){t=t||"day";v=v!=null?v:1;switch(t){case"year":return this.increment("month",v*12);
-case"month":var u=this.get("date");this.set("date",1).set("mo",this.get("mo")+v);return this.set("date",u.min(this.get("lastdayofmonth")));case"week":return this.increment("day",v*7);
-case"day":return this.set("date",this.get("date")+v);}if(!a.units[t]){throw new Error(t+" is not a supported interval");}return this.set("time",this.get("time")+v*a.units[t]());
-},decrement:function(t,u){return this.increment(t,-1*(u!=null?u:1));},isLeapYear:function(){return a.isLeapYear(this.get("year"));},clearTime:function(){return this.set({hr:0,min:0,sec:0,ms:0});
-},diff:function(u,t){if(typeOf(u)=="string"){u=a.parse(u);}return((u-this)/a.units[t||"day"](3,3)).round();},getLastDayOfMonth:function(){return a.daysInMonth(this.get("mo"),this.get("year"));
-},getDayOfYear:function(){return(a.UTC(this.get("year"),this.get("mo"),this.get("date")+1)-a.UTC(this.get("year"),0,1))/a.units.day();},setDay:function(u,t){if(t==null){t=a.getMsg("firstDayOfWeek");
-if(t===""){t=1;}}u=(7+a.parseDay(u,true)-t)%7;var v=(7+this.get("day")-t)%7;return this.increment("day",u-v);},getWeek:function(w){if(w==null){w=a.getMsg("firstDayOfWeek");
-if(w===""){w=1;}}var y=this,v=(7+y.get("day")-w)%7,u=0,x;if(w==1){var z=y.get("month"),t=y.get("date")-v;if(z==11&&t>28){return 1;}if(z==0&&t<-2){y=new a(y).decrement("day",v);
-v=0;}x=new a(y.get("year"),0,1).get("day")||7;if(x>4){u=-7;}}else{x=new a(y.get("year"),0,1).get("day");}u+=y.get("dayofyear");u+=6-v;u+=(7+x-w)%7;return(u/7);
-},getOrdinal:function(t){return a.getMsg("ordinal",t||this.get("date"));},getTimezone:function(){return this.toString().replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/,"$1").replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/,"$1$2$3");
-},getGMTOffset:function(){var t=this.get("timezoneOffset");return((t>0)?"-":"+")+p((t.abs()/60).floor(),2)+p(t%60,2);},setAMPM:function(t){t=t.toUpperCase();
-var u=this.get("hr");if(u>11&&t=="AM"){return this.decrement("hour",12);}else{if(u<12&&t=="PM"){return this.increment("hour",12);}}return this;},getAMPM:function(){return(this.get("hr")<12)?"AM":"PM";
-},parse:function(t){this.set("time",a.parse(t));return this;},isValid:function(t){return !isNaN((t||this).valueOf());},format:function(u){if(!this.isValid()){return"invalid date";
-}if(!u){u="%x %X";}var t=u.toLowerCase();if(s[t]){return s[t](this);}u=g[t]||u;var v=this;return u.replace(/%([a-z%])/gi,function(x,w){switch(w){case"a":return a.getMsg("days_abbr")[v.get("day")];
-case"A":return a.getMsg("days")[v.get("day")];case"b":return a.getMsg("months_abbr")[v.get("month")];case"B":return a.getMsg("months")[v.get("month")];
-case"c":return v.format("%a %b %d %H:%M:%S %Y");case"d":return p(v.get("date"),2);case"e":return p(v.get("date"),2," ");case"H":return p(v.get("hr"),2);
-case"I":return p((v.get("hr")%12)||12,2);case"j":return p(v.get("dayofyear"),3);case"k":return p(v.get("hr"),2," ");case"l":return p((v.get("hr")%12)||12,2," ");
-case"L":return p(v.get("ms"),3);case"m":return p((v.get("mo")+1),2);case"M":return p(v.get("min"),2);case"o":return v.get("ordinal");case"p":return a.getMsg(v.get("ampm"));
-case"s":return Math.round(v/1000);case"S":return p(v.get("seconds"),2);case"T":return v.format("%H:%M:%S");case"U":return p(v.get("week"),2);case"w":return v.get("day");
-case"x":return v.format(a.getMsg("shortDate"));case"X":return v.format(a.getMsg("shortTime"));case"y":return v.get("year").toString().substr(2);case"Y":return v.get("year");
-case"z":return v.get("GMTOffset");case"Z":return v.get("Timezone");}return w;});},toISOString:function(){return this.format("iso8601");}}).alias({toJSON:"toISOString",compare:"diff",strftime:"format"});
-var g={db:"%Y-%m-%d %H:%M:%S",compact:"%Y%m%dT%H%M%S","short":"%d %b %H:%M","long":"%B %d, %Y %H:%M"};var k=["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],h=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
-var s={rfc822:function(t){return k[t.get("day")]+t.format(", %d ")+h[t.get("month")]+t.format(" %Y %H:%M:%S %Z");},rfc2822:function(t){return k[t.get("day")]+t.format(", %d ")+h[t.get("month")]+t.format(" %Y %H:%M:%S %z");
-},iso8601:function(t){return(t.getUTCFullYear()+"-"+p(t.getUTCMonth()+1,2)+"-"+p(t.getUTCDate(),2)+"T"+p(t.getUTCHours(),2)+":"+p(t.getUTCMinutes(),2)+":"+p(t.getUTCSeconds(),2)+"."+p(t.getUTCMilliseconds(),3)+"Z");
-}};var c=[],n=a.parse;var r=function(w,y,v){var u=-1,x=a.getMsg(w+"s");switch(typeOf(y)){case"object":u=x[y.get(w)];break;case"number":u=x[y];if(!u){throw new Error("Invalid "+w+" index: "+y);
-}break;case"string":var t=x.filter(function(z){return this.test(z);},new RegExp("^"+y,"i"));if(!t.length){throw new Error("Invalid "+w+" string");}if(t.length>1){throw new Error("Ambiguous "+w);
-}u=t[0];}return(v)?x.indexOf(u):u;};var i=1900,o=70;a.extend({getMsg:function(u,t){return Locale.get("Date."+u,t);},units:{ms:Function.from(1),second:Function.from(1000),minute:Function.from(60000),hour:Function.from(3600000),day:Function.from(86400000),week:Function.from(608400000),month:function(u,t){var v=new a;
-return a.daysInMonth(u!=null?u:v.get("mo"),t!=null?t:v.get("year"))*86400000;},year:function(t){t=t||new a().get("year");return a.isLeapYear(t)?31622400000:31536000000;
-}},daysInMonth:function(u,t){return[31,a.isLeapYear(t)?29:28,31,30,31,30,31,31,30,31,30,31][u];},isLeapYear:function(t){return((t%4===0)&&(t%100!==0))||(t%400===0);
-},parse:function(w){var v=typeOf(w);if(v=="number"){return new a(w);}if(v!="string"){return w;}w=w.clean();if(!w.length){return null;}var u;c.some(function(x){var t=x.re.exec(w);
-return(t)?(u=x.handler(t)):false;});if(!(u&&u.isValid())){u=new a(n(w));if(!(u&&u.isValid())){u=new a(w.toInt());}}return u;},parseDay:function(t,u){return r("day",t,u);
-},parseMonth:function(u,t){return r("month",u,t);},parseUTC:function(u){var t=new a(u);var v=a.UTC(t.get("year"),t.get("mo"),t.get("date"),t.get("hr"),t.get("min"),t.get("sec"),t.get("ms"));
-return new a(v);},orderIndex:function(t){return a.getMsg("dateOrder").indexOf(t)+1;},defineFormat:function(t,u){g[t]=u;return this;},defineFormats:function(t){for(var u in t){a.defineFormat(u,t[u]);
-}return this;},defineParser:function(t){c.push((t.re&&t.handler)?t:l(t));return this;},defineParsers:function(){Array.flatten(arguments).each(a.defineParser);
-return this;},define2DigitYearStart:function(t){o=t%100;i=t-o;return this;}});var d=function(t){return new RegExp("(?:"+a.getMsg(t).map(function(u){return u.substr(0,3);
-}).join("|")+")[a-z]*");};var m=function(t){switch(t){case"T":return"%H:%M:%S";case"x":return((a.orderIndex("month")==1)?"%m[-./]%d":"%d[-./]%m")+"([-./]%y)?";
-case"X":return"%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?";}return null;};var j={d:/[0-2]?[0-9]|3[01]/,H:/[01]?[0-9]|2[0-3]/,I:/0?[1-9]|1[0-2]/,M:/[0-5]?\d/,s:/\d+/,o:/[a-z]*/,p:/[ap]\.?m\.?/,y:/\d{2}|\d{4}/,Y:/\d{4}/,z:/Z|[+-]\d{2}(?::?\d{2})?/};
-j.m=j.I;j.S=j.M;var e;var b=function(t){e=t;j.a=j.A=d("days");j.b=j.B=d("months");c.each(function(v,u){if(v.format){c[u]=l(v.format);}});};var l=function(v){if(!e){return{format:v};
-}var t=[];var u=(v.source||v).replace(/%([a-z])/gi,function(x,w){return m(w)||x;}).replace(/\((?!\?)/g,"(?:").replace(/ (?!\?|\*)/g,",? ").replace(/%([a-z%])/gi,function(x,w){var y=j[w];
-if(!y){return w;}t.push(w);return"("+y.source+")";}).replace(/\[a-z\]/gi,"[a-z\\u00c0-\\uffff;&]");return{format:v,re:new RegExp("^"+u+"$","i"),handler:function(z){z=z.slice(1).associate(t);
-var w=new a().clearTime(),y=z.y||z.Y;if(y!=null){q.call(w,"y",y);}if("d" in z){q.call(w,"d",1);}if("m" in z||z.b||z.B){q.call(w,"m",1);}for(var x in z){q.call(w,x,z[x]);
-}return w;}};};var q=function(t,u){if(!u){return this;}switch(t){case"a":case"A":return this.set("day",a.parseDay(u,true));case"b":case"B":return this.set("mo",a.parseMonth(u,true));
-case"d":return this.set("date",u);case"H":case"I":return this.set("hr",u);case"m":return this.set("mo",u-1);case"M":return this.set("min",u);case"p":return this.set("ampm",u.replace(/\./g,""));
-case"S":return this.set("sec",u);case"s":return this.set("ms",("0."+u)*1000);case"w":return this.set("day",u);case"Y":return this.set("year",u);case"y":u=+u;
-if(u<100){u+=i+(u<o?100:0);}return this.set("year",u);case"z":if(u=="Z"){u="+00";}var v=u.match(/([+-])(\d{2}):?(\d{2})?/);v=(v[1]+"1")*(v[2]*60+(+v[3]||0))+this.getTimezoneOffset();
-return this.set("time",this-v*60000);}return this;};a.defineParsers("%Y([-./]%m([-./]%d((T| )%X)?)?)?","%Y%m%d(T%H(%M%S?)?)?","%x( %X)?","%d%o( %b( %Y)?)?( %X)?","%b( %d%o)?( %Y)?( %X)?","%Y %b( %d%o( %X)?)?","%o %b %d %X %z %Y","%T","%H:%M( ?%p)?");
-Locale.addEvent("change",function(t){if(Locale.get("Date")){b(t);}}).fireEvent("change",Locale.getCurrent());})();Date.implement({timeDiffInWords:function(a){return Date.distanceOfTimeInWords(this,a||new Date);
-},timeDiff:function(f,c){if(f==null){f=new Date;}var h=((f-this)/1000).floor().abs();var e=[],a=[60,60,24,365,0],d=["s","m","h","d","y"],g,b;for(var i=0;
-i<a.length;i++){if(i&&!h){break;}g=h;if((b=a[i])){g=(h%b);h=(h/b).floor();}e.unshift(g+(d[i]||""));}return e.join(c||":");}}).extend({distanceOfTimeInWords:function(b,a){return Date.getTimePhrase(((a-b)/1000).toInt());
-},getTimePhrase:function(f){var d=(f<0)?"Until":"Ago";if(f<0){f*=-1;}var b={minute:60,hour:60,day:24,week:7,month:52/12,year:12,eon:Infinity};var e="lessThanMinute";
-for(var c in b){var a=b[c];if(f<1.5*a){if(f>0.75*a){e=c;}break;}f/=a;e=c+"s";}f=f.round();return Date.getMsg(e+d,f).substitute({delta:f});}}).defineParsers({re:/^(?:tod|tom|yes)/i,handler:function(a){var b=new Date().clearTime();
-switch(a[0]){case"tom":return b.increment();case"yes":return b.decrement();default:return b;}}},{re:/^(next|last) ([a-z]+)$/i,handler:function(e){var f=new Date().clearTime();
-var b=f.getDay();var c=Date.parseDay(e[2],true);var a=c-b;if(c<=b){a+=7;}if(e[1]=="last"){a-=7;}return f.set("date",f.getDate()+a);}}).alias("timeAgoInWords","timeDiffInWords");
-Locale.define("en-US","Number",{decimal:".",group:",",currency:{prefix:"$ "}});Number.implement({format:function(q){var n=this;q=q?Object.clone(q):{};var a=function(i){if(q[i]!=null){return q[i];
-}return Locale.get("Number."+i);};var f=n<0,h=a("decimal"),k=a("precision"),o=a("group"),c=a("decimals");if(f){var e=a("negative")||{};if(e.prefix==null&&e.suffix==null){e.prefix="-";
-}["prefix","suffix"].each(function(i){if(e[i]){q[i]=a(i)+e[i];}});n=-n;}var l=a("prefix"),p=a("suffix");if(c!==""&&c>=0&&c<=20){n=n.toFixed(c);}if(k>=1&&k<=21){n=(+n).toPrecision(k);
-}n+="";var m;if(a("scientific")===false&&n.indexOf("e")>-1){var j=n.split("e"),b=+j[1];n=j[0].replace(".","");if(b<0){b=-b-1;m=j[0].indexOf(".");if(m>-1){b-=m-1;
-}while(b--){n="0"+n;}n="0."+n;}else{m=j[0].lastIndexOf(".");if(m>-1){b-=j[0].length-m-1;}while(b--){n+="0";}}}if(h!="."){n=n.replace(".",h);}if(o){m=n.lastIndexOf(h);
-m=(m>-1)?m:n.length;var d=n.substring(m),g=m;while(g--){if((m-g-1)%3==0&&g!=(m-1)){d=o+d;}d=n.charAt(g)+d;}n=d;}if(l){n=l+n;}if(p){n+=p;}return n;},formatCurrency:function(){var a=Locale.get("Number.currency")||{};
-if(a.scientific==null){a.scientific=false;}if(a.decimals==null){a.decimals=2;}return this.format(a);},formatPercentage:function(){var a=Locale.get("Number.percentage")||{};
-if(a.suffix==null){a.suffix="%";}if(a.decimals==null){a.decimals=2;}return this.format(a);}});(function(){var c={a:/[àáâãäåăą]/g,A:/[ÀÁÂÃÄÅĂĄ]/g,c:/[ćčç]/g,C:/[ĆČÇ]/g,d:/[ďđ]/g,D:/[ĎÐ]/g,e:/[èéêëěę]/g,E:/[ÈÉÊËĚĘ]/g,g:/[ğ]/g,G:/[Ğ]/g,i:/[ìíîï]/g,I:/[ÌÍÎÏ]/g,l:/[ĺľł]/g,L:/[ĹĽŁ]/g,n:/[ñňń]/g,N:/[ÑŇŃ]/g,o:/[òóôõöøő]/g,O:/[ÒÓÔÕÖØ]/g,r:/[řŕ]/g,R:/[ŘŔ]/g,s:/[ššş]/g,S:/[ŠŞŚ]/g,t:/[ťţ]/g,T:/[ŤŢ]/g,ue:/[ü]/g,UE:/[Ü]/g,u:/[ùúûůµ]/g,U:/[ÙÚÛŮ]/g,y:/[ÿý]/g,Y:/[ŸÝ]/g,z:/[žźż]/g,Z:/[ŽŹŻ]/g,th:/[þ]/g,TH:/[Þ]/g,dh:/[ð]/g,DH:/[Ð]/g,ss:/[ß]/g,oe:/[œ]/g,OE:/[Œ]/g,ae:/[æ]/g,AE:/[Æ]/g},b={" ":/[\xa0\u2002\u2003\u2009]/g,"*":/[\xb7]/g,"'":/[\u2018\u2019]/g,'"':/[\u201c\u201d]/g,"...":/[\u2026]/g,"-":/[\u2013]/g,"&raquo;":/[\uFFFD]/g};
-var a=function(f,h){var e=f,g;for(g in h){e=e.replace(h[g],g);}return e;};var d=function(e,g){e=e||"";var h=g?"<"+e+"(?!\\w)[^>]*>([\\s\\S]*?)</"+e+"(?!\\w)>":"</?"+e+"([^>]+)?>",f=new RegExp(h,"gi");
-return f;};String.implement({standardize:function(){return a(this,c);},repeat:function(e){return new Array(e+1).join(this);},pad:function(e,h,g){if(this.length>=e){return this;
-}var f=(h==null?" ":""+h).repeat(e-this.length).substr(0,e-this.length);if(!g||g=="right"){return this+f;}if(g=="left"){return f+this;}return f.substr(0,(f.length/2).floor())+this+f.substr(0,(f.length/2).ceil());
-},getTags:function(e,f){return this.match(d(e,f))||[];},stripTags:function(e,f){return this.replace(d(e,f),"");},tidy:function(){return a(this,b);},truncate:function(e,f,i){var h=this;
-if(f==null&&arguments.length==1){f="…";}if(h.length>e){h=h.substring(0,e);if(i){var g=h.lastIndexOf(i);if(g!=-1){h=h.substr(0,g);}}if(f){h+=f;}}return h;
-}});})();String.implement({parseQueryString:function(d,a){if(d==null){d=true;}if(a==null){a=true;}var c=this.split(/[&;]/),b={};if(!c.length){return b;
-}c.each(function(i){var e=i.indexOf("=")+1,g=e?i.substr(e):"",f=e?i.substr(0,e-1).match(/([^\]\[]+|(\B)(?=\]))/g):[i],h=b;if(!f){return;}if(a){g=decodeURIComponent(g);
-}f.each(function(k,j){if(d){k=decodeURIComponent(k);}var l=h[k];if(j<f.length-1){h=h[k]=l||{};}else{if(typeOf(l)=="array"){l.push(g);}else{h[k]=l!=null?[l,g]:g;
-}}});});return b;},cleanQueryString:function(a){return this.split("&").filter(function(e){var b=e.indexOf("="),c=b<0?"":e.substr(0,b),d=e.substr(b+1);return a?a.call(null,c,d):(d||d===0);
-}).join("&");}});(function(){var b=function(){return this.get("value");};var a=this.URI=new Class({Implements:Options,options:{},regex:/^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,parts:["scheme","user","password","host","port","directory","file","query","fragment"],schemes:{http:80,https:443,ftp:21,rtsp:554,mms:1755,file:0},initialize:function(d,c){this.setOptions(c);
-var e=this.options.base||a.base;if(!d){d=e;}if(d&&d.parsed){this.parsed=Object.clone(d.parsed);}else{this.set("value",d.href||d.toString(),e?new a(e):false);
-}},parse:function(e,d){var c=e.match(this.regex);if(!c){return false;}c.shift();return this.merge(c.associate(this.parts),d);},merge:function(d,c){if((!d||!d.scheme)&&(!c||!c.scheme)){return false;
-}if(c){this.parts.every(function(e){if(d[e]){return false;}d[e]=c[e]||"";return true;});}d.port=d.port||this.schemes[d.scheme.toLowerCase()];d.directory=d.directory?this.parseDirectory(d.directory,c?c.directory:""):"/";
-return d;},parseDirectory:function(d,e){d=(d.substr(0,1)=="/"?"":(e||"/"))+d;if(!d.test(a.regs.directoryDot)){return d;}var c=[];d.replace(a.regs.endSlash,"").split("/").each(function(f){if(f==".."&&c.length>0){c.pop();
-}else{if(f!="."){c.push(f);}}});return c.join("/")+"/";},combine:function(c){return c.value||c.scheme+"://"+(c.user?c.user+(c.password?":"+c.password:"")+"@":"")+(c.host||"")+(c.port&&c.port!=this.schemes[c.scheme]?":"+c.port:"")+(c.directory||"/")+(c.file||"")+(c.query?"?"+c.query:"")+(c.fragment?"#"+c.fragment:"");
-},set:function(d,f,e){if(d=="value"){var c=f.match(a.regs.scheme);if(c){c=c[1];}if(c&&this.schemes[c.toLowerCase()]==null){this.parsed={scheme:c,value:f};
-}else{this.parsed=this.parse(f,(e||this).parsed)||(c?{scheme:c,value:f}:{value:f});}}else{if(d=="data"){this.setData(f);}else{this.parsed[d]=f;}}return this;
-},get:function(c,d){switch(c){case"value":return this.combine(this.parsed,d?d.parsed:false);case"data":return this.getData();}return this.parsed[c]||"";
-},go:function(){document.location.href=this.toString();},toURI:function(){return this;},getData:function(e,d){var c=this.get(d||"query");if(!(c||c===0)){return e?null:{};
-}var f=c.parseQueryString();return e?f[e]:f;},setData:function(c,f,d){if(typeof c=="string"){var e=this.getData();e[arguments[0]]=arguments[1];c=e;}else{if(f){c=Object.merge(this.getData(),c);
-}}return this.set(d||"query",Object.toQueryString(c));},clearData:function(c){return this.set(c||"query","");},toString:b,valueOf:b});a.regs={endSlash:/\/$/,scheme:/^(\w+):/,directoryDot:/\.\/|\.$/};
-a.base=new a(Array.from(document.getElements("base[href]",true)).getLast(),{base:document.location});String.implement({toURI:function(c){return new a(this,c);
-}});})();Class.refactor=function(b,a){Object.each(a,function(e,d){var c=b.prototype[d];c=(c&&c.$origin)||c||function(){};b.implement(d,(typeof e=="function")?function(){var f=this.previous;
-this.previous=c;var g=e.apply(this,arguments);this.previous=f;return g;}:e);});return b;};URI=Class.refactor(URI,{combine:function(f,e){if(!e||f.scheme!=e.scheme||f.host!=e.host||f.port!=e.port){return this.previous.apply(this,arguments);
-}var a=f.file+(f.query?"?"+f.query:"")+(f.fragment?"#"+f.fragment:"");if(!e.directory){return(f.directory||(f.file?"":"./"))+a;}var d=e.directory.split("/"),c=f.directory.split("/"),g="",h;
-var b=0;for(h=0;h<d.length&&h<c.length&&d[h]==c[h];h++){}for(b=0;b<d.length-h-1;b++){g+="../";}for(b=h;b<c.length-1;b++){g+=c[b]+"/";}return(g||(f.file?"":"./"))+a;
-},toAbsolute:function(a){a=new URI(a);if(a){a.set("directory","").set("file","");}return this.toRelative(a);},toRelative:function(a){return this.get("value",new URI(a));
-}});(function(){if(this.Hash){return;}var a=this.Hash=new Type("Hash",function(b){if(typeOf(b)=="hash"){b=Object.clone(b.getClean());}for(var c in b){this[c]=b[c];
-}return this;});this.$H=function(b){return new a(b);};a.implement({forEach:function(b,c){Object.forEach(this,b,c);},getClean:function(){var c={};for(var b in this){if(this.hasOwnProperty(b)){c[b]=this[b];
-}}return c;},getLength:function(){var c=0;for(var b in this){if(this.hasOwnProperty(b)){c++;}}return c;}});a.alias("each","forEach");a.implement({has:Object.prototype.hasOwnProperty,keyOf:function(b){return Object.keyOf(this,b);
-},hasValue:function(b){return Object.contains(this,b);},extend:function(b){a.each(b||{},function(d,c){a.set(this,c,d);},this);return this;},combine:function(b){a.each(b||{},function(d,c){a.include(this,c,d);
-},this);return this;},erase:function(b){if(this.hasOwnProperty(b)){delete this[b];}return this;},get:function(b){return(this.hasOwnProperty(b))?this[b]:null;
-},set:function(b,c){if(!this[b]||this.hasOwnProperty(b)){this[b]=c;}return this;},empty:function(){a.each(this,function(c,b){delete this[b];},this);return this;
-},include:function(b,c){if(this[b]==undefined){this[b]=c;}return this;},map:function(b,c){return new a(Object.map(this,b,c));},filter:function(b,c){return new a(Object.filter(this,b,c));
-},every:function(b,c){return Object.every(this,b,c);},some:function(b,c){return Object.some(this,b,c);},getKeys:function(){return Object.keys(this);},getValues:function(){return Object.values(this);
-},toQueryString:function(b){return Object.toQueryString(this,b);}});a.alias({indexOf:"keyOf",contains:"hasValue"});})();Hash.implement({getFromPath:function(a){return Object.getFromPath(this,a);
-},cleanValues:function(a){return new Hash(Object.cleanValues(this,a));},run:function(){Object.run(arguments);}});Element.implement({tidy:function(){this.set("value",this.get("value").tidy());
-},getTextInRange:function(b,a){return this.get("value").substring(b,a);},getSelectedText:function(){if(this.setSelectionRange){return this.getTextInRange(this.getSelectionStart(),this.getSelectionEnd());
-}return document.selection.createRange().text;},getSelectedRange:function(){if(this.selectionStart!=null){return{start:this.selectionStart,end:this.selectionEnd};
-}var e={start:0,end:0};var a=this.getDocument().selection.createRange();if(!a||a.parentElement()!=this){return e;}var c=a.duplicate();if(this.type=="text"){e.start=0-c.moveStart("character",-100000);
-e.end=e.start+a.text.length;}else{var b=this.get("value");var d=b.length;c.moveToElementText(this);c.setEndPoint("StartToEnd",a);if(c.text.length){d-=b.match(/[\n\r]*$/)[0].length;
-}e.end=d-c.text.length;c.setEndPoint("StartToStart",a);e.start=d-c.text.length;}return e;},getSelectionStart:function(){return this.getSelectedRange().start;
-},getSelectionEnd:function(){return this.getSelectedRange().end;},setCaretPosition:function(a){if(a=="end"){a=this.get("value").length;}this.selectRange(a,a);
-return this;},getCaretPosition:function(){return this.getSelectedRange().start;},selectRange:function(e,a){if(this.setSelectionRange){this.focus();this.setSelectionRange(e,a);
-}else{var c=this.get("value");var d=c.substr(e,a-e).replace(/\r/g,"").length;e=c.substr(0,e).replace(/\r/g,"").length;var b=this.createTextRange();b.collapse(true);
-b.moveEnd("character",e+d);b.moveStart("character",e);b.select();}return this;},insertAtCursor:function(b,a){var d=this.getSelectedRange();var c=this.get("value");
-this.set("value",c.substring(0,d.start)+b+c.substring(d.end,c.length));if(a!==false){this.selectRange(d.start,d.start+b.length);}else{this.setCaretPosition(d.start+b.length);
-}return this;},insertAroundCursor:function(b,a){b=Object.append({before:"",defaultMiddle:"",after:""},b);var c=this.getSelectedText()||b.defaultMiddle;
-var g=this.getSelectedRange();var f=this.get("value");if(g.start==g.end){this.set("value",f.substring(0,g.start)+b.before+c+b.after+f.substring(g.end,f.length));
-this.selectRange(g.start+b.before.length,g.end+b.before.length+c.length);}else{var d=f.substring(g.start,g.end);this.set("value",f.substring(0,g.start)+b.before+d+b.after+f.substring(g.end,f.length));
-var e=g.start+b.before.length;if(a!==false){this.selectRange(e,e+d.length);}else{this.setCaretPosition(e+f.length);}}return this;}});Elements.from=function(e,d){if(d||d==null){e=e.stripScripts();
-}var b,c=e.match(/^\s*<(t[dhr]|tbody|tfoot|thead)/i);if(c){b=new Element("table");var a=c[1].toLowerCase();if(["td","th","tr"].contains(a)){b=new Element("tbody").inject(b);
-if(a!="tr"){b=new Element("tr").inject(b);}}}return(b||new Element("div")).set("html",e).getChildren();};Events.Pseudos=function(g,c,e){var b="monitorEvents:";
-var a=function(h){return{store:h.store?function(i,j){h.store(b+i,j);}:function(i,j){(h.$monitorEvents||(h.$monitorEvents={}))[i]=j;},retrieve:h.retrieve?function(i,j){return h.retrieve(b+i,j);
-}:function(i,j){if(!h.$monitorEvents){return j;}return h.$monitorEvents[i]||j;}};};var f=function(j){if(j.indexOf(":")==-1||!g){return null;}var i=Slick.parse(j).expressions[0][0],m=i.pseudos,h=m.length,k=[];
-while(h--){if(g[m[h].key]){k.push({event:i.tag,value:m[h].value,pseudo:m[h].key,original:j});}}return k.length?k:null;};var d=function(h){return Object.merge.apply(this,h.map(function(i){return g[i.pseudo].options||{};
-}));};return{addEvent:function(m,p,j){var n=f(m);if(!n){return c.call(this,m,p,j);}var k=a(this),s=k.retrieve(m,[]),h=n[0].event,t=d(n),o=p,i=t[h]||{},l=Array.slice(arguments,2),r=this,q;
-if(i.args){l.append(Array.from(i.args));}if(i.base){h=i.base;}if(i.onAdd){i.onAdd(this);}n.each(function(u){var v=o;o=function(){(i.listener||g[u.pseudo].listener).call(r,u,v,arguments,q,t);
-};});q=o.bind(this);s.include({event:p,monitor:q});k.store(m,s);c.apply(this,[m,p].concat(l));return c.apply(this,[h,q].concat(l));},removeEvent:function(l,n){var m=f(l);
-if(!m){return e.call(this,l,n);}var j=a(this),o=j.retrieve(l);if(!o){return this;}var h=m[0].event,p=d(m),i=p[h]||{},k=Array.slice(arguments,2);if(i.args){k.append(Array.from(i.args));
-}if(i.base){h=i.base;}if(i.onRemove){i.onRemove(this);}e.apply(this,[l,n].concat(k));o.each(function(q,r){if(!n||q.event==n){e.apply(this,[h,q.monitor].concat(k));
-}delete o[r];},this);j.store(l,o);return this;}};};(function(){var b={once:{listener:function(e,f,d,c){f.apply(this,d);this.removeEvent(e.event,c).removeEvent(e.original,f);
-}},throttle:{listener:function(d,e,c){if(!e._throttled){e.apply(this,c);e._throttled=setTimeout(function(){e._throttled=false;},d.value||250);}}},pause:{listener:function(d,e,c){clearTimeout(e._pause);
-e._pause=e.delay(d.value||250,this,c);}}};Events.definePseudo=function(c,d){b[c]=Type.isFunction(d)?{listener:d}:d;return this;};Events.lookupPseudo=function(c){return b[c];
-};var a=Events.prototype;Events.implement(Events.Pseudos(b,a.addEvent,a.removeEvent));["Request","Fx"].each(function(c){if(this[c]){this[c].implement(Events.prototype);
-}});})();(function(){var d={},c=["once","throttle","pause"],b=c.length;while(b--){d[c[b]]=Events.lookupPseudo(c[b]);}Event.definePseudo=function(e,f){d[e]=Type.isFunction(f)?{listener:f}:f;
-return this;};var a=Element.prototype;[Element,Window,Document].invoke("implement",Events.Pseudos(d,a.addEvent,a.removeEvent));})();(function(){var a="$moo:keys-pressed",b="$moo:keys-keyup";
-Event.definePseudo("keys",function(d,e,c){var g=c[0],f=[],h=this.retrieve(a,[]);f.append(d.value.replace("++",function(){f.push("+");return"";}).split("+"));
-h.include(g.key);if(f.every(function(j){return h.contains(j);})){e.apply(this,c);}this.store(a,h);if(!this.retrieve(b)){var i=function(j){(function(){h=this.retrieve(a,[]).erase(j.key);
-this.store(a,h);}).delay(0,this);};this.store(b,i).addEvent("keyup",i);}});Object.append(Event.Keys,{shift:16,control:17,alt:18,capslock:20,pageup:33,pagedown:34,end:35,home:36,numlock:144,scrolllock:145,";":186,"=":187,",":188,"-":Browser.firefox?109:189,".":190,"/":191,"`":192,"[":219,"\\":220,"]":221,"'":222,"+":107});
-})();(function(){var a=false,b=false;var c=function(){var d=new Element("div").setStyles({position:"fixed",top:0,right:0}).inject(document.body);a=(d.offsetTop===0);
-d.dispose();b=true;};Element.implement({pin:function(h,f){if(!b){c();}if(this.getStyle("display")=="none"){return this;}var j,k=window.getScroll(),l,e;
-if(h!==false){j=this.getPosition(a?document.body:this.getOffsetParent());if(!this.retrieve("pin:_pinned")){var g={top:j.y-k.y,left:j.x-k.x};if(a&&!f){this.setStyle("position","fixed").setStyles(g);
-}else{l=this.getOffsetParent();var i=this.getPosition(l),m=this.getStyles("left","top");if(l&&m.left=="auto"||m.top=="auto"){this.setPosition(i);}if(this.getStyle("position")=="static"){this.setStyle("position","absolute");
-}i={x:m.left.toInt()-k.x,y:m.top.toInt()-k.y};e=function(){if(!this.retrieve("pin:_pinned")){return;}var n=window.getScroll();this.setStyles({left:i.x+n.x,top:i.y+n.y});
-}.bind(this);this.store("pin:_scrollFixer",e);window.addEvent("scroll",e);}this.store("pin:_pinned",true);}}else{if(!this.retrieve("pin:_pinned")){return this;
-}l=this.getParent();var d=(l.getComputedStyle("position")!="static"?l:l.getOffsetParent());j=this.getPosition(d);this.store("pin:_pinned",false);e=this.retrieve("pin:_scrollFixer");
-if(!e){this.setStyles({position:"absolute",top:j.y+k.y,left:j.x+k.x});}else{this.store("pin:_scrollFixer",null);window.removeEvent("scroll",e);}this.removeClass("isPinned");
-}return this;},unpin:function(){return this.pin(false);},togglePin:function(){return this.pin(!this.retrieve("pin:_pinned"));}});})();(function(){var b=function(e,d){var f=[];
-Object.each(d,function(g){Object.each(g,function(h){e.each(function(i){f.push(i+"-"+h+(i=="border"?"-width":""));});});});return f;};var c=function(f,e){var d=0;
-Object.each(e,function(h,g){if(g.test(f)){d=d+h.toInt();}});return d;};var a=function(d){return !!(!d||d.offsetHeight||d.offsetWidth);};Element.implement({measure:function(h){if(a(this)){return h.call(this);
-}var g=this.getParent(),e=[];while(!a(g)&&g!=document.body){e.push(g.expose());g=g.getParent();}var f=this.expose(),d=h.call(this);f();e.each(function(i){i();
-});return d;},expose:function(){if(this.getStyle("display")!="none"){return function(){};}var d=this.style.cssText;this.setStyles({display:"block",position:"absolute",visibility:"hidden"});
-return function(){this.style.cssText=d;}.bind(this);},getDimensions:function(d){d=Object.merge({computeSize:false},d);var i={x:0,y:0};var h=function(j,e){return(e.computeSize)?j.getComputedSize(e):j.getSize();
-};var f=this.getParent("body");if(f&&this.getStyle("display")=="none"){i=this.measure(function(){return h(this,d);});}else{if(f){try{i=h(this,d);}catch(g){}}}return Object.append(i,(i.x||i.x===0)?{width:i.x,height:i.y}:{x:i.width,y:i.height});
-},getComputedSize:function(d){d=Object.merge({styles:["padding","border"],planes:{height:["top","bottom"],width:["left","right"]},mode:"both"},d);var g={},e={width:0,height:0},f;
-if(d.mode=="vertical"){delete e.width;delete d.planes.width;}else{if(d.mode=="horizontal"){delete e.height;delete d.planes.height;}}b(d.styles,d.planes).each(function(h){g[h]=this.getStyle(h).toInt();
-},this);Object.each(d.planes,function(i,h){var k=h.capitalize(),j=this.getStyle(h);if(j=="auto"&&!f){f=this.getDimensions();}j=g[h]=(j=="auto")?f[h]:j.toInt();
-e["total"+k]=j;i.each(function(m){var l=c(m,g);e["computed"+m.capitalize()]=l;e["total"+k]+=l;});},this);return Object.append(e,g);}});})();(function(b){var a=Element.Position={options:{relativeTo:document.body,position:{x:"center",y:"center"},offset:{x:0,y:0}},getOptions:function(d,c){c=Object.merge({},a.options,c);
-a.setPositionOption(c);a.setEdgeOption(c);a.setOffsetOption(d,c);a.setDimensionsOption(d,c);return c;},setPositionOption:function(c){c.position=a.getCoordinateFromValue(c.position);
-},setEdgeOption:function(d){var c=a.getCoordinateFromValue(d.edge);d.edge=c?c:(d.position.x=="center"&&d.position.y=="center")?{x:"center",y:"center"}:{x:"left",y:"top"};
-},setOffsetOption:function(f,d){var c={x:0,y:0},g=f.measure(function(){return document.id(this.getOffsetParent());}),e=g.getScroll();if(!g||g==f.getDocument().body){return;
-}c=g.measure(function(){var i=this.getPosition();if(this.getStyle("position")=="fixed"){var h=window.getScroll();i.x+=h.x;i.y+=h.y;}return i;});d.offset={parentPositioned:g!=document.id(d.relativeTo),x:d.offset.x-c.x+e.x,y:d.offset.y-c.y+e.y};
-},setDimensionsOption:function(d,c){c.dimensions=d.getDimensions({computeSize:true,styles:["padding","border","margin"]});},getPosition:function(e,d){var c={};
-d=a.getOptions(e,d);var f=document.id(d.relativeTo)||document.body;a.setPositionCoordinates(d,c,f);if(d.edge){a.toEdge(c,d);}var g=d.offset;c.left=((c.x>=0||g.parentPositioned||d.allowNegative)?c.x:0).toInt();
-c.top=((c.y>=0||g.parentPositioned||d.allowNegative)?c.y:0).toInt();a.toMinMax(c,d);if(d.relFixedPosition||f.getStyle("position")=="fixed"){a.toRelFixedPosition(f,c);
-}if(d.ignoreScroll){a.toIgnoreScroll(f,c);}if(d.ignoreMargins){a.toIgnoreMargins(c,d);}c.left=Math.ceil(c.left);c.top=Math.ceil(c.top);delete c.x;delete c.y;
-return c;},setPositionCoordinates:function(k,g,d){var f=k.offset.y,h=k.offset.x,e=(d==document.body)?window.getScroll():d.getPosition(),j=e.y,c=e.x,i=window.getSize();
-switch(k.position.x){case"left":g.x=c+h;break;case"right":g.x=c+h+d.offsetWidth;break;default:g.x=c+((d==document.body?i.x:d.offsetWidth)/2)+h;break;}switch(k.position.y){case"top":g.y=j+f;
-break;case"bottom":g.y=j+f+d.offsetHeight;break;default:g.y=j+((d==document.body?i.y:d.offsetHeight)/2)+f;break;}},toMinMax:function(c,d){var f={left:"x",top:"y"},e;
-["minimum","maximum"].each(function(g){["left","top"].each(function(h){e=d[g]?d[g][f[h]]:null;if(e!=null&&((g=="minimum")?c[h]<e:c[h]>e)){c[h]=e;}});});
-},toRelFixedPosition:function(e,c){var d=window.getScroll();c.top+=d.y;c.left+=d.x;},toIgnoreScroll:function(e,d){var c=e.getScroll();d.top-=c.y;d.left-=c.x;
-},toIgnoreMargins:function(c,d){c.left+=d.edge.x=="right"?d.dimensions["margin-right"]:(d.edge.x!="center"?-d.dimensions["margin-left"]:-d.dimensions["margin-left"]+((d.dimensions["margin-right"]+d.dimensions["margin-left"])/2));
-c.top+=d.edge.y=="bottom"?d.dimensions["margin-bottom"]:(d.edge.y!="center"?-d.dimensions["margin-top"]:-d.dimensions["margin-top"]+((d.dimensions["margin-bottom"]+d.dimensions["margin-top"])/2));
-},toEdge:function(c,d){var e={},g=d.dimensions,f=d.edge;switch(f.x){case"left":e.x=0;break;case"right":e.x=-g.x-g.computedRight-g.computedLeft;break;default:e.x=-(Math.round(g.totalWidth/2));
-break;}switch(f.y){case"top":e.y=0;break;case"bottom":e.y=-g.y-g.computedTop-g.computedBottom;break;default:e.y=-(Math.round(g.totalHeight/2));break;}c.x+=e.x;
-c.y+=e.y;},getCoordinateFromValue:function(c){if(typeOf(c)!="string"){return c;}c=c.toLowerCase();return{x:c.test("left")?"left":(c.test("right")?"right":"center"),y:c.test(/upper|top/)?"top":(c.test("bottom")?"bottom":"center")};
-}};Element.implement({position:function(d){if(d&&(d.x!=null||d.y!=null)){return(b?b.apply(this,arguments):this);}var c=this.setStyle("position","absolute").calculatePosition(d);
-return(d&&d.returnPos)?c:this.setStyles(c);},calculatePosition:function(c){return a.getPosition(this,c);}});})(Element.prototype.position);Element.implement({isDisplayed:function(){return this.getStyle("display")!="none";
-},isVisible:function(){var a=this.offsetWidth,b=this.offsetHeight;return(a==0&&b==0)?false:(a>0&&b>0)?true:this.style.display!="none";},toggle:function(){return this[this.isDisplayed()?"hide":"show"]();
-},hide:function(){var b;try{b=this.getStyle("display");}catch(a){}if(b=="none"){return this;}return this.store("element:_originalDisplay",b||"").setStyle("display","none");
-},show:function(a){if(!a&&this.isDisplayed()){return this;}a=a||this.retrieve("element:_originalDisplay")||"block";return this.setStyle("display",(a=="none")?"block":a);
-},swapClass:function(a,b){return this.removeClass(a).addClass(b);}});Document.implement({clearSelection:function(){if(window.getSelection){var a=window.getSelection();
-if(a&&a.removeAllRanges){a.removeAllRanges();}}else{if(document.selection&&document.selection.empty){try{document.selection.empty();}catch(b){}}}}});Class.Mutators.Binds=function(a){if(!this.prototype.initialize){this.implement("initialize",function(){});
-}return Array.from(a).concat(this.prototype.Binds||[]);};Class.Mutators.initialize=function(a){return function(){Array.from(this.Binds).each(function(b){var c=this[b];
-if(c){this[b]=c.bind(this);}},this);return a.apply(this,arguments);};};Class.Occlude=new Class({occlude:function(c,b){b=document.id(b||this.element);var a=b.retrieve(c||this.property);
-if(a&&!this.occluded){return(this.occluded=a);}this.occluded=false;b.store(c||this.property,this);return this.occluded;}});var IframeShim=new Class({Implements:[Options,Events,Class.Occlude],options:{className:"iframeShim",src:'javascript:false;document.write("");',display:false,zIndex:null,margin:0,offset:{x:0,y:0},browsers:(Browser.ie6||(Browser.firefox&&Browser.version<3&&Browser.Platform.mac))},property:"IframeShim",initialize:function(b,a){this.element=document.id(b);
-if(this.occlude()){return this.occluded;}this.setOptions(a);this.makeShim();return this;},makeShim:function(){if(this.options.browsers){var c=this.element.getStyle("zIndex").toInt();
-if(!c){c=1;var b=this.element.getStyle("position");if(b=="static"||!b){this.element.setStyle("position","relative");}this.element.setStyle("zIndex",c);
-}c=((this.options.zIndex!=null||this.options.zIndex===0)&&c>this.options.zIndex)?this.options.zIndex:c-1;if(c<0){c=1;}this.shim=new Element("iframe",{src:this.options.src,scrolling:"no",frameborder:0,styles:{zIndex:c,position:"absolute",border:"none",filter:"progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)"},"class":this.options.className}).store("IframeShim",this);
-var a=(function(){this.shim.inject(this.element,"after");this[this.options.display?"show":"hide"]();this.fireEvent("inject");}).bind(this);if(!IframeShim.ready){window.addEvent("load",a);
-}else{a();}}else{this.position=this.hide=this.show=this.dispose=Function.from(this);}},position:function(){if(!IframeShim.ready||!this.shim){return this;
-}var a=this.element.measure(function(){return this.getSize();});if(this.options.margin!=undefined){a.x=a.x-(this.options.margin*2);a.y=a.y-(this.options.margin*2);
-this.options.offset.x+=this.options.margin;this.options.offset.y+=this.options.margin;}this.shim.set({width:a.x,height:a.y}).position({relativeTo:this.element,offset:this.options.offset});
-return this;},hide:function(){if(this.shim){this.shim.setStyle("display","none");}return this;},show:function(){if(this.shim){this.shim.setStyle("display","block");
-}return this.position();},dispose:function(){if(this.shim){this.shim.dispose();}return this;},destroy:function(){if(this.shim){this.shim.destroy();}return this;
-}});window.addEvent("load",function(){IframeShim.ready=true;});var Mask=new Class({Implements:[Options,Events],Binds:["position"],options:{style:{},"class":"mask",maskMargins:false,useIframeShim:true,iframeShimOptions:{}},initialize:function(b,a){this.target=document.id(b)||document.id(document.body);
-this.target.store("mask",this);this.setOptions(a);this.render();this.inject();},render:function(){this.element=new Element("div",{"class":this.options["class"],id:this.options.id||"mask-"+String.uniqueID(),styles:Object.merge({},this.options.style,{display:"none"}),events:{click:function(a){this.fireEvent("click",a);
-if(this.options.hideOnClick){this.hide();}}.bind(this)}});this.hidden=true;},toElement:function(){return this.element;},inject:function(b,a){a=a||(this.options.inject?this.options.inject.where:"")||this.target==document.body?"inside":"after";
-b=b||(this.options.inject&&this.options.inject.target)||this.target;this.element.inject(b,a);if(this.options.useIframeShim){this.shim=new IframeShim(this.element,this.options.iframeShimOptions);
-this.addEvents({show:this.shim.show.bind(this.shim),hide:this.shim.hide.bind(this.shim),destroy:this.shim.destroy.bind(this.shim)});}},position:function(){this.resize(this.options.width,this.options.height);
-this.element.position({relativeTo:this.target,position:"topLeft",ignoreMargins:!this.options.maskMargins,ignoreScroll:this.target==document.body});return this;
-},resize:function(a,e){var b={styles:["padding","border"]};if(this.options.maskMargins){b.styles.push("margin");}var d=this.target.getComputedSize(b);if(this.target==document.body){this.element.setStyles({width:0,height:0});
-var c=window.getScrollSize();if(d.totalHeight<c.y){d.totalHeight=c.y;}if(d.totalWidth<c.x){d.totalWidth=c.x;}}this.element.setStyles({width:Array.pick([a,d.totalWidth,d.x]),height:Array.pick([e,d.totalHeight,d.y])});
-return this;},show:function(){if(!this.hidden){return this;}window.addEvent("resize",this.position);this.position();this.showMask.apply(this,arguments);
-return this;},showMask:function(){this.element.setStyle("display","block");this.hidden=false;this.fireEvent("show");},hide:function(){if(this.hidden){return this;
-}window.removeEvent("resize",this.position);this.hideMask.apply(this,arguments);if(this.options.destroyOnHide){return this.destroy();}return this;},hideMask:function(){this.element.setStyle("display","none");
-this.hidden=true;this.fireEvent("hide");},toggle:function(){this[this.hidden?"show":"hide"]();},destroy:function(){this.hide();this.element.destroy();this.fireEvent("destroy");
-this.target.eliminate("mask");}});Element.Properties.mask={set:function(b){var a=this.retrieve("mask");if(a){a.destroy();}return this.eliminate("mask").store("mask:options",b);
-},get:function(){var a=this.retrieve("mask");if(!a){a=new Mask(this,this.retrieve("mask:options"));this.store("mask",a);}return a;}};Element.implement({mask:function(a){if(a){this.set("mask",a);
-}this.get("mask").show();return this;},unmask:function(){this.get("mask").hide();return this;}});var Spinner=new Class({Extends:Mask,Implements:Chain,options:{"class":"spinner",containerPosition:{},content:{"class":"spinner-content"},messageContainer:{"class":"spinner-msg"},img:{"class":"spinner-img"},fxOptions:{link:"chain"}},initialize:function(c,a){this.target=document.id(c)||document.id(document.body);
-this.target.store("spinner",this);this.setOptions(a);this.render();this.inject();var b=function(){this.active=false;}.bind(this);this.addEvents({hide:b,show:b});
-},render:function(){this.parent();this.element.set("id",this.options.id||"spinner-"+String.uniqueID());this.content=document.id(this.options.content)||new Element("div",this.options.content);
-this.content.inject(this.element);if(this.options.message){this.msg=document.id(this.options.message)||new Element("p",this.options.messageContainer).appendText(this.options.message);
-this.msg.inject(this.content);}if(this.options.img){this.img=document.id(this.options.img)||new Element("div",this.options.img);this.img.inject(this.content);
-}this.element.set("tween",this.options.fxOptions);},show:function(a){if(this.active){return this.chain(this.show.bind(this));}if(!this.hidden){this.callChain.delay(20,this);
-return this;}this.active=true;return this.parent(a);},showMask:function(a){var b=function(){this.content.position(Object.merge({relativeTo:this.element},this.options.containerPosition));
-}.bind(this);if(a){this.parent();b();}else{if(!this.options.style.opacity){this.options.style.opacity=this.element.getStyle("opacity").toFloat();}this.element.setStyles({display:"block",opacity:0}).tween("opacity",this.options.style.opacity);
-b();this.hidden=false;this.fireEvent("show");this.callChain();}},hide:function(a){if(this.active){return this.chain(this.hide.bind(this));}if(this.hidden){this.callChain.delay(20,this);
-return this;}this.active=true;return this.parent(a);},hideMask:function(a){if(a){return this.parent();}this.element.tween("opacity",0).get("tween").chain(function(){this.element.setStyle("display","none");
-this.hidden=true;this.fireEvent("hide");this.callChain();}.bind(this));},destroy:function(){this.content.destroy();this.parent();this.target.eliminate("spinner");
-}});Request=Class.refactor(Request,{options:{useSpinner:false,spinnerOptions:{},spinnerTarget:false},initialize:function(a){this._send=this.send;this.send=function(b){var c=this.getSpinner();
-if(c){c.chain(this._send.pass(b,this)).show();}else{this._send(b);}return this;};this.previous(a);},getSpinner:function(){if(!this.spinner){var b=document.id(this.options.spinnerTarget)||document.id(this.options.update);
-if(this.options.useSpinner&&b){b.set("spinner",this.options.spinnerOptions);var a=this.spinner=b.get("spinner");["complete","exception","cancel"].each(function(c){this.addEvent(c,a.hide.bind(a));
-},this);}}return this.spinner;}});Element.Properties.spinner={set:function(a){var b=this.retrieve("spinner");if(b){b.destroy();}return this.eliminate("spinner").store("spinner:options",a);
-},get:function(){var a=this.retrieve("spinner");if(!a){a=new Spinner(this,this.retrieve("spinner:options"));this.store("spinner",a);}return a;}};Element.implement({spin:function(a){if(a){this.set("spinner",a);
-}this.get("spinner").show();return this;},unspin:function(){this.get("spinner").hide();return this;}});(function(){var b=!(window.attachEvent&&!window.addEventListener),f=Element.NativeEvents;
-f.focusin=2;f.focusout=2;var c=function(h,k,i){var j=Element.Events[h.event],l;if(j){l=j.condition;}return Slick.match(k,h.value)&&(!l||l.call(k,i));};
-var e=function(h,j,i){for(var k=j.target;k&&k!=this;k=document.id(k.parentNode)){if(k&&c(h,k,j)){return i.call(k,j,k);}}};var g=function(h){var i="$delegation:";
-return{base:"focusin",onRemove:function(j){j.retrieve(i+"forms",[]).each(function(k){k.retrieve(i+"listeners",[]).each(function(l){k.removeEvent(h,l);});
-k.eliminate(i+h+"listeners").eliminate(i+h+"originalFn");});},listener:function(r,s,q,t,v){var k=q[0],j=this.retrieve(i+"forms",[]),p=k.target,m=(p.get("tag")=="form")?p:k.target.getParent("form");
-if(!m){return;}var o=m.retrieve(i+"originalFn",[]),l=m.retrieve(i+"listeners",[]),u=this;j.include(m);this.store(i+"forms",j);if(!o.contains(s)){var n=function(w){e.call(u,r,w,s);
-};m.addEvent(h,n);o.push(s);l.push(n);m.store(i+h+"originalFn",o).store(i+h+"listeners",l);}}};};var a=function(h){return{base:"focusin",listener:function(l,m,j){var k={blur:function(){this.removeEvents(k);
-}},i=this;k[h]=function(n){e.call(i,l,n,m);};j[0].target.addEvents(k);}};};var d={mouseenter:{base:"mouseover"},mouseleave:{base:"mouseout"},focus:{base:"focus"+(b?"":"in"),args:[true]},blur:{base:b?"blur":"focusout",args:[true]}};
-if(!b){Object.append(d,{submit:g("submit"),reset:g("reset"),change:a("change"),select:a("select")});}Event.definePseudo("relay",{listener:function(i,j,h){e.call(this,i,h[0],j);
-},options:d});})();if(!window.Form){window.Form={};}(function(){Form.Request=new Class({Binds:["onSubmit","onFormValidate"],Implements:[Options,Events,Class.Occlude],options:{requestOptions:{evalScripts:true,useSpinner:true,emulation:false,link:"ignore"},sendButtonClicked:true,extraData:{},resetForm:true},property:"form.request",initialize:function(b,c,a){this.element=document.id(b);
-if(this.occlude()){return this.occluded;}this.setOptions(a).setTarget(c).attach();},setTarget:function(a){this.target=document.id(a);if(!this.request){this.makeRequest();
-}else{this.request.setOptions({update:this.target});}return this;},toElement:function(){return this.element;},makeRequest:function(){var a=this;this.request=new Request.HTML(Object.merge({update:this.target,emulation:false,spinnerTarget:this.element,method:this.element.get("method")||"post"},this.options.requestOptions)).addEvents({success:function(c,e,d,b){["complete","success"].each(function(f){a.fireEvent(f,[a.target,c,e,d,b]);
-});},failure:function(){a.fireEvent("complete",arguments).fireEvent("failure",arguments);},exception:function(){a.fireEvent("failure",arguments);}});return this.attachReset();
-},attachReset:function(){if(!this.options.resetForm){return this;}this.request.addEvent("success",function(){Function.attempt(function(){this.element.reset();
-}.bind(this));if(window.OverText){OverText.update();}}.bind(this));return this;},attach:function(a){var c=(a!=false)?"addEvent":"removeEvent";this.element[c]("click:relay(button, input[type=submit])",this.saveClickedButton.bind(this));
-var b=this.element.retrieve("validator");if(b){b[c]("onFormValidate",this.onFormValidate);}else{this.element[c]("submit",this.onSubmit);}return this;},detach:function(){return this.attach(false);
-},enable:function(){return this.attach();},disable:function(){return this.detach();},onFormValidate:function(c,b,a){if(!a){return;}var d=this.element.retrieve("validator");
-if(c||(d&&!d.options.stopOnFailure)){a.stop();this.send();}},onSubmit:function(a){var b=this.element.retrieve("validator");if(b){this.element.removeEvent("submit",this.onSubmit);
-b.addEvent("onFormValidate",this.onFormValidate);this.element.validate();return;}if(a){a.stop();}this.send();},saveClickedButton:function(b,c){var a=c.get("name");
-if(!a||!this.options.sendButtonClicked){return;}this.options.extraData[a]=c.get("value")||true;this.clickedCleaner=function(){delete this.options.extraData[a];
-this.clickedCleaner=function(){};}.bind(this);},clickedCleaner:function(){},send:function(){var b=this.element.toQueryString().trim(),a=Object.toQueryString(this.options.extraData);
-if(b){b+="&"+a;}else{b=a;}this.fireEvent("send",[this.element,b.parseQueryString()]);this.request.send({data:b,url:this.options.requestOptions.url||this.element.get("action")});
-this.clickedCleaner();return this;}});Element.implement("formUpdate",function(c,b){var a=this.retrieve("form.request");if(!a){a=new Form.Request(this,c,b);
-}else{if(c){a.setTarget(c);}if(b){a.setOptions(b).makeRequest();}}a.send();return this;});})();(function(){var a=function(d){var b=d.options.hideInputs;
-if(window.OverText){var c=[null];OverText.each(function(e){c.include("."+e.options.labelClass);});if(c){b+=c.join(", ");}}return(b)?d.element.getElements(b):null;
-};Fx.Reveal=new Class({Extends:Fx.Morph,options:{link:"cancel",styles:["padding","border","margin"],transitionOpacity:!Browser.ie6,mode:"vertical",display:function(){return this.element.get("tag")!="tr"?"block":"table-row";
-},opacity:1,hideInputs:Browser.ie?"select, input, textarea, object, embed":null},dissolve:function(){if(!this.hiding&&!this.showing){if(this.element.getStyle("display")!="none"){this.hiding=true;
-this.showing=false;this.hidden=true;this.cssText=this.element.style.cssText;var d=this.element.getComputedSize({styles:this.options.styles,mode:this.options.mode});
-if(this.options.transitionOpacity){d.opacity=this.options.opacity;}var c={};Object.each(d,function(f,e){c[e]=[f,0];});this.element.setStyles({display:Function.from(this.options.display).call(this),overflow:"hidden"});
-var b=a(this);if(b){b.setStyle("visibility","hidden");}this.$chain.unshift(function(){if(this.hidden){this.hiding=false;this.element.style.cssText=this.cssText;
-this.element.setStyle("display","none");if(b){b.setStyle("visibility","visible");}}this.fireEvent("hide",this.element);this.callChain();}.bind(this));this.start(c);
-}else{this.callChain.delay(10,this);this.fireEvent("complete",this.element);this.fireEvent("hide",this.element);}}else{if(this.options.link=="chain"){this.chain(this.dissolve.bind(this));
-}else{if(this.options.link=="cancel"&&!this.hiding){this.cancel();this.dissolve();}}}return this;},reveal:function(){if(!this.showing&&!this.hiding){if(this.element.getStyle("display")=="none"){this.hiding=false;
-this.showing=true;this.hidden=false;this.cssText=this.element.style.cssText;var d;this.element.measure(function(){d=this.element.getComputedSize({styles:this.options.styles,mode:this.options.mode});
-}.bind(this));if(this.options.heightOverride!=null){d.height=this.options.heightOverride.toInt();}if(this.options.widthOverride!=null){d.width=this.options.widthOverride.toInt();
-}if(this.options.transitionOpacity){this.element.setStyle("opacity",0);d.opacity=this.options.opacity;}var c={height:0,display:Function.from(this.options.display).call(this)};
-Object.each(d,function(f,e){c[e]=0;});c.overflow="hidden";this.element.setStyles(c);var b=a(this);if(b){b.setStyle("visibility","hidden");}this.$chain.unshift(function(){this.element.style.cssText=this.cssText;
-this.element.setStyle("display",Function.from(this.options.display).call(this));if(!this.hidden){this.showing=false;}if(b){b.setStyle("visibility","visible");
-}this.callChain();this.fireEvent("show",this.element);}.bind(this));this.start(d);}else{this.callChain();this.fireEvent("complete",this.element);this.fireEvent("show",this.element);
-}}else{if(this.options.link=="chain"){this.chain(this.reveal.bind(this));}else{if(this.options.link=="cancel"&&!this.showing){this.cancel();this.reveal();
-}}}return this;},toggle:function(){if(this.element.getStyle("display")=="none"){this.reveal();}else{this.dissolve();}return this;},cancel:function(){this.parent.apply(this,arguments);
-if(this.cssText!=null){this.element.style.cssText=this.cssText;}this.hiding=false;this.showing=false;return this;}});Element.Properties.reveal={set:function(b){this.get("reveal").cancel().setOptions(b);
-return this;},get:function(){var b=this.retrieve("reveal");if(!b){b=new Fx.Reveal(this);this.store("reveal",b);}return b;}};Element.Properties.dissolve=Element.Properties.reveal;
-Element.implement({reveal:function(b){this.get("reveal").setOptions(b).reveal();return this;},dissolve:function(b){this.get("reveal").setOptions(b).dissolve();
-return this;},nix:function(b){var c=Array.link(arguments,{destroy:Type.isBoolean,options:Type.isObject});this.get("reveal").setOptions(b).dissolve().chain(function(){this[c.destroy?"destroy":"dispose"]();
-}.bind(this));return this;},wink:function(){var c=Array.link(arguments,{duration:Type.isNumber,options:Type.isObject});var b=this.get("reveal").setOptions(c.options);
-b.reveal().chain(function(){(function(){b.dissolve();}).delay(c.duration||2000);});}});})();Form.Request.Append=new Class({Extends:Form.Request,options:{useReveal:true,revealOptions:{},inject:"bottom"},makeRequest:function(){this.request=new Request.HTML(Object.merge({url:this.element.get("action"),method:this.element.get("method")||"post",spinnerTarget:this.element},this.options.requestOptions,{evalScripts:false})).addEvents({success:function(b,g,f,a){var c;
-var d=Elements.from(f);if(d.length==1){c=d[0];}else{c=new Element("div",{styles:{display:"none"}}).adopt(d);}c.inject(this.target,this.options.inject);
-if(this.options.requestOptions.evalScripts){Browser.exec(a);}this.fireEvent("beforeEffect",c);var e=function(){this.fireEvent("success",[c,this.target,b,g,f,a]);
-}.bind(this);if(this.options.useReveal){c.set("reveal",this.options.revealOptions).get("reveal").chain(e);c.reveal();}else{e();}}.bind(this),failure:function(a){this.fireEvent("failure",a);
-}.bind(this)});this.attachReset();}});Locale.define("en-US","FormValidator",{required:"This field is required.",minLength:"Please enter at least {minLength} characters (you entered {length} characters).",maxLength:"Please enter no more than {maxLength} characters (you entered {length} characters).",integer:"Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.",numeric:'Please enter only numeric values in this field (i.e. "1" or "1.1" or "-1" or "-1.1").',digits:"Please use numbers and punctuation only in this field (for example, a phone number with dashes or dots is permitted).",alpha:"Please use only letters (a-z) within this field. No spaces or other characters are allowed.",alphanum:"Please use only letters (a-z) or numbers (0-9) in this field. No spaces or other characters are allowed.",dateSuchAs:"Please enter a valid date such as {date}",dateInFormatMDY:'Please enter a valid date such as MM/DD/YYYY (i.e. "12/31/1999")',email:'Please enter a valid email address. For example "fred@domain.com".',url:"Please enter a valid URL such as http://www.example.com.",currencyDollar:"Please enter a valid $ amount. For example $100.00 .",oneRequired:"Please enter something for at least one of these inputs.",errorPrefix:"Error: ",warningPrefix:"Warning: ",noSpace:"There can be no spaces in this input.",reqChkByNode:"No items are selected.",requiredChk:"This field is required.",reqChkByName:"Please select a {label}.",match:"This field needs to match the {matchName} field",startDate:"the start date",endDate:"the end date",currendDate:"the current date",afterDate:"The date should be the same or after {label}.",beforeDate:"The date should be the same or before {label}.",startMonth:"Please select a start month",sameMonth:"These two dates must be in the same month - you must change one or the other.",creditcard:"The credit card number entered is invalid. Please check the number and try again. {length} digits entered."});
-if(!window.Form){window.Form={};}var InputValidator=this.InputValidator=new Class({Implements:[Options],options:{errorMsg:"Validation failed.",test:Function.from(true)},initialize:function(b,a){this.setOptions(a);
-this.className=b;},test:function(b,a){b=document.id(b);return(b)?this.options.test(b,a||this.getProps(b)):false;},getError:function(c,a){c=document.id(c);
-var b=this.options.errorMsg;if(typeOf(b)=="function"){b=b(c,a||this.getProps(c));}return b;},getProps:function(a){a=document.id(a);return(a)?a.get("validatorProps"):{};
-}});Element.Properties.validators={get:function(){return(this.get("data-validators")||this.className).clean().split(" ");}};Element.Properties.validatorProps={set:function(a){return this.eliminate("$moo:validatorProps").store("$moo:validatorProps",a);
-},get:function(a){if(a){this.set(a);}if(this.retrieve("$moo:validatorProps")){return this.retrieve("$moo:validatorProps");}if(this.getProperty("data-validator-properties")||this.getProperty("validatorProps")){try{this.store("$moo:validatorProps",JSON.decode(this.getProperty("validatorProps")||this.getProperty("data-validator-properties")));
-}catch(c){return{};}}else{var b=this.get("validators").filter(function(d){return d.test(":");});if(!b.length){this.store("$moo:validatorProps",{});}else{a={};
-b.each(function(d){var f=d.split(":");if(f[1]){try{a[f[0]]=JSON.decode(f[1]);}catch(g){}}});this.store("$moo:validatorProps",a);}}return this.retrieve("$moo:validatorProps");
-}};Form.Validator=new Class({Implements:[Options,Events],Binds:["onSubmit"],options:{fieldSelectors:"input, select, textarea",ignoreHidden:true,ignoreDisabled:true,useTitles:false,evaluateOnSubmit:true,evaluateFieldsOnBlur:true,evaluateFieldsOnChange:true,serial:true,stopOnFailure:true,warningPrefix:function(){return Form.Validator.getMsg("warningPrefix")||"Warning: ";
-},errorPrefix:function(){return Form.Validator.getMsg("errorPrefix")||"Error: ";}},initialize:function(b,a){this.setOptions(a);this.element=document.id(b);
-this.element.store("validator",this);this.warningPrefix=Function.from(this.options.warningPrefix)();this.errorPrefix=Function.from(this.options.errorPrefix)();
-if(this.options.evaluateOnSubmit){this.element.addEvent("submit",this.onSubmit);}if(this.options.evaluateFieldsOnBlur||this.options.evaluateFieldsOnChange){this.watchFields(this.getFields());
-}},toElement:function(){return this.element;},getFields:function(){return(this.fields=this.element.getElements(this.options.fieldSelectors));},watchFields:function(a){a.each(function(b){if(this.options.evaluateFieldsOnBlur){b.addEvent("blur",this.validationMonitor.pass([b,false],this));
-}if(this.options.evaluateFieldsOnChange){b.addEvent("change",this.validationMonitor.pass([b,true],this));}},this);},validationMonitor:function(){clearTimeout(this.timer);
-this.timer=this.validateField.delay(50,this,arguments);},onSubmit:function(a){if(this.validate(a)){this.reset();}},reset:function(){this.getFields().each(this.resetField,this);
-return this;},validate:function(b){var a=this.getFields().map(function(c){return this.validateField(c,true);},this).every(function(c){return c;});this.fireEvent("formValidate",[a,this.element,b]);
-if(this.options.stopOnFailure&&!a&&b){b.preventDefault();}return a;},validateField:function(j,b){if(this.paused){return true;}j=document.id(j);var f=!j.hasClass("validation-failed");
-var g,i;if(this.options.serial&&!b){g=this.element.getElement(".validation-failed");i=this.element.getElement(".warning");}if(j&&(!g||b||j.hasClass("validation-failed")||(g&&!this.options.serial))){var a=j.get("validators");
-var d=a.some(function(k){return this.getValidator(k);},this);var h=[];a.each(function(k){if(k&&!this.test(k,j)){h.include(k);}},this);f=h.length===0;if(d&&!this.hasValidator(j,"warnOnly")){if(f){j.addClass("validation-passed").removeClass("validation-failed");
-this.fireEvent("elementPass",[j]);}else{j.addClass("validation-failed").removeClass("validation-passed");this.fireEvent("elementFail",[j,h]);}}if(!i){var e=a.some(function(k){if(k.test("^warn")){return this.getValidator(k.replace(/^warn-/,""));
-}else{return null;}},this);j.removeClass("warning");var c=a.map(function(k){if(k.test("^warn")){return this.test(k.replace(/^warn-/,""),j,true);}else{return null;
-}},this);}}return f;},test:function(b,d,e){d=document.id(d);if((this.options.ignoreHidden&&!d.isVisible())||(this.options.ignoreDisabled&&d.get("disabled"))){return true;
-}var a=this.getValidator(b);if(e!=null){e=false;}if(this.hasValidator(d,"warnOnly")){e=true;}var c=this.hasValidator(d,"ignoreValidation")||(a?a.test(d):true);
-if(a&&d.isVisible()){this.fireEvent("elementValidate",[c,d,b,e]);}if(e){return true;}return c;},hasValidator:function(b,a){return b.get("validators").contains(a);
-},resetField:function(a){a=document.id(a);if(a){a.get("validators").each(function(b){if(b.test("^warn-")){b=b.replace(/^warn-/,"");}a.removeClass("validation-failed");
-a.removeClass("warning");a.removeClass("validation-passed");},this);}return this;},stop:function(){this.paused=true;return this;},start:function(){this.paused=false;
-return this;},ignoreField:function(a,b){a=document.id(a);if(a){this.enforceField(a);if(b){a.addClass("warnOnly");}else{a.addClass("ignoreValidation");}}return this;
-},enforceField:function(a){a=document.id(a);if(a){a.removeClass("warnOnly").removeClass("ignoreValidation");}return this;}});Form.Validator.getMsg=function(a){return Locale.get("FormValidator."+a);
-};Form.Validator.adders={validators:{},add:function(b,a){this.validators[b]=new InputValidator(b,a);if(!this.initialize){this.implement({validators:this.validators});
-}},addAllThese:function(a){Array.from(a).each(function(b){this.add(b[0],b[1]);},this);},getValidator:function(a){return this.validators[a.split(":")[0]];
-}};Object.append(Form.Validator,Form.Validator.adders);Form.Validator.implement(Form.Validator.adders);Form.Validator.add("IsEmpty",{errorMsg:false,test:function(a){if(a.type=="select-one"||a.type=="select"){return !(a.selectedIndex>=0&&a.options[a.selectedIndex].value!="");
-}else{return((a.get("value")==null)||(a.get("value").length==0));}}});Form.Validator.addAllThese([["required",{errorMsg:function(){return Form.Validator.getMsg("required");
-},test:function(a){return !Form.Validator.getValidator("IsEmpty").test(a);}}],["minLength",{errorMsg:function(a,b){if(typeOf(b.minLength)!="null"){return Form.Validator.getMsg("minLength").substitute({minLength:b.minLength,length:a.get("value").length});
-}else{return"";}},test:function(a,b){if(typeOf(b.minLength)!="null"){return(a.get("value").length>=(b.minLength||0));}else{return true;}}}],["maxLength",{errorMsg:function(a,b){if(typeOf(b.maxLength)!="null"){return Form.Validator.getMsg("maxLength").substitute({maxLength:b.maxLength,length:a.get("value").length});
-}else{return"";}},test:function(a,b){return a.get("value").length<=(b.maxLength||10000);}}],["validate-integer",{errorMsg:Form.Validator.getMsg.pass("integer"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(-?[1-9]\d*|0)$/).test(a.get("value"));
-}}],["validate-numeric",{errorMsg:Form.Validator.getMsg.pass("numeric"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^-?(?:0$0(?=\d*\.)|[1-9]|0)\d*(\.\d+)?$/).test(a.get("value"));
-}}],["validate-digits",{errorMsg:Form.Validator.getMsg.pass("digits"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^[\d() .:\-\+#]+$/.test(a.get("value")));
-}}],["validate-alpha",{errorMsg:Form.Validator.getMsg.pass("alpha"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^[a-zA-Z]+$/).test(a.get("value"));
-}}],["validate-alphanum",{errorMsg:Form.Validator.getMsg.pass("alphanum"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||!(/\W/).test(a.get("value"));
-}}],["validate-date",{errorMsg:function(a,b){if(Date.parse){var c=b.dateFormat||"%x";return Form.Validator.getMsg("dateSuchAs").substitute({date:new Date().format(c)});
-}else{return Form.Validator.getMsg("dateInFormatMDY");}},test:function(e,g){if(Form.Validator.getValidator("IsEmpty").test(e)){return true;}var a=Locale.getCurrent().sets.Date,b=new RegExp([a.days,a.days_abbr,a.months,a.months_abbr].flatten().join("|"),"i"),i=e.get("value"),f=i.match(/[a-z]+/gi);
-if(f&&!f.every(b.exec,b)){return false;}var c=Date.parse(i),h=g.dateFormat||"%x",d=c.format(h);if(d!="invalid date"){e.set("value",d);}return c.isValid();
-}}],["validate-email",{errorMsg:Form.Validator.getMsg.pass("email"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+\/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(a.get("value"));
-}}],["validate-url",{errorMsg:Form.Validator.getMsg.pass("url"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i).test(a.get("value"));
-}}],["validate-currency-dollar",{errorMsg:Form.Validator.getMsg.pass("currencyDollar"),test:function(a){return Form.Validator.getValidator("IsEmpty").test(a)||(/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(a.get("value"));
-}}],["validate-one-required",{errorMsg:Form.Validator.getMsg.pass("oneRequired"),test:function(a,b){var c=document.id(b["validate-one-required"])||a.getParent(b["validate-one-required"]);
-return c.getElements("input").some(function(d){if(["checkbox","radio"].contains(d.get("type"))){return d.get("checked");}return d.get("value");});}}]]);
-Element.Properties.validator={set:function(a){this.get("validator").setOptions(a);},get:function(){var a=this.retrieve("validator");if(!a){a=new Form.Validator(this);
-this.store("validator",a);}return a;}};Element.implement({validate:function(a){if(a){this.set("validator",a);}return this.get("validator").validate();}});
-Form.Validator.Inline=new Class({Extends:Form.Validator,options:{showError:function(a){if(a.reveal){a.reveal();}else{a.setStyle("display","block");}},hideError:function(a){if(a.dissolve){a.dissolve();
-}else{a.setStyle("display","none");}},scrollToErrorsOnSubmit:true,scrollToErrorsOnBlur:false,scrollToErrorsOnChange:false,scrollFxOptions:{transition:"quad:out",offset:{y:-20}}},initialize:function(b,a){this.parent(b,a);
-this.addEvent("onElementValidate",function(g,f,e,h){var d=this.getValidator(e);if(!g&&d.getError(f)){if(h){f.addClass("warning");}var c=this.makeAdvice(e,f,d.getError(f),h);
-this.insertAdvice(c,f);this.showAdvice(e,f);}else{this.hideAdvice(e,f);}});},makeAdvice:function(d,f,c,g){var e=(g)?this.warningPrefix:this.errorPrefix;
-e+=(this.options.useTitles)?f.title||c:c;var a=(g)?"warning-advice":"validation-advice";var b=this.getAdvice(d,f);if(b){b=b.set("html",e);}else{b=new Element("div",{html:e,styles:{display:"none"},id:"advice-"+d.split(":")[0]+"-"+this.getFieldId(f)}).addClass(a);
-}f.store("$moo:advice-"+d,b);return b;},getFieldId:function(a){return a.id?a.id:a.id="input_"+a.name;},showAdvice:function(b,c){var a=this.getAdvice(b,c);
-if(a&&!c.retrieve("$moo:"+this.getPropName(b))&&(a.getStyle("display")=="none"||a.getStyle("visiblity")=="hidden"||a.getStyle("opacity")==0)){c.store("$moo:"+this.getPropName(b),true);
-this.options.showError(a);this.fireEvent("showAdvice",[c,a,b]);}},hideAdvice:function(b,c){var a=this.getAdvice(b,c);if(a&&c.retrieve("$moo:"+this.getPropName(b))){c.store("$moo:"+this.getPropName(b),false);
-this.options.hideError(a);this.fireEvent("hideAdvice",[c,a,b]);}},getPropName:function(a){return"advice"+a;},resetField:function(a){a=document.id(a);if(!a){return this;
-}this.parent(a);a.get("validators").each(function(b){this.hideAdvice(b,a);},this);return this;},getAllAdviceMessages:function(d,c){var b=[];if(d.hasClass("ignoreValidation")&&!c){return b;
-}var a=d.get("validators").some(function(g){var e=g.test("^warn-")||d.hasClass("warnOnly");if(e){g=g.replace(/^warn-/,"");}var f=this.getValidator(g);if(!f){return;
-}b.push({message:f.getError(d),warnOnly:e,passed:f.test(),validator:f});},this);return b;},getAdvice:function(a,b){return b.retrieve("$moo:advice-"+a);
-},insertAdvice:function(a,c){var b=c.get("validatorProps");if(!b.msgPos||!document.id(b.msgPos)){if(c.type&&c.type.toLowerCase()=="radio"){c.getParent().adopt(a);
-}else{a.inject(document.id(c),"after");}}else{document.id(b.msgPos).grab(a);}},validateField:function(g,f,b){var a=this.parent(g,f);if(((this.options.scrollToErrorsOnSubmit&&b==null)||b)&&!a){var c=document.id(this).getElement(".validation-failed");
-var d=document.id(this).getParent();while(d!=document.body&&d.getScrollSize().y==d.getSize().y){d=d.getParent();}var e=d.retrieve("$moo:fvScroller");if(!e&&window.Fx&&Fx.Scroll){e=new Fx.Scroll(d,this.options.scrollFxOptions);
-d.store("$moo:fvScroller",e);}if(c){if(e){e.toElement(c);}else{d.scrollTo(d.getScroll().x,c.getPosition(d).y-20);}}}return a;},watchFields:function(a){a.each(function(b){if(this.options.evaluateFieldsOnBlur){b.addEvent("blur",this.validationMonitor.pass([b,false,this.options.scrollToErrorsOnBlur],this));
-}if(this.options.evaluateFieldsOnChange){b.addEvent("change",this.validationMonitor.pass([b,true,this.options.scrollToErrorsOnChange],this));}},this);}});
-Form.Validator.addAllThese([["validate-enforce-oncheck",{test:function(a,b){var c=a.getParent("form").retrieve("validator");if(!c){return true;}(b.toEnforce||document.id(b.enforceChildrenOf).getElements("input, select, textarea")).map(function(d){if(a.checked){c.enforceField(d);
-}else{c.ignoreField(d);c.resetField(d);}});return true;}}],["validate-ignore-oncheck",{test:function(a,b){var c=a.getParent("form").retrieve("validator");
-if(!c){return true;}(b.toIgnore||document.id(b.ignoreChildrenOf).getElements("input, select, textarea")).each(function(d){if(a.checked){c.ignoreField(d);
-c.resetField(d);}else{c.enforceField(d);}});return true;}}],["validate-nospace",{errorMsg:function(){return Form.Validator.getMsg("noSpace");},test:function(a,b){return !a.get("value").test(/\s/);
-}}],["validate-toggle-oncheck",{test:function(b,c){var d=b.getParent("form").retrieve("validator");if(!d){return true;}var a=c.toToggle||document.id(c.toToggleChildrenOf).getElements("input, select, textarea");
-if(!b.checked){a.each(function(e){d.ignoreField(e);d.resetField(e);});}else{a.each(function(e){d.enforceField(e);});}return true;}}],["validate-reqchk-bynode",{errorMsg:function(){return Form.Validator.getMsg("reqChkByNode");
-},test:function(a,b){return(document.id(b.nodeId).getElements(b.selector||"input[type=checkbox], input[type=radio]")).some(function(c){return c.checked;
-});}}],["validate-required-check",{errorMsg:function(a,b){return b.useTitle?a.get("title"):Form.Validator.getMsg("requiredChk");},test:function(a,b){return !!a.checked;
-}}],["validate-reqchk-byname",{errorMsg:function(a,b){return Form.Validator.getMsg("reqChkByName").substitute({label:b.label||a.get("type")});},test:function(b,d){var c=d.groupName||b.get("name");
-var a=$$(document.getElementsByName(c)).some(function(g,f){return g.checked;});var e=b.getParent("form").retrieve("validator");if(a&&e){e.resetField(b);
-}return a;}}],["validate-match",{errorMsg:function(a,b){return Form.Validator.getMsg("match").substitute({matchName:b.matchName||document.id(b.matchInput).get("name")});
-},test:function(b,c){var d=b.get("value");var a=document.id(c.matchInput)&&document.id(c.matchInput).get("value");return d&&a?d==a:true;}}],["validate-after-date",{errorMsg:function(a,b){return Form.Validator.getMsg("afterDate").substitute({label:b.afterLabel||(b.afterElement?Form.Validator.getMsg("startDate"):Form.Validator.getMsg("currentDate"))});
-},test:function(b,c){var d=document.id(c.afterElement)?Date.parse(document.id(c.afterElement).get("value")):new Date();var a=Date.parse(b.get("value"));
-return a&&d?a>=d:true;}}],["validate-before-date",{errorMsg:function(a,b){return Form.Validator.getMsg("beforeDate").substitute({label:b.beforeLabel||(b.beforeElement?Form.Validator.getMsg("endDate"):Form.Validator.getMsg("currentDate"))});
-},test:function(b,c){var d=Date.parse(b.get("value"));var a=document.id(c.beforeElement)?Date.parse(document.id(c.beforeElement).get("value")):new Date();
-return a&&d?a>=d:true;}}],["validate-custom-required",{errorMsg:function(){return Form.Validator.getMsg("required");},test:function(a,b){return a.get("value")!=b.emptyValue;
-}}],["validate-same-month",{errorMsg:function(a,b){var c=document.id(b.sameMonthAs)&&document.id(b.sameMonthAs).get("value");var d=a.get("value");if(d!=""){return Form.Validator.getMsg(c?"sameMonth":"startMonth");
-}},test:function(a,b){var d=Date.parse(a.get("value"));var c=Date.parse(document.id(b.sameMonthAs)&&document.id(b.sameMonthAs).get("value"));return d&&c?d.format("%B")==c.format("%B"):true;
-}}],["validate-cc-num",{errorMsg:function(a){var b=a.get("value").replace(/[^0-9]/g,"");return Form.Validator.getMsg("creditcard").substitute({length:b.length});
-},test:function(c){if(Form.Validator.getValidator("IsEmpty").test(c)){return true;}var g=c.get("value");g=g.replace(/[^0-9]/g,"");var a=false;if(g.test(/^4[0-9]{12}([0-9]{3})?$/)){a="Visa";
-}else{if(g.test(/^5[1-5]([0-9]{14})$/)){a="Master Card";}else{if(g.test(/^3[47][0-9]{13}$/)){a="American Express";}else{if(g.test(/^6011[0-9]{12}$/)){a="Discover";
-}}}}if(a){var d=0;var e=0;for(var b=g.length-1;b>=0;--b){e=g.charAt(b).toInt();if(e==0){continue;}if((g.length-b)%2==0){e+=e;}if(e>9){e=e.toString().charAt(0).toInt()+e.toString().charAt(1).toInt();
-}d+=e;}if((d%10)==0){return true;}}var f="";while(g!=""){f+=" "+g.substr(0,4);g=g.substr(4);}c.getParent("form").retrieve("validator").ignoreField(c);c.set("value",f.clean());
-c.getParent("form").retrieve("validator").enforceField(c);return false;}}]]);var OverText=new Class({Implements:[Options,Events,Class.Occlude],Binds:["reposition","assert","focus","hide"],options:{element:"label",labelClass:"overTxtLabel",positionOptions:{position:"upperLeft",edge:"upperLeft",offset:{x:4,y:2}},poll:false,pollInterval:250,wrap:false},property:"OverText",initialize:function(b,a){b=this.element=document.id(b);
-if(this.occlude()){return this.occluded;}this.setOptions(a);this.attach(b);OverText.instances.push(this);if(this.options.poll){this.poll();}},toElement:function(){return this.element;
-},attach:function(){var b=this.element,a=this.options,c=a.textOverride||b.get("alt")||b.get("title");if(!c){return this;}var d=this.text=new Element(a.element,{"class":a.labelClass,styles:{lineHeight:"normal",position:"absolute",cursor:"text"},html:c,events:{click:this.hide.pass(a.element=="label",this)}}).inject(b,"after");
-if(a.element=="label"){if(!b.get("id")){b.set("id","input_"+String.uniqueID());}d.set("for",b.get("id"));}if(a.wrap){this.textHolder=new Element("div.overTxtWrapper",{styles:{lineHeight:"normal",position:"relative"}}).grab(d).inject(b,"before");
-}return this.enable();},destroy:function(){this.element.eliminate(this.property);this.disable();if(this.text){this.text.destroy();}if(this.textHolder){this.textHolder.destroy();
-}return this;},disable:function(){this.element.removeEvents({focus:this.focus,blur:this.assert,change:this.assert});window.removeEvent("resize",this.reposition);
-this.hide(true,true);return this;},enable:function(){this.element.addEvents({focus:this.focus,blur:this.assert,change:this.assert});window.addEvent("resize",this.reposition);
-this.assert(true);this.reposition();return this;},wrap:function(){if(this.options.element=="label"){if(!this.element.get("id")){this.element.set("id","input_"+String.uniqueID());
-}this.text.set("for",this.element.get("id"));}},startPolling:function(){this.pollingPaused=false;return this.poll();},poll:function(a){if(this.poller&&!a){return this;
-}if(a){clearInterval(this.poller);}else{this.poller=(function(){if(!this.pollingPaused){this.assert(true);}}).periodical(this.options.pollInterval,this);
-}return this;},stopPolling:function(){this.pollingPaused=true;return this.poll(true);},focus:function(){if(this.text&&(!this.text.isDisplayed()||this.element.get("disabled"))){return this;
-}return this.hide();},hide:function(c,a){if(this.text&&(this.text.isDisplayed()&&(!this.element.get("disabled")||a))){this.text.hide();this.fireEvent("textHide",[this.text,this.element]);
-this.pollingPaused=true;if(!c){try{this.element.fireEvent("focus");this.element.focus();}catch(b){}}}return this;},show:function(){if(this.text&&!this.text.isDisplayed()){this.text.show();
-this.reposition();this.fireEvent("textShow",[this.text,this.element]);this.pollingPaused=false;}return this;},test:function(){return !this.element.get("value");
-},assert:function(a){return this[this.test()?"show":"hide"](a);},reposition:function(){this.assert(true);if(!this.element.isVisible()){return this.stopPolling().hide();
-}if(this.text&&this.test()){this.text.position(Object.merge(this.options.positionOptions,{relativeTo:this.element}));}return this;}});OverText.instances=[];
-Object.append(OverText,{each:function(a){return OverText.instances.each(function(c,b){if(c.element&&c.text){a.call(OverText,c,b);}});},update:function(){return OverText.each(function(a){return a.reposition();
-});},hideAll:function(){return OverText.each(function(a){return a.hide(true,true);});},showAll:function(){return OverText.each(function(a){return a.show();
-});}});Fx.Elements=new Class({Extends:Fx.CSS,initialize:function(b,a){this.elements=this.subject=$$(b);this.parent(a);},compute:function(g,h,j){var c={};
-for(var d in g){var a=g[d],e=h[d],f=c[d]={};for(var b in a){f[b]=this.parent(a[b],e[b],j);}}return c;},set:function(b){for(var c in b){if(!this.elements[c]){continue;
-}var a=b[c];for(var d in a){this.render(this.elements[c],d,a[d],this.options.unit);}}return this;},start:function(c){if(!this.check(c)){return this;}var h={},j={};
-for(var d in c){if(!this.elements[d]){continue;}var f=c[d],a=h[d]={},g=j[d]={};for(var b in f){var e=this.prepare(this.elements[d],b,f[b]);a[b]=e.from;
-g[b]=e.to;}}return this.parent(h,j);}});Fx.Accordion=new Class({Extends:Fx.Elements,options:{fixedHeight:false,fixedWidth:false,display:0,show:false,height:true,width:false,opacity:true,alwaysHide:false,trigger:"click",initialDisplayFx:true,resetHeight:true},initialize:function(){var g=function(h){return h!=null;
-};var f=Array.link(arguments,{container:Type.isElement,options:Type.isObject,togglers:g,elements:g});this.parent(f.elements,f.options);var b=this.options,e=this.togglers=$$(f.togglers);
-this.previous=-1;this.internalChain=new Chain();if(b.alwaysHide){this.options.link="chain";}if(b.show||this.options.show===0){b.display=false;this.previous=b.show;
-}if(b.start){b.display=false;b.show=false;}var d=this.effects={};if(b.opacity){d.opacity="fullOpacity";}if(b.width){d.width=b.fixedWidth?"fullWidth":"offsetWidth";
-}if(b.height){d.height=b.fixedHeight?"fullHeight":"scrollHeight";}for(var c=0,a=e.length;c<a;c++){this.addSection(e[c],this.elements[c]);}this.elements.each(function(j,h){if(b.show===h){this.fireEvent("active",[e[h],j]);
-}else{for(var k in d){j.setStyle(k,0);}}},this);if(b.display||b.display===0||b.initialDisplayFx===false){this.display(b.display,b.initialDisplayFx);}if(b.fixedHeight!==false){b.resetHeight=false;
-}this.addEvent("complete",this.internalChain.callChain.bind(this.internalChain));},addSection:function(g,d){g=document.id(g);d=document.id(d);this.togglers.include(g);
-this.elements.include(d);var f=this.togglers,c=this.options,h=f.contains(g),a=f.indexOf(g),b=this.display.pass(a,this);g.store("accordion:display",b).addEvent(c.trigger,b);
-if(c.height){d.setStyles({"padding-top":0,"border-top":"none","padding-bottom":0,"border-bottom":"none"});}if(c.width){d.setStyles({"padding-left":0,"border-left":"none","padding-right":0,"border-right":"none"});
-}d.fullOpacity=1;if(c.fixedWidth){d.fullWidth=c.fixedWidth;}if(c.fixedHeight){d.fullHeight=c.fixedHeight;}d.setStyle("overflow","hidden");if(!h){for(var e in this.effects){d.setStyle(e,0);
-}}return this;},removeSection:function(f,b){var e=this.togglers,a=e.indexOf(f),c=this.elements[a];var d=function(){e.erase(f);this.elements.erase(c);this.detach(f);
-}.bind(this);if(this.now==a||b!=null){this.display(b!=null?b:(a-1>=0?a-1:0)).chain(d);}else{d();}return this;},detach:function(b){var a=function(c){c.removeEvent(this.options.trigger,c.retrieve("accordion:display"));
-}.bind(this);if(!b){this.togglers.each(a);}else{a(b);}return this;},display:function(b,c){if(!this.check(b,c)){return this;}var h={},g=this.elements,a=this.options,f=this.effects;
-if(c==null){c=true;}if(typeOf(b)=="element"){b=g.indexOf(b);}if(b==this.previous&&!a.alwaysHide){return this;}if(a.resetHeight){var e=g[this.previous];
-if(e&&!this.selfHidden){for(var d in f){e.setStyle(d,e[f[d]]);}}}if((this.timer&&a.link=="chain")||(b===this.previous&&!a.alwaysHide)){return this;}this.previous=b;
-this.selfHidden=false;g.each(function(l,k){h[k]={};var j;if(k!=b){j=true;}else{if(a.alwaysHide&&((l.offsetHeight>0&&a.height)||l.offsetWidth>0&&a.width)){j=true;
-this.selfHidden=true;}}this.fireEvent(j?"background":"active",[this.togglers[k],l]);for(var m in f){h[k][m]=j?0:l[f[m]];}if(!c&&!j&&a.resetHeight){h[k].height="auto";
-}},this);this.internalChain.clearChain();this.internalChain.chain(function(){if(a.resetHeight&&!this.selfHidden){var i=g[b];if(i){i.setStyle("height","auto");
-}}}.bind(this));return c?this.start(h):this.set(h).internalChain.callChain();}});Fx.Move=new Class({Extends:Fx.Morph,options:{relativeTo:document.body,position:"center",edge:false,offset:{x:0,y:0}},start:function(a){var b=this.element,c=b.getStyles("top","left");
-if(c.top=="auto"||c.left=="auto"){b.setPosition(b.getPosition(b.getOffsetParent()));}return this.parent(b.position(Object.merge({},this.options,a,{returnPos:true})));
-}});Element.Properties.move={set:function(a){this.get("move").cancel().setOptions(a);return this;},get:function(){var a=this.retrieve("move");if(!a){a=new Fx.Move(this,{link:"cancel"});
-this.store("move",a);}return a;}};Element.implement({move:function(a){this.get("move").start(a);return this;}});Fx.Slide=new Class({Extends:Fx,options:{mode:"vertical",wrapper:false,hideOverflow:true,resetHeight:false},initialize:function(b,a){b=this.element=this.subject=document.id(b);
-this.parent(a);a=this.options;var d=b.retrieve("wrapper"),c=b.getStyles("margin","position","overflow");if(a.hideOverflow){c=Object.append(c,{overflow:"hidden"});
-}if(a.wrapper){d=document.id(a.wrapper).setStyles(c);}if(!d){d=new Element("div",{styles:c}).wraps(b);}b.store("wrapper",d).setStyle("margin",0);if(b.getStyle("overflow")=="visible"){b.setStyle("overflow","hidden");
-}this.now=[];this.open=true;this.wrapper=d;this.addEvent("complete",function(){this.open=(d["offset"+this.layout.capitalize()]!=0);if(this.open&&this.options.resetHeight){d.setStyle("height","");
-}},true);},vertical:function(){this.margin="margin-top";this.layout="height";this.offset=this.element.offsetHeight;},horizontal:function(){this.margin="margin-left";
-this.layout="width";this.offset=this.element.offsetWidth;},set:function(a){this.element.setStyle(this.margin,a[0]);this.wrapper.setStyle(this.layout,a[1]);
-return this;},compute:function(c,b,a){return[0,1].map(function(d){return Fx.compute(c[d],b[d],a);});},start:function(b,e){if(!this.check(b,e)){return this;
-}this[e||this.options.mode]();var d=this.element.getStyle(this.margin).toInt(),c=this.wrapper.getStyle(this.layout).toInt(),a=[[d,c],[0,this.offset]],g=[[d,c],[-this.offset,0]],f;
-switch(b){case"in":f=a;break;case"out":f=g;break;case"toggle":f=(c==0)?a:g;}return this.parent(f[0],f[1]);},slideIn:function(a){return this.start("in",a);
-},slideOut:function(a){return this.start("out",a);},hide:function(a){this[a||this.options.mode]();this.open=false;return this.set([-this.offset,0]);},show:function(a){this[a||this.options.mode]();
-this.open=true;return this.set([0,this.offset]);},toggle:function(a){return this.start("toggle",a);}});Element.Properties.slide={set:function(a){this.get("slide").cancel().setOptions(a);
-return this;},get:function(){var a=this.retrieve("slide");if(!a){a=new Fx.Slide(this,{link:"cancel"});this.store("slide",a);}return a;}};Element.implement({slide:function(d,e){d=d||"toggle";
-var b=this.get("slide"),a;switch(d){case"hide":b.hide(e);break;case"show":b.show(e);break;case"toggle":var c=this.retrieve("slide:flag",b.open);b[c?"slideOut":"slideIn"](e);
-this.store("slide:flag",!c);a=true;break;default:b.start(d,e);}if(!a){this.eliminate("slide:flag");}return this;}});(function(){Fx.Scroll=new Class({Extends:Fx,options:{offset:{x:0,y:0},wheelStops:true},initialize:function(c,b){this.element=this.subject=document.id(c);
-this.parent(b);if(typeOf(this.element)!="element"){this.element=document.id(this.element.getDocument().body);}if(this.options.wheelStops){var d=this.element,e=this.cancel.pass(false,this);
-this.addEvent("start",function(){d.addEvent("mousewheel",e);},true);this.addEvent("complete",function(){d.removeEvent("mousewheel",e);},true);}},set:function(){var b=Array.flatten(arguments);
-if(Browser.firefox){b=[Math.round(b[0]),Math.round(b[1])];}this.element.scrollTo(b[0],b[1]);return this;},compute:function(d,c,b){return[0,1].map(function(e){return Fx.compute(d[e],c[e],b);
-});},start:function(c,d){if(!this.check(c,d)){return this;}var b=this.element.getScroll();return this.parent([b.x,b.y],[c,d]);},calculateScroll:function(g,f){var d=this.element,b=d.getScrollSize(),h=d.getScroll(),j=d.getSize(),c=this.options.offset,i={x:g,y:f};
-for(var e in i){if(!i[e]&&i[e]!==0){i[e]=h[e];}if(typeOf(i[e])!="number"){i[e]=b[e]-j[e];}i[e]+=c[e];}return[i.x,i.y];},toTop:function(){return this.start.apply(this,this.calculateScroll(false,0));
-},toLeft:function(){return this.start.apply(this,this.calculateScroll(0,false));},toRight:function(){return this.start.apply(this,this.calculateScroll("right",false));
-},toBottom:function(){return this.start.apply(this,this.calculateScroll(false,"bottom"));},toElement:function(d,e){e=e?Array.from(e):["x","y"];var c=a(this.element)?{x:0,y:0}:this.element.getScroll();
-var b=Object.map(document.id(d).getPosition(this.element),function(g,f){return e.contains(f)?g+c[f]:false;});return this.start.apply(this,this.calculateScroll(b.x,b.y));
-},toElementEdge:function(d,g,e){g=g?Array.from(g):["x","y"];d=document.id(d);var i={},f=d.getPosition(this.element),j=d.getSize(),h=this.element.getScroll(),b=this.element.getSize(),c={x:f.x+j.x,y:f.y+j.y};
-["x","y"].each(function(k){if(g.contains(k)){if(c[k]>h[k]+b[k]){i[k]=c[k]-b[k];}if(f[k]<h[k]){i[k]=f[k];}}if(i[k]==null){i[k]=h[k];}if(e&&e[k]){i[k]=i[k]+e[k];
-}},this);if(i.x!=h.x||i.y!=h.y){this.start(i.x,i.y);}return this;},toElementCenter:function(e,f,h){f=f?Array.from(f):["x","y"];e=document.id(e);var i={},c=e.getPosition(this.element),d=e.getSize(),b=this.element.getScroll(),g=this.element.getSize();
-["x","y"].each(function(j){if(f.contains(j)){i[j]=c[j]-(g[j]-d[j])/2;}if(i[j]==null){i[j]=b[j];}if(h&&h[j]){i[j]=i[j]+h[j];}},this);if(i.x!=b.x||i.y!=b.y){this.start(i.x,i.y);
-}return this;}});function a(b){return(/^(?:body|html)$/i).test(b.tagName);}})();Fx.SmoothScroll=new Class({Extends:Fx.Scroll,options:{axes:["x","y"]},initialize:function(c,d){d=d||document;
-this.doc=d.getDocument();this.parent(this.doc,c);var e=d.getWindow(),a=e.location.href.match(/^[^#]*/)[0]+"#",b=$$(this.options.links||this.doc.links);
-b.each(function(g){if(g.href.indexOf(a)!=0){return;}var f=g.href.substr(a.length);if(f){this.useLink(g,f);}},this);this.addEvent("complete",function(){e.location.hash=this.anchor;
-this.element.scrollTo(this.to[0],this.to[1]);},true);},useLink:function(b,a){b.addEvent("click",function(d){var c=document.id(a)||this.doc.getElement("a[name="+a+"]");
-if(!c){return;}d.preventDefault();this.toElement(c,this.options.axes).chain(function(){this.fireEvent("scrolledTo",[b,c]);}.bind(this));this.anchor=a;}.bind(this));
-return this;}});Fx.Sort=new Class({Extends:Fx.Elements,options:{mode:"vertical"},initialize:function(b,a){this.parent(b,a);this.elements.each(function(c){if(c.getStyle("position")=="static"){c.setStyle("position","relative");
-}});this.setDefaultOrder();},setDefaultOrder:function(){this.currentOrder=this.elements.map(function(b,a){return a;});},sort:function(){if(!this.check(arguments)){return this;
-}var e=Array.flatten(arguments);var i=0,a=0,c={},h={},d=this.options.mode=="vertical";var f=this.elements.map(function(m,k){var l=m.getComputedSize({styles:["border","padding","margin"]});
-var n;if(d){n={top:i,margin:l["margin-top"],height:l.totalHeight};i+=n.height-l["margin-top"];}else{n={left:a,margin:l["margin-left"],width:l.totalWidth};
-a+=n.width;}var j=d?"top":"left";h[k]={};var o=m.getStyle(j).toInt();h[k][j]=o||0;return n;},this);this.set(h);e=e.map(function(j){return j.toInt();});
-if(e.length!=this.elements.length){this.currentOrder.each(function(j){if(!e.contains(j)){e.push(j);}});if(e.length>this.elements.length){e.splice(this.elements.length-1,e.length-this.elements.length);
-}}var b=0;i=a=0;e.each(function(k){var j={};if(d){j.top=i-f[k].top-b;i+=f[k].height;}else{j.left=a-f[k].left;a+=f[k].width;}b=b+f[k].margin;c[k]=j;},this);
-var g={};Array.clone(e).sort().each(function(j){g[j]=c[j];});this.start(g);this.currentOrder=e;return this;},rearrangeDOM:function(a){a=a||this.currentOrder;
-var b=this.elements[0].getParent();var c=[];this.elements.setStyle("opacity",0);a.each(function(d){c.push(this.elements[d].inject(b).setStyles({top:0,left:0}));
-},this);this.elements.setStyle("opacity",1);this.elements=$$(c);this.setDefaultOrder();return this;},getDefaultOrder:function(){return this.elements.map(function(b,a){return a;
-});},getCurrentOrder:function(){return this.currentOrder;},forward:function(){return this.sort(this.getDefaultOrder());},backward:function(){return this.sort(this.getDefaultOrder().reverse());
-},reverse:function(){return this.sort(this.currentOrder.reverse());},sortByElements:function(a){return this.sort(a.map(function(b){return this.elements.indexOf(b);
-},this));},swap:function(c,b){if(typeOf(c)=="element"){c=this.elements.indexOf(c);}if(typeOf(b)=="element"){b=this.elements.indexOf(b);}var a=Array.clone(this.currentOrder);
-a[this.currentOrder.indexOf(c)]=b;a[this.currentOrder.indexOf(b)]=c;return this.sort(a);}});var Drag=new Class({Implements:[Events,Options],options:{snap:6,unit:"px",grid:false,style:true,limit:false,handle:false,invert:false,preventDefault:false,stopPropagation:false,modifiers:{x:"left",y:"top"}},initialize:function(){var b=Array.link(arguments,{options:Type.isObject,element:function(c){return c!=null;
-}});this.element=document.id(b.element);this.document=this.element.getDocument();this.setOptions(b.options||{});var a=typeOf(this.options.handle);this.handles=((a=="array"||a=="collection")?$$(this.options.handle):document.id(this.options.handle))||this.element;
-this.mouse={now:{},pos:{}};this.value={start:{},now:{}};this.selection=(Browser.ie)?"selectstart":"mousedown";if(Browser.ie&&!Drag.ondragstartFixed){document.ondragstart=Function.from(false);
-Drag.ondragstartFixed=true;}this.bound={start:this.start.bind(this),check:this.check.bind(this),drag:this.drag.bind(this),stop:this.stop.bind(this),cancel:this.cancel.bind(this),eventStop:Function.from(false)};
-this.attach();},attach:function(){this.handles.addEvent("mousedown",this.bound.start);return this;},detach:function(){this.handles.removeEvent("mousedown",this.bound.start);
-return this;},start:function(a){var j=this.options;if(a.rightClick){return;}if(j.preventDefault){a.preventDefault();}if(j.stopPropagation){a.stopPropagation();
-}this.mouse.start=a.page;this.fireEvent("beforeStart",this.element);var c=j.limit;this.limit={x:[],y:[]};var e,g;for(e in j.modifiers){if(!j.modifiers[e]){continue;
-}var b=this.element.getStyle(j.modifiers[e]);if(b&&!b.match(/px$/)){if(!g){g=this.element.getCoordinates(this.element.getOffsetParent());}b=g[j.modifiers[e]];
-}if(j.style){this.value.now[e]=(b||0).toInt();}else{this.value.now[e]=this.element[j.modifiers[e]];}if(j.invert){this.value.now[e]*=-1;}this.mouse.pos[e]=a.page[e]-this.value.now[e];
-if(c&&c[e]){var d=2;while(d--){var f=c[e][d];if(f||f===0){this.limit[e][d]=(typeof f=="function")?f():f;}}}}if(typeOf(this.options.grid)=="number"){this.options.grid={x:this.options.grid,y:this.options.grid};
-}var h={mousemove:this.bound.check,mouseup:this.bound.cancel};h[this.selection]=this.bound.eventStop;this.document.addEvents(h);},check:function(a){if(this.options.preventDefault){a.preventDefault();
-}var b=Math.round(Math.sqrt(Math.pow(a.page.x-this.mouse.start.x,2)+Math.pow(a.page.y-this.mouse.start.y,2)));if(b>this.options.snap){this.cancel();this.document.addEvents({mousemove:this.bound.drag,mouseup:this.bound.stop});
-this.fireEvent("start",[this.element,a]).fireEvent("snap",this.element);}},drag:function(b){var a=this.options;if(a.preventDefault){b.preventDefault();
-}this.mouse.now=b.page;for(var c in a.modifiers){if(!a.modifiers[c]){continue;}this.value.now[c]=this.mouse.now[c]-this.mouse.pos[c];if(a.invert){this.value.now[c]*=-1;
-}if(a.limit&&this.limit[c]){if((this.limit[c][1]||this.limit[c][1]===0)&&(this.value.now[c]>this.limit[c][1])){this.value.now[c]=this.limit[c][1];}else{if((this.limit[c][0]||this.limit[c][0]===0)&&(this.value.now[c]<this.limit[c][0])){this.value.now[c]=this.limit[c][0];
-}}}if(a.grid[c]){this.value.now[c]-=((this.value.now[c]-(this.limit[c][0]||0))%a.grid[c]);}if(a.style){this.element.setStyle(a.modifiers[c],this.value.now[c]+a.unit);
-}else{this.element[a.modifiers[c]]=this.value.now[c];}}this.fireEvent("drag",[this.element,b]);},cancel:function(a){this.document.removeEvents({mousemove:this.bound.check,mouseup:this.bound.cancel});
-if(a){this.document.removeEvent(this.selection,this.bound.eventStop);this.fireEvent("cancel",this.element);}},stop:function(b){var a={mousemove:this.bound.drag,mouseup:this.bound.stop};
-a[this.selection]=this.bound.eventStop;this.document.removeEvents(a);if(b){this.fireEvent("complete",[this.element,b]);}}});Element.implement({makeResizable:function(a){var b=new Drag(this,Object.merge({modifiers:{x:"width",y:"height"}},a));
-this.store("resizer",b);return b.addEvent("drag",function(){this.fireEvent("resize",b);}.bind(this));}});Drag.Move=new Class({Extends:Drag,options:{droppables:[],container:false,precalculate:false,includeMargins:true,checkDroppables:true},initialize:function(b,a){this.parent(b,a);
-b=this.element;this.droppables=$$(this.options.droppables);this.container=document.id(this.options.container);if(this.container&&typeOf(this.container)!="element"){this.container=document.id(this.container.getDocument().body);
-}if(this.options.style){if(this.options.modifiers.x=="left"&&this.options.modifiers.y=="top"){var c=b.getOffsetParent(),d=b.getStyles("left","top");if(c&&(d.left=="auto"||d.top=="auto")){b.setPosition(b.getPosition(c));
-}}if(b.getStyle("position")=="static"){b.setStyle("position","absolute");}}this.addEvent("start",this.checkDroppables,true);this.overed=null;},start:function(a){if(this.container){this.options.limit=this.calculateLimit();
-}if(this.options.precalculate){this.positions=this.droppables.map(function(b){return b.getCoordinates();});}this.parent(a);},calculateLimit:function(){var j=this.element,e=this.container,d=document.id(j.getOffsetParent())||document.body,h=e.getCoordinates(d),c={},b={},k={},g={},m={};
-["top","right","bottom","left"].each(function(q){c[q]=j.getStyle("margin-"+q).toInt();b[q]=j.getStyle("border-"+q).toInt();k[q]=e.getStyle("margin-"+q).toInt();
-g[q]=e.getStyle("border-"+q).toInt();m[q]=d.getStyle("padding-"+q).toInt();},this);var f=j.offsetWidth+c.left+c.right,p=j.offsetHeight+c.top+c.bottom,i=0,l=0,o=h.right-g.right-f,a=h.bottom-g.bottom-p;
-if(this.options.includeMargins){i+=c.left;l+=c.top;}else{o+=c.right;a+=c.bottom;}if(j.getStyle("position")=="relative"){var n=j.getCoordinates(d);n.left-=j.getStyle("left").toInt();
-n.top-=j.getStyle("top").toInt();i-=n.left;l-=n.top;if(e.getStyle("position")!="relative"){i+=g.left;l+=g.top;}o+=c.left-n.left;a+=c.top-n.top;if(e!=d){i+=k.left+m.left;
-l+=((Browser.ie6||Browser.ie7)?0:k.top)+m.top;}}else{i-=c.left;l-=c.top;if(e!=d){i+=h.left+g.left;l+=h.top+g.top;}}return{x:[i,o],y:[l,a]};},getDroppableCoordinates:function(c){var b=c.getCoordinates();
-if(c.getStyle("position")=="fixed"){var a=window.getScroll();b.left+=a.x;b.right+=a.x;b.top+=a.y;b.bottom+=a.y;}return b;},checkDroppables:function(){var a=this.droppables.filter(function(d,c){d=this.positions?this.positions[c]:this.getDroppableCoordinates(d);
-var b=this.mouse.now;return(b.x>d.left&&b.x<d.right&&b.y<d.bottom&&b.y>d.top);},this).getLast();if(this.overed!=a){if(this.overed){this.fireEvent("leave",[this.element,this.overed]);
-}if(a){this.fireEvent("enter",[this.element,a]);}this.overed=a;}},drag:function(a){this.parent(a);if(this.options.checkDroppables&&this.droppables.length){this.checkDroppables();
-}},stop:function(a){this.checkDroppables();this.fireEvent("drop",[this.element,this.overed,a]);this.overed=null;return this.parent(a);}});Element.implement({makeDraggable:function(a){var b=new Drag.Move(this,a);
-this.store("dragger",b);return b;}});var Slider=new Class({Implements:[Events,Options],Binds:["clickedElement","draggedKnob","scrolledElement"],options:{onTick:function(a){this.setKnobPosition(a);
-},initialStep:0,snap:false,offset:0,range:false,wheel:false,steps:100,mode:"horizontal"},initialize:function(f,a,e){this.setOptions(e);e=this.options;this.element=document.id(f);
-a=this.knob=document.id(a);this.previousChange=this.previousEnd=this.step=-1;var b={},d={x:false,y:false};switch(e.mode){case"vertical":this.axis="y";this.property="top";
-this.offset="offsetHeight";break;case"horizontal":this.axis="x";this.property="left";this.offset="offsetWidth";}this.setSliderDimensions();this.setRange(e.range);
-if(a.getStyle("position")=="static"){a.setStyle("position","relative");}a.setStyle(this.property,-e.offset);d[this.axis]=this.property;b[this.axis]=[-e.offset,this.full-e.offset];
-var c={snap:0,limit:b,modifiers:d,onDrag:this.draggedKnob,onStart:this.draggedKnob,onBeforeStart:(function(){this.isDragging=true;}).bind(this),onCancel:function(){this.isDragging=false;
-}.bind(this),onComplete:function(){this.isDragging=false;this.draggedKnob();this.end();}.bind(this)};if(e.snap){this.setSnap(c);}this.drag=new Drag(a,c);
-this.attach();if(e.initialStep!=null){this.set(e.initialStep);}},attach:function(){this.element.addEvent("mousedown",this.clickedElement);if(this.options.wheel){this.element.addEvent("mousewheel",this.scrolledElement);
-}this.drag.attach();return this;},detach:function(){this.element.removeEvent("mousedown",this.clickedElement).removeEvent("mousewheel",this.scrolledElement);
-this.drag.detach();return this;},autosize:function(){this.setSliderDimensions().setKnobPosition(this.toPosition(this.step));this.drag.options.limit[this.axis]=[-this.options.offset,this.full-this.options.offset];
-if(this.options.snap){this.setSnap();}return this;},setSnap:function(a){if(!a){a=this.drag.options;}a.grid=Math.ceil(this.stepWidth);a.limit[this.axis][1]=this.full;
-return this;},setKnobPosition:function(a){if(this.options.snap){a=this.toPosition(this.step);}this.knob.setStyle(this.property,a);return this;},setSliderDimensions:function(){this.full=this.element.measure(function(){this.half=this.knob[this.offset]/2;
-return this.element[this.offset]-this.knob[this.offset]+(this.options.offset*2);}.bind(this));return this;},set:function(a){if(!((this.range>0)^(a<this.min))){a=this.min;
-}if(!((this.range>0)^(a>this.max))){a=this.max;}this.step=Math.round(a);return this.checkStep().fireEvent("tick",this.toPosition(this.step)).end();},setRange:function(a,b){this.min=Array.pick([a[0],0]);
-this.max=Array.pick([a[1],this.options.steps]);this.range=this.max-this.min;this.steps=this.options.steps||this.full;this.stepSize=Math.abs(this.range)/this.steps;
-this.stepWidth=this.stepSize*this.full/Math.abs(this.range);if(a){this.set(Array.pick([b,this.step]).floor(this.min).max(this.max));}return this;},clickedElement:function(c){if(this.isDragging||c.target==this.knob){return;
-}var b=this.range<0?-1:1,a=c.page[this.axis]-this.element.getPosition()[this.axis]-this.half;a=a.limit(-this.options.offset,this.full-this.options.offset);
-this.step=Math.round(this.min+b*this.toStep(a));this.checkStep().fireEvent("tick",a).end();},scrolledElement:function(a){var b=(this.options.mode=="horizontal")?(a.wheel<0):(a.wheel>0);
-this.set(this.step+(b?-1:1)*this.stepSize);a.stop();},draggedKnob:function(){var b=this.range<0?-1:1,a=this.drag.value.now[this.axis];a=a.limit(-this.options.offset,this.full-this.options.offset);
-this.step=Math.round(this.min+b*this.toStep(a));this.checkStep();},checkStep:function(){var a=this.step;if(this.previousChange!=a){this.previousChange=a;
-this.fireEvent("change",a);}return this;},end:function(){var a=this.step;if(this.previousEnd!==a){this.previousEnd=a;this.fireEvent("complete",a+"");}return this;
-},toStep:function(a){var b=(a+this.options.offset)*this.stepSize/this.full*this.steps;return this.options.steps?Math.round(b-=b%this.stepSize):b;},toPosition:function(a){return(this.full*Math.abs(this.min-a))/(this.steps*this.stepSize)-this.options.offset;
-}});var Sortables=new Class({Implements:[Events,Options],options:{opacity:1,clone:false,revert:false,handle:false,dragOptions:{}},initialize:function(a,b){this.setOptions(b);
-this.elements=[];this.lists=[];this.idle=true;this.addLists($$(document.id(a)||a));if(!this.options.clone){this.options.revert=false;}if(this.options.revert){this.effect=new Fx.Morph(null,Object.merge({duration:250,link:"cancel"},this.options.revert));
-}},attach:function(){this.addLists(this.lists);return this;},detach:function(){this.lists=this.removeLists(this.lists);return this;},addItems:function(){Array.flatten(arguments).each(function(a){this.elements.push(a);
-var b=a.retrieve("sortables:start",function(c){this.start.call(this,c,a);}.bind(this));(this.options.handle?a.getElement(this.options.handle)||a:a).addEvent("mousedown",b);
-},this);return this;},addLists:function(){Array.flatten(arguments).each(function(a){this.lists.include(a);this.addItems(a.getChildren());},this);return this;
-},removeItems:function(){return $$(Array.flatten(arguments).map(function(a){this.elements.erase(a);var b=a.retrieve("sortables:start");(this.options.handle?a.getElement(this.options.handle)||a:a).removeEvent("mousedown",b);
-return a;},this));},removeLists:function(){return $$(Array.flatten(arguments).map(function(a){this.lists.erase(a);this.removeItems(a.getChildren());return a;
-},this));},getClone:function(b,a){if(!this.options.clone){return new Element(a.tagName).inject(document.body);}if(typeOf(this.options.clone)=="function"){return this.options.clone.call(this,b,a,this.list);
-}var c=a.clone(true).setStyles({margin:0,position:"absolute",visibility:"hidden",width:a.getStyle("width")}).addEvent("mousedown",function(d){a.fireEvent("mousedown",d);
-});if(c.get("html").test("radio")){c.getElements("input[type=radio]").each(function(d,e){d.set("name","clone_"+e);if(d.get("checked")){a.getElements("input[type=radio]")[e].set("checked",true);
-}});}return c.inject(this.list).setPosition(a.getPosition(a.getOffsetParent()));},getDroppables:function(){var a=this.list.getChildren().erase(this.clone).erase(this.element);
-if(!this.options.constrain){a.append(this.lists).erase(this.list);}return a;},insert:function(c,b){var a="inside";if(this.lists.contains(b)){this.list=b;
-this.drag.droppables=this.getDroppables();}else{a=this.element.getAllPrevious().contains(b)?"before":"after";}this.element.inject(b,a);this.fireEvent("sort",[this.element,this.clone]);
-},start:function(b,a){if(!this.idle||b.rightClick||["button","input","a"].contains(b.target.get("tag"))){return;}this.idle=false;this.element=a;this.opacity=a.get("opacity");
-this.list=a.getParent();this.clone=this.getClone(b,a);this.drag=new Drag.Move(this.clone,Object.merge({droppables:this.getDroppables()},this.options.dragOptions)).addEvents({onSnap:function(){b.stop();
-this.clone.setStyle("visibility","visible");this.element.set("opacity",this.options.opacity||0);this.fireEvent("start",[this.element,this.clone]);}.bind(this),onEnter:this.insert.bind(this),onCancel:this.end.bind(this),onComplete:this.end.bind(this)});
-this.clone.inject(this.element,"before");this.drag.start(b);},end:function(){this.drag.detach();this.element.set("opacity",this.opacity);if(this.effect){var b=this.element.getStyles("width","height"),d=this.clone,c=d.computePosition(this.element.getPosition(this.clone.getOffsetParent()));
-var a=function(){this.removeEvent("cancel",a);d.destroy();};this.effect.element=d;this.effect.start({top:c.top,left:c.left,width:b.width,height:b.height,opacity:0.25}).addEvent("cancel",a).chain(a);
-}else{this.clone.destroy();}this.reset();},reset:function(){this.idle=true;this.fireEvent("complete",this.element);},serialize:function(){var c=Array.link(arguments,{modifier:Type.isFunction,index:function(d){return d!=null;
-}});var b=this.lists.map(function(d){return d.getChildren().map(c.modifier||function(e){return e.get("id");},this);},this);var a=c.index;if(this.lists.length==1){a=0;
-}return(a||a===0)&&a>=0&&a<this.lists.length?b[a]:b;}});Request.JSONP=new Class({Implements:[Chain,Events,Options],options:{onRequest:function(a){if(this.options.log&&window.console&&console.log){console.log("JSONP retrieving script with url:"+a);
-}},onError:function(a){if(this.options.log&&window.console&&console.warn){console.warn("JSONP "+a+" will fail in Internet Explorer, which enforces a 2083 bytes length limit on URIs");
-}},url:"",callbackKey:"callback",injectScript:document.head,data:"",link:"ignore",timeout:0,log:false},initialize:function(a){this.setOptions(a);},send:function(c){if(!Request.prototype.check.call(this,c)){return this;
-}this.running=true;var d=typeOf(c);if(d=="string"||d=="element"){c={data:c};}c=Object.merge(this.options,c||{});var e=c.data;switch(typeOf(e)){case"element":e=document.id(e).toQueryString();
-break;case"object":case"hash":e=Object.toQueryString(e);}var b=this.index=Request.JSONP.counter++;var f=c.url+(c.url.test("\\?")?"&":"?")+(c.callbackKey)+"=Request.JSONP.request_map.request_"+b+(e?"&"+e:"");
-if(f.length>2083){this.fireEvent("error",f);}Request.JSONP.request_map["request_"+b]=function(){this.success(arguments,b);}.bind(this);var a=this.getScript(f).inject(c.injectScript);
-this.fireEvent("request",[f,a]);if(c.timeout){this.timeout.delay(c.timeout,this);}return this;},getScript:function(a){if(!this.script){this.script=new Element("script",{type:"text/javascript",async:true,src:a});
-}return this.script;},success:function(b,a){if(!this.running){return;}this.clear().fireEvent("complete",b).fireEvent("success",b).callChain();},cancel:function(){if(this.running){this.clear().fireEvent("cancel");
-}return this;},isRunning:function(){return !!this.running;},clear:function(){this.running=false;if(this.script){this.script.destroy();this.script=null;
-}return this;},timeout:function(){if(this.running){this.running=false;this.fireEvent("timeout",[this.script.get("src"),this.script]).fireEvent("failure").cancel();
-}return this;}});Request.JSONP.counter=0;Request.JSONP.request_map={};Request.Queue=new Class({Implements:[Options,Events],Binds:["attach","request","complete","cancel","success","failure","exception"],options:{stopOnFailure:true,autoAdvance:true,concurrent:1,requests:{}},initialize:function(a){var b;
-if(a){b=a.requests;delete a.requests;}this.setOptions(a);this.requests={};this.queue=[];this.reqBinders={};if(b){this.addRequests(b);}},addRequest:function(a,b){this.requests[a]=b;
-this.attach(a,b);return this;},addRequests:function(a){Object.each(a,function(c,b){this.addRequest(b,c);},this);return this;},getName:function(a){return Object.keyOf(this.requests,a);
-},attach:function(a,b){if(b._groupSend){return this;}["request","complete","cancel","success","failure","exception"].each(function(c){if(!this.reqBinders[a]){this.reqBinders[a]={};
-}this.reqBinders[a][c]=function(){this["on"+c.capitalize()].apply(this,[a,b].append(arguments));}.bind(this);b.addEvent(c,this.reqBinders[a][c]);},this);
-b._groupSend=b.send;b.send=function(c){this.send(a,c);return b;}.bind(this);return this;},removeRequest:function(b){var a=typeOf(b)=="object"?this.getName(b):b;
-if(!a&&typeOf(a)!="string"){return this;}b=this.requests[a];if(!b){return this;}["request","complete","cancel","success","failure","exception"].each(function(c){b.removeEvent(c,this.reqBinders[a][c]);
-},this);b.send=b._groupSend;delete b._groupSend;return this;},getRunning:function(){return Object.filter(this.requests,function(a){return a.running;});
-},isRunning:function(){return !!(Object.keys(this.getRunning()).length);},send:function(b,a){var c=function(){this.requests[b]._groupSend(a);this.queue.erase(c);
-}.bind(this);c.name=b;if(Object.keys(this.getRunning()).length>=this.options.concurrent||(this.error&&this.options.stopOnFailure)){this.queue.push(c);}else{c();
-}return this;},hasNext:function(a){return(!a)?!!this.queue.length:!!this.queue.filter(function(b){return b.name==a;}).length;},resume:function(){this.error=false;
-(this.options.concurrent-Object.keys(this.getRunning()).length).times(this.runNext,this);return this;},runNext:function(a){if(!this.queue.length){return this;
-}if(!a){this.queue[0]();}else{var b;this.queue.each(function(c){if(!b&&c.name==a){b=true;c();}});}return this;},runAll:function(){this.queue.each(function(a){a();
-});return this;},clear:function(a){if(!a){this.queue.empty();}else{this.queue=this.queue.map(function(b){if(b.name!=a){return b;}else{return false;}}).filter(function(b){return b;
-});}return this;},cancel:function(a){this.requests[a].cancel();return this;},onRequest:function(){this.fireEvent("request",arguments);},onComplete:function(){this.fireEvent("complete",arguments);
-if(!this.queue.length){this.fireEvent("end");}},onCancel:function(){if(this.options.autoAdvance&&!this.error){this.runNext();}this.fireEvent("cancel",arguments);
-},onSuccess:function(){if(this.options.autoAdvance&&!this.error){this.runNext();}this.fireEvent("success",arguments);},onFailure:function(){this.error=true;
-if(!this.options.stopOnFailure&&this.options.autoAdvance){this.runNext();}this.fireEvent("failure",arguments);},onException:function(){this.error=true;
-if(!this.options.stopOnFailure&&this.options.autoAdvance){this.runNext();}this.fireEvent("exception",arguments);}});Request.implement({options:{initialDelay:5000,delay:5000,limit:60000},startTimer:function(b){var a=function(){if(!this.running){this.send({data:b});
-}};this.lastDelay=this.options.initialDelay;this.timer=a.delay(this.lastDelay,this);this.completeCheck=function(c){clearTimeout(this.timer);this.lastDelay=(c)?this.options.delay:(this.lastDelay+this.options.delay).min(this.options.limit);
-this.timer=a.delay(this.lastDelay,this);};return this.addEvent("complete",this.completeCheck);},stopTimer:function(){clearTimeout(this.timer);return this.removeEvent("complete",this.completeCheck);
-}});var Asset={javascript:function(f,c){if(!c){c={};}var a=new Element("script",{src:f,type:"text/javascript"}),g=c.document||document,b=0,d=c.onload||c.onLoad;
-var e=d?function(){if(++b==1){d.call(this);}}:function(){};delete c.onload;delete c.onLoad;delete c.document;return a.addEvents({load:e,readystatechange:function(){if(["loaded","complete"].contains(this.readyState)){e.call(this);
-}}}).set(c).inject(g.head);},css:function(d,a){if(!a){a={};}var b=new Element("link",{rel:"stylesheet",media:"screen",type:"text/css",href:d});var c=a.onload||a.onLoad,e=a.document||document;
-delete a.onload;delete a.onLoad;delete a.document;if(c){b.addEvent("load",c);}return b.set(a).inject(e.head);},image:function(c,b){if(!b){b={};}var d=new Image(),a=document.id(d)||new Element("img");
-["load","abort","error"].each(function(e){var g="on"+e,f="on"+e.capitalize(),h=b[g]||b[f]||function(){};delete b[f];delete b[g];d[g]=function(){if(!d){return;
-}if(!a.parentNode){a.width=d.width;a.height=d.height;}d=d.onload=d.onabort=d.onerror=null;h.delay(1,a,a);a.fireEvent(e,a,1);};});d.src=a.src=c;if(d&&d.complete){d.onload.delay(1);
-}return a.set(b);},images:function(c,b){c=Array.from(c);var d=function(){},a=0;b=Object.merge({onComplete:d,onProgress:d,onError:d,properties:{}},b);return new Elements(c.map(function(f,e){return Asset.image(f,Object.append(b.properties,{onload:function(){a++;
-b.onProgress.call(this,a,e,f);if(a==c.length){b.onComplete();}},onerror:function(){a++;b.onError.call(this,a,e,f);if(a==c.length){b.onComplete();}}}));
-}));}};(function(){var a=this.Color=new Type("Color",function(c,d){if(arguments.length>=3){d="rgb";c=Array.slice(arguments,0,3);}else{if(typeof c=="string"){if(c.match(/rgb/)){c=c.rgbToHex().hexToRgb(true);
-}else{if(c.match(/hsb/)){c=c.hsbToRgb();}else{c=c.hexToRgb(true);}}}}d=d||"rgb";switch(d){case"hsb":var b=c;c=c.hsbToRgb();c.hsb=b;break;case"hex":c=c.hexToRgb(true);
-break;}c.rgb=c.slice(0,3);c.hsb=c.hsb||c.rgbToHsb();c.hex=c.rgbToHex();return Object.append(c,this);});a.implement({mix:function(){var b=Array.slice(arguments);
-var d=(typeOf(b.getLast())=="number")?b.pop():50;var c=this.slice();b.each(function(e){e=new a(e);for(var f=0;f<3;f++){c[f]=Math.round((c[f]/100*(100-d))+(e[f]/100*d));
-}});return new a(c,"rgb");},invert:function(){return new a(this.map(function(b){return 255-b;}));},setHue:function(b){return new a([b,this.hsb[1],this.hsb[2]],"hsb");
-},setSaturation:function(b){return new a([this.hsb[0],b,this.hsb[2]],"hsb");},setBrightness:function(b){return new a([this.hsb[0],this.hsb[1],b],"hsb");
-}});this.$RGB=function(e,d,c){return new a([e,d,c],"rgb");};this.$HSB=function(e,d,c){return new a([e,d,c],"hsb");};this.$HEX=function(b){return new a(b,"hex");
-};Array.implement({rgbToHsb:function(){var c=this[0],d=this[1],k=this[2],h=0;var j=Math.max(c,d,k),f=Math.min(c,d,k);var l=j-f;var i=j/255,g=(j!=0)?l/j:0;
-if(g!=0){var e=(j-c)/l;var b=(j-d)/l;var m=(j-k)/l;if(c==j){h=m-b;}else{if(d==j){h=2+e-m;}else{h=4+b-e;}}h/=6;if(h<0){h++;}}return[Math.round(h*360),Math.round(g*100),Math.round(i*100)];
-},hsbToRgb:function(){var d=Math.round(this[2]/100*255);if(this[1]==0){return[d,d,d];}else{var b=this[0]%360;var g=b%60;var h=Math.round((this[2]*(100-this[1]))/10000*255);
-var e=Math.round((this[2]*(6000-this[1]*g))/600000*255);var c=Math.round((this[2]*(6000-this[1]*(60-g)))/600000*255);switch(Math.floor(b/60)){case 0:return[d,c,h];
-case 1:return[e,d,h];case 2:return[h,d,c];case 3:return[h,e,d];case 4:return[c,h,d];case 5:return[d,h,e];}}return false;}});String.implement({rgbToHsb:function(){var b=this.match(/\d{1,3}/g);
-return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})();(function(){this.Group=new Class({initialize:function(){this.instances=Array.flatten(arguments);
-this.events={};this.checker={};},addEvent:function(b,a){this.checker[b]=this.checker[b]||{};this.events[b]=this.events[b]||[];if(this.events[b].contains(a)){return false;
-}else{this.events[b].push(a);}this.instances.each(function(c,d){c.addEvent(b,this.check.pass([b,c,d],this));},this);return this;},check:function(c,a,b){this.checker[c][b]=true;
-var d=this.instances.every(function(f,e){return this.checker[c][e]||false;},this);if(!d){return;}this.checker[c]={};this.events[c].each(function(e){e.call(this,this.instances,a);
-},this);}});})();Hash.Cookie=new Class({Extends:Cookie,options:{autoSave:true},initialize:function(b,a){this.parent(b,a);this.load();},save:function(){var a=JSON.encode(this.hash);
-if(!a||a.length>4096){return false;}if(a=="{}"){this.dispose();}else{this.write(a);}return true;},load:function(){this.hash=new Hash(JSON.decode(this.read(),true));
-return this;}});Hash.each(Hash.prototype,function(b,a){if(typeof b=="function"){Hash.Cookie.implement(a,function(){var c=b.apply(this.hash,arguments);if(this.options.autoSave){this.save();
-}return c;});}});(function(){var a=this.Table=function(){this.length=0;var c=[],b=[];this.set=function(e,g){var d=c.indexOf(e);if(d==-1){var f=c.length;
-c[f]=e;b[f]=g;this.length++;}else{b[d]=g;}return this;};this.get=function(e){var d=c.indexOf(e);return(d==-1)?null:b[d];};this.erase=function(e){var d=c.indexOf(e);
-if(d!=-1){this.length--;c.splice(d,1);return b.splice(d,1)[0];}return null;};this.each=this.forEach=function(f,g){for(var e=0,d=this.length;e<d;e++){f.call(g,c[e],b[e],this);
-}};};if(this.Type){new Type("Table",a);}})();var HtmlTable=new Class({Implements:[Options,Events,Class.Occlude],options:{properties:{cellpadding:0,cellspacing:0,border:0},rows:[],headers:[],footers:[]},property:"HtmlTable",initialize:function(){var a=Array.link(arguments,{options:Type.isObject,table:Type.isElement,id:Type.isString});
-this.setOptions(a.options);if(!a.table&&a.id){a.table=document.id(a.id);}this.element=a.table||new Element("table",this.options.properties);if(this.occlude()){return this.occluded;
-}this.build();},build:function(){this.element.store("HtmlTable",this);this.body=document.id(this.element.tBodies[0])||new Element("tbody").inject(this.element);
-$$(this.body.rows);if(this.options.headers.length){this.setHeaders(this.options.headers);}else{this.thead=document.id(this.element.tHead);}if(this.thead){this.head=this.getHead();
-}if(this.options.footers.length){this.setFooters(this.options.footers);}this.tfoot=document.id(this.element.tFoot);if(this.tfoot){this.foot=document.id(this.tfoot.rows[0]);
-}this.options.rows.each(function(a){this.push(a);},this);},toElement:function(){return this.element;},empty:function(){this.body.empty();return this;},set:function(e,a){var d=(e=="headers")?"tHead":"tFoot",b=d.toLowerCase();
-this[b]=(document.id(this.element[d])||new Element(b).inject(this.element,"top")).empty();var c=this.push(a,{},this[b],e=="headers"?"th":"td");if(e=="headers"){this.head=this.getHead();
-}else{this.foot=this.getHead();}return c;},getHead:function(){var a=this.thead.rows;return a.length>1?$$(a):a.length?document.id(a[0]):false;},setHeaders:function(a){this.set("headers",a);
-return this;},setFooters:function(a){this.set("footers",a);return this;},push:function(f,c,e,a,b){if(typeOf(f)=="element"&&f.get("tag")=="tr"){f.inject(e||this.body,b);
-return{tr:f,tds:f.getChildren("td")};}var d=f.map(function(i){var j=new Element(a||"td",i?i.properties:{}),h=(i?i.content:"")||i,g=typeOf(h);if(["element","array","collection","elements"].contains(g)){j.adopt(h);
-}else{j.set("html",h);}return j;});return{tr:new Element("tr",c).inject(e||this.body,b).adopt(d),tds:d};}});["adopt","inject","wraps","grab","replaces","dispose"].each(function(a){HtmlTable.implement(a,function(){this.element[a].apply(this.element,arguments);
-return this;});});HtmlTable=Class.refactor(HtmlTable,{options:{classZebra:"table-tr-odd",zebra:true},initialize:function(){this.previous.apply(this,arguments);
-if(this.occluded){return this.occluded;}if(this.options.zebra){this.updateZebras();}},updateZebras:function(){Array.each(this.body.rows,this.zebra,this);
-},setRowStyle:function(b,a){if(this.previous){this.previous(b,a);}this.zebra(b,a);},zebra:function(b,a){return b[((a%2)?"remove":"add")+"Class"](this.options.classZebra);
-},push:function(){var a=this.previous.apply(this,arguments);if(this.options.zebra){this.updateZebras();}return a;}});HtmlTable=Class.refactor(HtmlTable,{options:{sortIndex:0,sortReverse:false,parsers:[],defaultParser:"string",classSortable:"table-sortable",classHeadSort:"table-th-sort",classHeadSortRev:"table-th-sort-rev",classNoSort:"table-th-nosort",classGroupHead:"table-tr-group-head",classGroup:"table-tr-group",classCellSort:"table-td-sort",classSortSpan:"table-th-sort-span",sortable:false,thSelector:"th"},initialize:function(){this.previous.apply(this,arguments);
-if(this.occluded){return this.occluded;}this.sorted={index:null,dir:1};this.bound={headClick:this.headClick.bind(this)};this.sortSpans=new Elements();if(this.options.sortable){this.enableSort();
-if(this.options.sortIndex!=null){this.sort(this.options.sortIndex,this.options.sortReverse);}}},attachSorts:function(a){this.detachSorts();if(a!==false){this.element.addEvent("click:relay("+this.options.thSelector+")",this.bound.headClick);
-}},detachSorts:function(){this.element.removeEvents("click:relay("+this.options.thSelector+")");},setHeaders:function(){this.previous.apply(this,arguments);
-if(this.sortEnabled){this.setParsers();}},setParsers:function(){this.parsers=this.detectParsers();},detectParsers:function(){return this.head&&this.head.getElements(this.options.thSelector).flatten().map(this.detectParser,this);
-},detectParser:function(a,b){if(a.hasClass(this.options.classNoSort)||a.retrieve("htmltable-parser")){return a.retrieve("htmltable-parser");}var c=new Element("div");
-c.adopt(a.childNodes).inject(a);var f=new Element("span",{"class":this.options.classSortSpan}).inject(c,"top");this.sortSpans.push(f);var g=this.options.parsers[b],e=this.body.rows,d;
-switch(typeOf(g)){case"function":g={convert:g};d=true;break;case"string":g=g;d=true;break;}if(!d){HtmlTable.ParserPriority.some(function(k){var o=HtmlTable.Parsers[k],m=o.match;
-if(!m){return false;}for(var n=0,l=e.length;n<l;n++){var h=document.id(e[n].cells[b]),p=h?h.get("html").clean():"";if(p&&m.test(p)){g=o;return true;}}});
-}if(!g){g=this.options.defaultParser;}a.store("htmltable-parser",g);return g;},headClick:function(b,a){if(!this.head||a.hasClass(this.options.classNoSort)){return;
-}return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(),a)%this.body.rows[0].cells.length);},serialize:function(){var a=this.previous.apply(this,arguments)||{};
-if(this.options.sortable){a.sortIndex=this.sorted.index;a.sortReverse=this.sorted.reverse;}return a;},restore:function(a){if(this.options.sortable&&a.sortIndex){this.sort(a.sortIndex,a.sortReverse);
-}this.previous.apply(this,arguments);},setSortedState:function(b,a){if(a!=null){this.sorted.reverse=a;}else{if(this.sorted.index==b){this.sorted.reverse=!this.sorted.reverse;
-}else{this.sorted.reverse=this.sorted.index==null;}}if(b!=null){this.sorted.index=b;}},setHeadSort:function(a){var b=$$(!this.head.length?this.head.cells[this.sorted.index]:this.head.map(function(c){return c.getElements(this.options.thSelector)[this.sorted.index];
-},this).clean());if(!b.length){return;}if(a){b.addClass(this.options.classHeadSort);if(this.sorted.reverse){b.addClass(this.options.classHeadSortRev);}else{b.removeClass(this.options.classHeadSortRev);
-}}else{b.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);}},setRowSort:function(b,a){var e=b.length,d=this.body,g,f;
-while(e){var h=b[--e],c=h.position,i=d.rows[c];if(i.disabled){continue;}if(!a){g=this.setGroupSort(g,i,h);this.setRowStyle(i,e);}d.appendChild(i);for(f=0;
-f<e;f++){if(b[f].position>c){b[f].position--;}}}},setRowStyle:function(b,a){this.previous(b,a);b.cells[this.sorted.index].addClass(this.options.classCellSort);
-},setGroupSort:function(b,c,a){if(b==a.value){c.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);}else{c.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
-}return a.value;},getParser:function(){var a=this.parsers[this.sorted.index];return typeOf(a)=="string"?HtmlTable.Parsers[a]:a;},sort:function(c,b,e){if(!this.head){return;
-}if(!e){this.clearSort();this.setSortedState(c,b);this.setHeadSort(true);}var f=this.getParser();if(!f){return;}var a;if(!Browser.ie){a=this.body.getParent();
-this.body.dispose();}var d=this.parseData(f).sort(function(h,g){if(h.value===g.value){return 0;}return h.value>g.value?1:-1;});if(this.sorted.reverse==(f==HtmlTable.Parsers["input-checked"])){d.reverse(true);
-}this.setRowSort(d,e);if(a){a.grab(this.body);}this.fireEvent("stateChanged");return this.fireEvent("sort",[this.body,this.sorted.index]);},parseData:function(a){return Array.map(this.body.rows,function(d,b){var c=a.convert.call(document.id(d.cells[this.sorted.index]));
-return{position:b,value:c};},this);},clearSort:function(){this.setHeadSort(false);this.body.getElements("td").removeClass(this.options.classCellSort);},reSort:function(){if(this.sortEnabled){this.sort.call(this,this.sorted.index,this.sorted.reverse);
-}return this;},enableSort:function(){this.element.addClass(this.options.classSortable);this.attachSorts(true);this.setParsers();this.sortEnabled=true;return this;
-},disableSort:function(){this.element.removeClass(this.options.classSortable);this.attachSorts(false);this.sortSpans.each(function(a){a.destroy();});this.sortSpans.empty();
-this.sortEnabled=false;return this;}});HtmlTable.ParserPriority=["date","input-checked","input-value","float","number"];HtmlTable.Parsers={date:{match:/^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,convert:function(){var a=Date.parse(this.get("text").stripTags());
-return(typeOf(a)=="date")?a.format("db"):"";},type:"date"},"input-checked":{match:/ type="(radio|checkbox)" /,convert:function(){return this.getElement("input").checked;
-}},"input-value":{match:/<input/,convert:function(){return this.getElement("input").value;}},number:{match:/^\d+[^\d.,]*$/,convert:function(){return this.get("text").stripTags().toInt();
-},number:true},numberLax:{match:/^[^\d]+\d+$/,convert:function(){return this.get("text").replace(/[^-?^0-9]/,"").stripTags().toInt();},number:true},"float":{match:/^[\d]+\.[\d]+/,convert:function(){return this.get("text").replace(/[^-?^\d.]/,"").stripTags().toFloat();
-},number:true},floatLax:{match:/^[^\d]+[\d]+\.[\d]+$/,convert:function(){return this.get("text").replace(/[^-?^\d.]/,"").stripTags();},number:true},string:{match:null,convert:function(){return this.get("text").stripTags().toLowerCase();
-}},title:{match:null,convert:function(){return this.title;}}};HtmlTable.defineParsers=function(a){HtmlTable.Parsers=Object.append(HtmlTable.Parsers,a);
-for(var b in a){HtmlTable.ParserPriority.unshift(b);}};(function(){var a=this.Keyboard=new Class({Extends:Events,Implements:[Options],options:{defaultEventType:"keydown",active:false,manager:null,events:{},nonParsedEvents:["activate","deactivate","onactivate","ondeactivate","changed","onchanged"]},initialize:function(f){if(f&&f.manager){this._manager=f.manager;
-delete f.manager;}this.setOptions(f);this._setup();},addEvent:function(h,g,f){return this.parent(a.parse(h,this.options.defaultEventType,this.options.nonParsedEvents),g,f);
-},removeEvent:function(g,f){return this.parent(a.parse(g,this.options.defaultEventType,this.options.nonParsedEvents),f);},toggleActive:function(){return this[this.isActive()?"deactivate":"activate"]();
-},activate:function(f){if(f){if(f.isActive()){return this;}if(this._activeKB&&f!=this._activeKB){this.previous=this._activeKB;this.previous.fireEvent("deactivate");
-}this._activeKB=f.fireEvent("activate");a.manager.fireEvent("changed");}else{if(this._manager){this._manager.activate(this);}}return this;},isActive:function(){return this._manager?(this._manager._activeKB==this):(a.manager==this);
-},deactivate:function(f){if(f){if(f===this._activeKB){this._activeKB=null;f.fireEvent("deactivate");a.manager.fireEvent("changed");}}else{if(this._manager){this._manager.deactivate(this);
-}}return this;},relinquish:function(){if(this.isActive()&&this._manager&&this._manager.previous){this._manager.activate(this._manager.previous);}else{this.deactivate();
-}return this;},manage:function(f){if(f._manager){f._manager.drop(f);}this._instances.push(f);f._manager=this;if(!this._activeKB){this.activate(f);}return this;
-},drop:function(f){f.relinquish();this._instances.erase(f);if(this._activeKB==f){if(this.previous&&this._instances.contains(this.previous)){this.activate(this.previous);
-}else{this._activeKB=this._instances[0];}}return this;},trace:function(){a.trace(this);},each:function(f){a.each(this,f);},_instances:[],_disable:function(f){if(this._activeKB==f){this._activeKB=null;
-}},_setup:function(){this.addEvents(this.options.events);if(a.manager&&!this._manager){a.manager.manage(this);}if(this.options.active){this.activate();
-}else{this.relinquish();}},_handle:function(h,g){if(h.preventKeyboardPropagation){return;}var f=!!this._manager;if(f&&this._activeKB){this._activeKB._handle(h,g);
-if(h.preventKeyboardPropagation){return;}}this.fireEvent(g,h);if(!f&&this._activeKB){this._activeKB._handle(h,g);}}});var b={};var c=["shift","control","alt","meta"];
-var e=/^(?:shift|control|ctrl|alt|meta)$/;a.parse=function(h,g,k){if(k&&k.contains(h.toLowerCase())){return h;}h=h.toLowerCase().replace(/^(keyup|keydown):/,function(m,l){g=l;
-return"";});if(!b[h]){var f,j={};h.split("+").each(function(l){if(e.test(l)){j[l]=true;}else{f=l;}});j.control=j.control||j.ctrl;var i=[];c.each(function(l){if(j[l]){i.push(l);
-}});if(f){i.push(f);}b[h]=i.join("+");}return g+":keys("+b[h]+")";};a.each=function(f,g){var h=f||a.manager;while(h){g.run(h);h=h._activeKB;}};a.stop=function(f){f.preventKeyboardPropagation=true;
-};a.manager=new a({active:true});a.trace=function(f){f=f||a.manager;var g=window.console&&console.log;if(g){console.log("the following items have focus: ");
-}a.each(f,function(h){if(g){console.log(document.id(h.widget)||h.wiget||h);}});};var d=function(g){var f=[];c.each(function(h){if(g[h]){f.push(h);}});if(!e.test(g.key)){f.push(g.key);
-}a.manager._handle(g,g.type+":keys("+f.join("+")+")");};document.addEvents({keyup:d,keydown:d});})();Keyboard.prototype.options.nonParsedEvents.combine(["rebound","onrebound"]);
-Keyboard.implement({addShortcut:function(b,a){this._shortcuts=this._shortcuts||[];this._shortcutIndex=this._shortcutIndex||{};a.getKeyboard=Function.from(this);
-a.name=b;this._shortcutIndex[b]=a;this._shortcuts.push(a);if(a.keys){this.addEvent(a.keys,a.handler);}return this;},addShortcuts:function(b){for(var a in b){this.addShortcut(a,b[a]);
-}return this;},removeShortcut:function(b){var a=this.getShortcut(b);if(a&&a.keys){this.removeEvent(a.keys,a.handler);delete this._shortcutIndex[b];this._shortcuts.erase(a);
-}return this;},removeShortcuts:function(a){a.each(this.removeShortcut,this);return this;},getShortcuts:function(){return this._shortcuts||[];},getShortcut:function(a){return(this._shortcutIndex||{})[a];
-}});Keyboard.rebind=function(b,a){Array.from(a).each(function(c){c.getKeyboard().removeEvent(c.keys,c.handler);c.getKeyboard().addEvent(b,c.handler);c.keys=b;
-c.getKeyboard().fireEvent("rebound");});};Keyboard.getActiveShortcuts=function(b){var a=[],c=[];Keyboard.each(b,[].push.bind(a));a.each(function(d){c.extend(d.getShortcuts());
-});return c;};Keyboard.getShortcut=function(c,b,d){d=d||{};var a=d.many?[]:null,e=d.many?function(g){var f=g.getShortcut(c);if(f){a.push(f);}}:function(f){if(!a){a=f.getShortcut(c);
-}};Keyboard.each(b,e);return a;};Keyboard.getShortcuts=function(b,a){return Keyboard.getShortcut(b,a,{many:true});};HtmlTable=Class.refactor(HtmlTable,{options:{useKeyboard:true,classRowSelected:"table-tr-selected",classRowHovered:"table-tr-hovered",classSelectable:"table-selectable",shiftForMultiSelect:true,allowMultiSelect:true,selectable:false},initialize:function(){this.previous.apply(this,arguments);
-if(this.occluded){return this.occluded;}this.selectedRows=new Elements();this.bound={mouseleave:this.mouseleave.bind(this),clickRow:this.clickRow.bind(this),activateKeyboard:function(){if(this.keyboard&&this.selectEnabled){this.keyboard.activate();
-}}.bind(this)};if(this.options.selectable){this.enableSelect();}},empty:function(){this.selectNone();return this.previous();},enableSelect:function(){this.selectEnabled=true;
-this.attachSelects();this.element.addClass(this.options.classSelectable);return this;},disableSelect:function(){this.selectEnabled=false;this.attachSelects(false);
-this.element.removeClass(this.options.classSelectable);return this;},push:function(){var a=this.previous.apply(this,arguments);this.updateSelects();return a;
-},isSelected:function(a){return this.selectedRows.contains(a);},toggleRow:function(a){return this[(this.isSelected(a)?"de":"")+"selectRow"](a);},selectRow:function(b,a){if(this.isSelected(b)||(!a&&!this.body.getChildren().contains(b))){return;
-}if(!this.options.allowMultiSelect){this.selectNone();}if(!this.isSelected(b)){this.selectedRows.push(b);b.addClass(this.options.classRowSelected);this.fireEvent("rowFocus",[b,this.selectedRows]);
-this.fireEvent("stateChanged");}this.focused=b;document.clearSelection();return this;},getSelected:function(){return this.selectedRows;},serialize:function(){var a=this.previous.apply(this,arguments)||{};
-if(this.options.selectable){a.selectedRows=this.selectedRows.map(function(b){return Array.indexOf(this.body.rows,b);}.bind(this));}return a;},restore:function(a){if(this.options.selectable&&a.selectedRows){a.selectedRows.each(function(b){this.selectRow(this.body.rows[b]);
-}.bind(this));}this.previous.apply(this,arguments);},deselectRow:function(b,a){if(!this.isSelected(b)||(!a&&!this.body.getChildren().contains(b))){return;
-}this.selectedRows=new Elements(Array.from(this.selectedRows).erase(b));b.removeClass(this.options.classRowSelected);this.fireEvent("rowUnfocus",[b,this.selectedRows]);
-this.fireEvent("stateChanged");return this;},selectAll:function(a){if(!a&&!this.options.allowMultiSelect){return;}this.selectRange(0,this.body.rows.length,a);
-return this;},selectNone:function(){return this.selectAll(true);},selectRange:function(b,a,f){if(!this.options.allowMultiSelect&&!f){return;}var g=f?"deselectRow":"selectRow",e=Array.clone(this.body.rows);
-if(typeOf(b)=="element"){b=e.indexOf(b);}if(typeOf(a)=="element"){a=e.indexOf(a);}a=a<e.length-1?a:e.length-1;if(a<b){var d=b;b=a;a=d;}for(var c=b;c<=a;
-c++){this[g](e[c],true);}return this;},deselectRange:function(b,a){this.selectRange(b,a,true);},getSelected:function(){return this.selectedRows;},enterRow:function(a){if(this.hovered){this.hovered=this.leaveRow(this.hovered);
-}this.hovered=a.addClass(this.options.classRowHovered);},leaveRow:function(a){a.removeClass(this.options.classRowHovered);},updateSelects:function(){Array.each(this.body.rows,function(a){var b=a.retrieve("binders");
-if(!b&&!this.selectEnabled){return;}if(!b){b={mouseenter:this.enterRow.pass([a],this),mouseleave:this.leaveRow.pass([a],this)};a.store("binders",b);}if(this.selectEnabled){a.addEvents(b);
-}else{a.removeEvents(b);}},this);},shiftFocus:function(b,a){if(!this.focused){return this.selectRow(this.body.rows[0],a);}var c=this.getRowByOffset(b);
-if(c===null||this.focused==this.body.rows[c]){return this;}this.toggleRow(this.body.rows[c],a);},clickRow:function(a,b){var c=(a.shift||a.meta||a.control)&&this.options.shiftForMultiSelect;
-if(!c&&!(a.rightClick&&this.isSelected(b)&&this.options.allowMultiSelect)){this.selectNone();}if(a.rightClick){this.selectRow(b);}else{this.toggleRow(b);
-}if(a.shift){this.selectRange(this.rangeStart||this.body.rows[0],b,this.rangeStart?!this.isSelected(b):true);this.focused=b;}this.rangeStart=b;},getRowByOffset:function(c){if(!this.focused){return 0;
-}var b=Array.clone(this.body.rows),a=b.indexOf(this.focused)+c;if(a<0){a=null;}if(a>=b.length){a=null;}return a;},attachSelects:function(d){d=d!=null?d:true;
-var g=d?"addEvents":"removeEvents";this.element[g]({mouseleave:this.bound.mouseleave,click:this.bound.activateKeyboard});this.body[g]({"click:relay(tr)":this.bound.clickRow,"contextmenu:relay(tr)":this.bound.clickRow});
-if(this.options.useKeyboard||this.keyboard){if(!this.keyboard){this.keyboard=new Keyboard();}if(!this.selectKeysDefined){this.selectKeysDefined=true;var f,e;
-var c=function(i){var h=function(j){clearTimeout(f);j.preventDefault();var k=this.body.rows[this.getRowByOffset(i)];if(j.shift&&k&&this.isSelected(k)){this.deselectRow(this.focused);
-this.focused=k;}else{if(k&&(!this.options.allowMultiSelect||!j.shift)){this.selectNone();}this.shiftFocus(i,j);}if(e){f=h.delay(100,this,j);}else{f=(function(){e=true;
-h(j);}).delay(400);}}.bind(this);return h;}.bind(this);var b=function(){clearTimeout(f);e=false;};this.keyboard.addEvents({"keydown:shift+up":c(-1),"keydown:shift+down":c(1),"keyup:shift+up":b,"keyup:shift+down":b,"keyup:up":b,"keyup:down":b});
-var a="";if(this.options.allowMultiSelect&&this.options.shiftForMultiSelect&&this.options.useKeyboard){a=" (Shift multi-selects).";}this.keyboard.addShortcuts({"Select Previous Row":{keys:"up",shortcut:"up arrow",handler:c(-1),description:"Select the previous row in the table."+a},"Select Next Row":{keys:"down",shortcut:"down arrow",handler:c(1),description:"Select the next row in the table."+a}});
-}this.keyboard[d?"activate":"deactivate"]();}this.updateSelects();},mouseleave:function(){if(this.hovered){this.leaveRow(this.hovered);}}});var Scroller=new Class({Implements:[Events,Options],options:{area:20,velocity:1,onChange:function(a,b){this.element.scrollTo(a,b);
-},fps:50},initialize:function(b,a){this.setOptions(a);this.element=document.id(b);this.docBody=document.id(this.element.getDocument().body);this.listener=(typeOf(this.element)!="element")?this.docBody:this.element;
-this.timer=null;this.bound={attach:this.attach.bind(this),detach:this.detach.bind(this),getCoords:this.getCoords.bind(this)};},start:function(){this.listener.addEvents({mouseover:this.bound.attach,mouseleave:this.bound.detach});
-return this;},stop:function(){this.listener.removeEvents({mouseover:this.bound.attach,mouseleave:this.bound.detach});this.detach();this.timer=clearInterval(this.timer);
-return this;},attach:function(){this.listener.addEvent("mousemove",this.bound.getCoords);},detach:function(){this.listener.removeEvent("mousemove",this.bound.getCoords);
-this.timer=clearInterval(this.timer);},getCoords:function(a){this.page=(this.listener.get("tag")=="body")?a.client:a.page;if(!this.timer){this.timer=this.scroll.periodical(Math.round(1000/this.options.fps),this);
-}},scroll:function(){var c=this.element.getSize(),a=this.element.getScroll(),h=this.element!=this.docBody?this.element.getOffsets():{x:0,y:0},d=this.element.getScrollSize(),g={x:0,y:0},e=this.options.area.top||this.options.area,b=this.options.area.bottom||this.options.area;
-for(var f in this.page){if(this.page[f]<(e+h[f])&&a[f]!=0){g[f]=(this.page[f]-e-h[f])*this.options.velocity;}else{if(this.page[f]+b>(c[f]+h[f])&&a[f]+c[f]!=d[f]){g[f]=(this.page[f]-c[f]+b-h[f])*this.options.velocity;
-}}g[f]=g[f].round();}if(g.y||g.x){this.fireEvent("change",[a.x+g.x,a.y+g.y]);}}});(function(){var a=function(c,b){return(c)?(typeOf(c)=="function"?c(b):b.get(c)):"";
-};this.Tips=new Class({Implements:[Events,Options],options:{onShow:function(){this.tip.setStyle("display","block");},onHide:function(){this.tip.setStyle("display","none");
-},title:"title",text:function(b){return b.get("rel")||b.get("href");},showDelay:100,hideDelay:100,className:"tip-wrap",offset:{x:16,y:16},windowPadding:{x:0,y:0},fixed:false},initialize:function(){var b=Array.link(arguments,{options:Type.isObject,elements:function(c){return c!=null;
-}});this.setOptions(b.options);if(b.elements){this.attach(b.elements);}this.container=new Element("div",{"class":"tip"});},toElement:function(){if(this.tip){return this.tip;
-}this.tip=new Element("div",{"class":this.options.className,styles:{position:"absolute",top:0,left:0}}).adopt(new Element("div",{"class":"tip-top"}),this.container,new Element("div",{"class":"tip-bottom"}));
-return this.tip;},attach:function(b){$$(b).each(function(d){var f=a(this.options.title,d),e=a(this.options.text,d);d.set("title","").store("tip:native",f).retrieve("tip:title",f);
-d.retrieve("tip:text",e);this.fireEvent("attach",[d]);var c=["enter","leave"];if(!this.options.fixed){c.push("move");}c.each(function(h){var g=d.retrieve("tip:"+h);
-if(!g){g=function(i){this["element"+h.capitalize()].apply(this,[i,d]);}.bind(this);}d.store("tip:"+h,g).addEvent("mouse"+h,g);},this);},this);return this;
-},detach:function(b){$$(b).each(function(d){["enter","leave","move"].each(function(e){d.removeEvent("mouse"+e,d.retrieve("tip:"+e)).eliminate("tip:"+e);
-});this.fireEvent("detach",[d]);if(this.options.title=="title"){var c=d.retrieve("tip:native");if(c){d.set("title",c);}}},this);return this;},elementEnter:function(c,b){clearTimeout(this.timer);
-this.timer=(function(){this.container.empty();["title","text"].each(function(e){var d=b.retrieve("tip:"+e);var f=this["_"+e+"Element"]=new Element("div",{"class":"tip-"+e}).inject(this.container);
-if(d){this.fill(f,d);}},this);this.show(b);this.position((this.options.fixed)?{page:b.getPosition()}:c);}).delay(this.options.showDelay,this);},elementLeave:function(c,b){clearTimeout(this.timer);
-this.timer=this.hide.delay(this.options.hideDelay,this,b);this.fireForParent(c,b);},setTitle:function(b){if(this._titleElement){this._titleElement.empty();
-this.fill(this._titleElement,b);}return this;},setText:function(b){if(this._textElement){this._textElement.empty();this.fill(this._textElement,b);}return this;
-},fireForParent:function(c,b){b=b.getParent();if(!b||b==document.body){return;}if(b.retrieve("tip:enter")){b.fireEvent("mouseenter",c);}else{this.fireForParent(c,b);
-}},elementMove:function(c,b){this.position(c);},position:function(f){if(!this.tip){document.id(this);}var c=window.getSize(),b=window.getScroll(),g={x:this.tip.offsetWidth,y:this.tip.offsetHeight},d={x:"left",y:"top"},e={y:false,x2:false,y2:false,x:false},h={};
-for(var i in d){h[d[i]]=f.page[i]+this.options.offset[i];if(h[d[i]]<0){e[i]=true;}if((h[d[i]]+g[i]-b[i])>c[i]-this.options.windowPadding[i]){h[d[i]]=f.page[i]-this.options.offset[i]-g[i];
-e[i+"2"]=true;}}this.fireEvent("bound",e);this.tip.setStyles(h);},fill:function(b,c){if(typeof c=="string"){b.set("html",c);}else{b.adopt(c);}},show:function(b){if(!this.tip){document.id(this);
-}if(!this.tip.getParent()){this.tip.inject(document.body);}this.fireEvent("show",[this.tip,b]);},hide:function(b){if(!this.tip){document.id(this);}this.fireEvent("hide",[this.tip,b]);
-}});})();Locale.define("en-GB","Date",{dateOrder:["date","month","year"],shortDate:"%d/%m/%Y",shortTime:"%H:%M"}).inherit("en-US","Date");
\ No newline at end of file
diff --git a/web/tools/mootools/mootools-more-1.3.2.1-nc.js b/web/tools/mootools/mootools-more-1.5.1.js
similarity index 57%
rename from web/tools/mootools/mootools-more-1.3.2.1-nc.js
rename to web/tools/mootools/mootools-more-1.5.1.js
index 4bf490e79..15a277029 100644
--- a/web/tools/mootools/mootools-more-1.3.2.1-nc.js
+++ b/web/tools/mootools/mootools-more-1.5.1.js
@@ -1,6 +1,7 @@
-// MooTools: the javascript framework.
-// Load this file's selection again by visiting: http://mootools.net/more/09f3e47813269cd5026cbf8c1f828e72 
-// Or build this file again with packager using: packager build More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos.Keys More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/Table More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Locale.en-GB.Date
+/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2015 [Valerio Proietti](http://mad4milk.net/).*/ 
+/*
+Web Build: http://mootools.net/more/builder/a3048f4bfdf603b22a69c141dbd0fca9
+*/
 /*
 ---
 
@@ -31,11 +32,10 @@ provides: [MooTools.More]
 */
 
 MooTools.More = {
-	'version': '1.3.2.1',
-	'build': 'e586bcd2496e9b22acfde32e12f84d49ce09e59d'
+	version: '1.5.1',
+	build: '2dd695ba957196ae4b0275a690765d6636a61ccd'
 };
 
-
 /*
 ---
 
@@ -54,7 +54,7 @@ requires:
   - Core/Chain
   - Core/Element
   - Core/Fx
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Chain.Wait]
 
@@ -100,87 +100,3495 @@ provides: [Chain.Wait]
 
 })();
 
-
 /*
 ---
 
-script: Array.Extras.js
+script: Class.Binds.js
 
-name: Array.Extras
+name: Class.Binds
 
-description: Extends the Array native object to include useful methods to work with arrays.
+description: Automagically binds specified methods in a class to the instance of the class.
 
 license: MIT-style license
 
 authors:
-  - Christoph Pojer
-  - Sebastian Markbåge
+  - Aaron Newton
 
 requires:
-  - Core/Array
+  - Core/Class
   - MooTools.More
 
-provides: [Array.Extras]
+provides: [Class.Binds]
 
 ...
 */
 
-(function(nil){
+Class.Mutators.Binds = function(binds){
+	if (!this.prototype.initialize) this.implement('initialize', function(){});
+	return Array.from(binds).concat(this.prototype.Binds || []);
+};
 
-Array.implement({
+Class.Mutators.initialize = function(initialize){
+	return function(){
+		Array.from(this.Binds).each(function(name){
+			var original = this[name];
+			if (original) this[name] = original.bind(this);
+		}, this);
+		return initialize.apply(this, arguments);
+	};
+};
 
-	min: function(){
-		return Math.min.apply(null, this);
-	},
+/*
+---
 
-	max: function(){
-		return Math.max.apply(null, this);
-	},
+script: Class.Occlude.js
 
-	average: function(){
-		return this.length ? this.sum() / this.length : 0;
-	},
+name: Class.Occlude
 
-	sum: function(){
-		var result = 0, l = this.length;
-		if (l){
-			while (l--) result += this[l];
+description: Prevents a class from being applied to a DOM element twice.
+
+license: MIT-style license.
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Class
+  - Core/Element
+  - MooTools.More
+
+provides: [Class.Occlude]
+
+...
+*/
+
+Class.Occlude = new Class({
+
+	occlude: function(property, element){
+		element = document.id(element || this.element);
+		var instance = element.retrieve(property || this.property);
+		if (instance && !this.occluded)
+			return (this.occluded = instance);
+
+		this.occluded = false;
+		element.store(property || this.property, this);
+		return this.occluded;
+	}
+
+});
+
+/*
+---
+
+script: Class.Refactor.js
+
+name: Class.Refactor
+
+description: Extends a class onto itself with new property, preserving any items attached to the class's namespace.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Class
+  - MooTools.More
+
+# Some modules declare themselves dependent on Class.Refactor
+provides: [Class.refactor, Class.Refactor]
+
+...
+*/
+
+Class.refactor = function(original, refactors){
+
+	Object.each(refactors, function(item, name){
+		var origin = original.prototype[name];
+		origin = (origin && origin.$origin) || origin || function(){};
+		original.implement(name, (typeof item == 'function') ? function(){
+			var old = this.previous;
+			this.previous = origin;
+			var value = item.apply(this, arguments);
+			this.previous = old;
+			return value;
+		} : item);
+	});
+
+	return original;
+
+};
+
+/*
+---
+
+name: Events.Pseudos
+
+description: Adds the functionality to add pseudo events
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Core/Class.Extras, Core/Slick.Parser, MooTools.More]
+
+provides: [Events.Pseudos]
+
+...
+*/
+
+(function(){
+
+Events.Pseudos = function(pseudos, addEvent, removeEvent){
+
+	var storeKey = '_monitorEvents:';
+
+	var storageOf = function(object){
+		return {
+			store: object.store ? function(key, value){
+				object.store(storeKey + key, value);
+			} : function(key, value){
+				(object._monitorEvents || (object._monitorEvents = {}))[key] = value;
+			},
+			retrieve: object.retrieve ? function(key, dflt){
+				return object.retrieve(storeKey + key, dflt);
+			} : function(key, dflt){
+				if (!object._monitorEvents) return dflt;
+				return object._monitorEvents[key] || dflt;
+			}
+		};
+	};
+
+	var splitType = function(type){
+		if (type.indexOf(':') == -1 || !pseudos) return null;
+
+		var parsed = Slick.parse(type).expressions[0][0],
+			parsedPseudos = parsed.pseudos,
+			l = parsedPseudos.length,
+			splits = [];
+
+		while (l--){
+			var pseudo = parsedPseudos[l].key,
+				listener = pseudos[pseudo];
+			if (listener != null) splits.push({
+				event: parsed.tag,
+				value: parsedPseudos[l].value,
+				pseudo: pseudo,
+				original: type,
+				listener: listener
+			});
 		}
-		return result;
-	},
+		return splits.length ? splits : null;
+	};
 
-	unique: function(){
-		return [].combine(this);
-	},
+	return {
 
-	shuffle: function(){
-		for (var i = this.length; i && --i;){
-			var temp = this[i], r = Math.floor(Math.random() * ( i + 1 ));
-			this[i] = this[r];
-			this[r] = temp;
+		addEvent: function(type, fn, internal){
+			var split = splitType(type);
+			if (!split) return addEvent.call(this, type, fn, internal);
+
+			var storage = storageOf(this),
+				events = storage.retrieve(type, []),
+				eventType = split[0].event,
+				args = Array.slice(arguments, 2),
+				stack = fn,
+				self = this;
+
+			split.each(function(item){
+				var listener = item.listener,
+					stackFn = stack;
+				if (listener == false) eventType += ':' + item.pseudo + '(' + item.value + ')';
+				else stack = function(){
+					listener.call(self, item, stackFn, arguments, stack);
+				};
+			});
+
+			events.include({type: eventType, event: fn, monitor: stack});
+			storage.store(type, events);
+
+			if (type != eventType) addEvent.apply(this, [type, fn].concat(args));
+			return addEvent.apply(this, [eventType, stack].concat(args));
+		},
+
+		removeEvent: function(type, fn){
+			var split = splitType(type);
+			if (!split) return removeEvent.call(this, type, fn);
+
+			var storage = storageOf(this),
+				events = storage.retrieve(type);
+			if (!events) return this;
+
+			var args = Array.slice(arguments, 2);
+
+			removeEvent.apply(this, [type, fn].concat(args));
+			events.each(function(monitor, i){
+				if (!fn || monitor.event == fn) removeEvent.apply(this, [monitor.type, monitor.monitor].concat(args));
+				delete events[i];
+			}, this);
+
+			storage.store(type, events);
+			return this;
 		}
+
+	};
+
+};
+
+var pseudos = {
+
+	once: function(split, fn, args, monitor){
+		fn.apply(this, args);
+		this.removeEvent(split.event, monitor)
+			.removeEvent(split.original, fn);
+	},
+
+	throttle: function(split, fn, args){
+		if (!fn._throttled){
+			fn.apply(this, args);
+			fn._throttled = setTimeout(function(){
+				fn._throttled = false;
+			}, split.value || 250);
+		}
+	},
+
+	pause: function(split, fn, args){
+		clearTimeout(fn._pause);
+		fn._pause = fn.delay(split.value || 250, this, args);
+	}
+
+};
+
+Events.definePseudo = function(key, listener){
+	pseudos[key] = listener;
+	return this;
+};
+
+Events.lookupPseudo = function(key){
+	return pseudos[key];
+};
+
+var proto = Events.prototype;
+Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
+
+['Request', 'Fx'].each(function(klass){
+	if (this[klass]) this[klass].implement(Events.prototype);
+});
+
+})();
+
+/*
+---
+
+script: Drag.js
+
+name: Drag
+
+description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Tom Occhinno
+  - Jan Kassens
+
+requires:
+  - Core/Events
+  - Core/Options
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Drag]
+...
+
+*/
+
+var Drag = new Class({
+
+	Implements: [Events, Options],
+
+	options: {/*
+		onBeforeStart: function(thisElement){},
+		onStart: function(thisElement, event){},
+		onSnap: function(thisElement){},
+		onDrag: function(thisElement, event){},
+		onCancel: function(thisElement){},
+		onComplete: function(thisElement, event){},*/
+		snap: 6,
+		unit: 'px',
+		grid: false,
+		style: true,
+		limit: false,
+		handle: false,
+		invert: false,
+		preventDefault: false,
+		stopPropagation: false,
+		compensateScroll: false,
+		modifiers: {x: 'left', y: 'top'}
+	},
+
+	initialize: function(){
+		var params = Array.link(arguments, {
+			'options': Type.isObject,
+			'element': function(obj){
+				return obj != null;
+			}
+		});
+
+		this.element = document.id(params.element);
+		this.document = this.element.getDocument();
+		this.setOptions(params.options || {});
+		var htype = typeOf(this.options.handle);
+		this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
+		this.mouse = {'now': {}, 'pos': {}};
+		this.value = {'start': {}, 'now': {}};
+		this.offsetParent = (function(el){
+			var offsetParent = el.getOffsetParent();
+			var isBody = !offsetParent || (/^(?:body|html)$/i).test(offsetParent.tagName);
+			return isBody ? window : document.id(offsetParent);
+		})(this.element);
+		this.selection = 'selectstart' in document ? 'selectstart' : 'mousedown';
+
+		this.compensateScroll = {start: {}, diff: {}, last: {}};
+
+		if ('ondragstart' in document && !('FileReader' in window) && !Drag.ondragstartFixed){
+			document.ondragstart = Function.from(false);
+			Drag.ondragstartFixed = true;
+		}
+
+		this.bound = {
+			start: this.start.bind(this),
+			check: this.check.bind(this),
+			drag: this.drag.bind(this),
+			stop: this.stop.bind(this),
+			cancel: this.cancel.bind(this),
+			eventStop: Function.from(false),
+			scrollListener: this.scrollListener.bind(this)
+		};
+		this.attach();
+	},
+
+	attach: function(){
+		this.handles.addEvent('mousedown', this.bound.start);
+		if (this.options.compensateScroll) this.offsetParent.addEvent('scroll', this.bound.scrollListener);
 		return this;
 	},
 
-	reduce: function(fn, value){
-		for (var i = 0, l = this.length; i < l; i++){
-			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
-		}
-		return value;
+	detach: function(){
+		this.handles.removeEvent('mousedown', this.bound.start);
+		if (this.options.compensateScroll) this.offsetParent.removeEvent('scroll', this.bound.scrollListener);
+		return this;
 	},
 
-	reduceRight: function(fn, value){
-		var i = this.length;
-		while (i--){
-			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
+	scrollListener: function(){
+
+		if (!this.mouse.start) return;
+		var newScrollValue = this.offsetParent.getScroll();
+
+		if (this.element.getStyle('position') == 'absolute'){
+			var scrollDiff = this.sumValues(newScrollValue, this.compensateScroll.last, -1);
+			this.mouse.now = this.sumValues(this.mouse.now, scrollDiff, 1);
+		} else {
+			this.compensateScroll.diff = this.sumValues(newScrollValue, this.compensateScroll.start, -1);
 		}
-		return value;
+		if (this.offsetParent != window) this.compensateScroll.diff = this.sumValues(this.compensateScroll.start, newScrollValue, -1);
+		this.compensateScroll.last = newScrollValue;
+		this.render(this.options);
+	},
+
+	sumValues: function(alpha, beta, op){
+		var sum = {}, options = this.options;
+		for (z in options.modifiers){
+			if (!options.modifiers[z]) continue;
+			sum[z] = alpha[z] + beta[z] * op;
+		}
+		return sum;
+	},
+
+	start: function(event){
+		var options = this.options;
+
+		if (event.rightClick) return;
+
+		if (options.preventDefault) event.preventDefault();
+		if (options.stopPropagation) event.stopPropagation();
+		this.compensateScroll.start = this.compensateScroll.last = this.offsetParent.getScroll();
+		this.compensateScroll.diff = {x: 0, y: 0};
+		this.mouse.start = event.page;
+		this.fireEvent('beforeStart', this.element);
+
+		var limit = options.limit;
+		this.limit = {x: [], y: []};
+
+		var z, coordinates, offsetParent = this.offsetParent == window ? null : this.offsetParent;
+		for (z in options.modifiers){
+			if (!options.modifiers[z]) continue;
+
+			var style = this.element.getStyle(options.modifiers[z]);
+
+			// Some browsers (IE and Opera) don't always return pixels.
+			if (style && !style.match(/px$/)){
+				if (!coordinates) coordinates = this.element.getCoordinates(offsetParent);
+				style = coordinates[options.modifiers[z]];
+			}
+
+			if (options.style) this.value.now[z] = (style || 0).toInt();
+			else this.value.now[z] = this.element[options.modifiers[z]];
+
+			if (options.invert) this.value.now[z] *= -1;
+
+			this.mouse.pos[z] = event.page[z] - this.value.now[z];
+
+			if (limit && limit[z]){
+				var i = 2;
+				while (i--){
+					var limitZI = limit[z][i];
+					if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
+				}
+			}
+		}
+
+		if (typeOf(this.options.grid) == 'number') this.options.grid = {
+			x: this.options.grid,
+			y: this.options.grid
+		};
+
+		var events = {
+			mousemove: this.bound.check,
+			mouseup: this.bound.cancel
+		};
+		events[this.selection] = this.bound.eventStop;
+		this.document.addEvents(events);
+	},
+
+	check: function(event){
+		if (this.options.preventDefault) event.preventDefault();
+		var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+		if (distance > this.options.snap){
+			this.cancel();
+			this.document.addEvents({
+				mousemove: this.bound.drag,
+				mouseup: this.bound.stop
+			});
+			this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
+		}
+	},
+
+	drag: function(event){
+		var options = this.options;
+		if (options.preventDefault) event.preventDefault();
+		this.mouse.now = this.sumValues(event.page, this.compensateScroll.diff, -1);
+
+		this.render(options);
+		this.fireEvent('drag', [this.element, event]);
+	},  
+
+	render: function(options){
+		for (var z in options.modifiers){
+			if (!options.modifiers[z]) continue;
+			this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+
+			if (options.invert) this.value.now[z] *= -1;
+			if (options.limit && this.limit[z]){
+				if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
+					this.value.now[z] = this.limit[z][1];
+				} else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
+					this.value.now[z] = this.limit[z][0];
+				}
+			}
+			if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
+			if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
+			else this.element[options.modifiers[z]] = this.value.now[z];
+		}
+	},
+
+	cancel: function(event){
+		this.document.removeEvents({
+			mousemove: this.bound.check,
+			mouseup: this.bound.cancel
+		});
+		if (event){
+			this.document.removeEvent(this.selection, this.bound.eventStop);
+			this.fireEvent('cancel', this.element);
+		}
+	},
+
+	stop: function(event){
+		var events = {
+			mousemove: this.bound.drag,
+			mouseup: this.bound.stop
+		};
+		events[this.selection] = this.bound.eventStop;
+		this.document.removeEvents(events);
+		this.mouse.start = null;
+		if (event) this.fireEvent('complete', [this.element, event]);
+	}
+
+});
+
+Element.implement({
+
+	makeResizable: function(options){
+		var drag = new Drag(this, Object.merge({
+			modifiers: {
+				x: 'width',
+				y: 'height'
+			}
+		}, options));
+
+		this.store('resizer', drag);
+		return drag.addEvent('drag', function(){
+			this.fireEvent('resize', drag);
+		}.bind(this));
+	}
+
+});
+
+/*
+---
+
+script: Drag.Move.js
+
+name: Drag.Move
+
+description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Tom Occhinno
+  - Jan Kassens
+  - Aaron Newton
+  - Scott Kyle
+
+requires:
+  - Core/Element.Dimensions
+  - Drag
+
+provides: [Drag.Move]
+
+...
+*/
+
+Drag.Move = new Class({
+
+	Extends: Drag,
+
+	options: {/*
+		onEnter: function(thisElement, overed){},
+		onLeave: function(thisElement, overed){},
+		onDrop: function(thisElement, overed, event){},*/
+		droppables: [],
+		container: false,
+		precalculate: false,
+		includeMargins: true,
+		checkDroppables: true
+	},
+
+	initialize: function(element, options){
+		this.parent(element, options);
+		element = this.element;
+
+		this.droppables = $$(this.options.droppables);
+		this.setContainer(this.options.container);
+
+		if (this.options.style){
+			if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
+				var parent = element.getOffsetParent(),
+					styles = element.getStyles('left', 'top');
+				if (parent && (styles.left == 'auto' || styles.top == 'auto')){
+					element.setPosition(element.getPosition(parent));
+				}
+			}
+
+			if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
+		}
+
+		this.addEvent('start', this.checkDroppables, true);
+		this.overed = null;
+	},
+	
+	setContainer: function(container) {
+		this.container = document.id(container);
+		if (this.container && typeOf(this.container) != 'element'){
+			this.container = document.id(this.container.getDocument().body);
+		}
+	},
+
+	start: function(event){
+		if (this.container) this.options.limit = this.calculateLimit();
+
+		if (this.options.precalculate){
+			this.positions = this.droppables.map(function(el){
+				return el.getCoordinates();
+			});
+		}
+
+		this.parent(event);
+	},
+
+	calculateLimit: function(){
+		var element = this.element,
+			container = this.container,
+
+			offsetParent = document.id(element.getOffsetParent()) || document.body,
+			containerCoordinates = container.getCoordinates(offsetParent),
+			elementMargin = {},
+			elementBorder = {},
+			containerMargin = {},
+			containerBorder = {},
+			offsetParentPadding = {},
+			offsetScroll = offsetParent.getScroll();
+
+		['top', 'right', 'bottom', 'left'].each(function(pad){
+			elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
+			elementBorder[pad] = element.getStyle('border-' + pad).toInt();
+			containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
+			containerBorder[pad] = container.getStyle('border-' + pad).toInt();
+			offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
+		}, this);
+
+		var width = element.offsetWidth + elementMargin.left + elementMargin.right,
+			height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
+			left = 0 + offsetScroll.x,
+			top = 0 + offsetScroll.y,
+			right = containerCoordinates.right - containerBorder.right - width + offsetScroll.x,
+			bottom = containerCoordinates.bottom - containerBorder.bottom - height + offsetScroll.y;
+
+		if (this.options.includeMargins){
+			left += elementMargin.left;
+			top += elementMargin.top;
+		} else {
+			right += elementMargin.right;
+			bottom += elementMargin.bottom;
+		}
+
+		if (element.getStyle('position') == 'relative'){
+			var coords = element.getCoordinates(offsetParent);
+			coords.left -= element.getStyle('left').toInt();
+			coords.top -= element.getStyle('top').toInt();
+
+			left -= coords.left;
+			top -= coords.top;
+			if (container.getStyle('position') != 'relative'){
+				left += containerBorder.left;
+				top += containerBorder.top;
+			}
+			right += elementMargin.left - coords.left;
+			bottom += elementMargin.top - coords.top;
+
+			if (container != offsetParent){
+				left += containerMargin.left + offsetParentPadding.left;
+				if (!offsetParentPadding.left && left < 0) left = 0;
+				top += offsetParent == document.body ? 0 : containerMargin.top + offsetParentPadding.top;
+				if (!offsetParentPadding.top && top < 0) top = 0;
+			}
+		} else {
+			left -= elementMargin.left;
+			top -= elementMargin.top;
+			if (container != offsetParent){
+				left += containerCoordinates.left + containerBorder.left;
+				top += containerCoordinates.top + containerBorder.top;
+			}
+		}
+
+		return {
+			x: [left, right],
+			y: [top, bottom]
+		};
+	},
+
+	getDroppableCoordinates: function(element){
+		var position = element.getCoordinates();
+		if (element.getStyle('position') == 'fixed'){
+			var scroll = window.getScroll();
+			position.left += scroll.x;
+			position.right += scroll.x;
+			position.top += scroll.y;
+			position.bottom += scroll.y;
+		}
+		return position;
+	},
+
+	checkDroppables: function(){
+		var overed = this.droppables.filter(function(el, i){
+			el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
+			var now = this.mouse.now;
+			return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
+		}, this).getLast();
+
+		if (this.overed != overed){
+			if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
+			if (overed) this.fireEvent('enter', [this.element, overed]);
+			this.overed = overed;
+		}
+	},
+
+	drag: function(event){
+		this.parent(event);
+		if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
+	},
+
+	stop: function(event){
+		this.checkDroppables();
+		this.fireEvent('drop', [this.element, this.overed, event]);
+		this.overed = null;
+		return this.parent(event);
+	}
+
+});
+
+Element.implement({
+
+	makeDraggable: function(options){
+		var drag = new Drag.Move(this, options);
+		this.store('dragger', drag);
+		return drag;
+	}
+
+});
+
+/*
+---
+
+script: Element.Measure.js
+
+name: Element.Measure
+
+description: Extends the Element native object to include methods useful in measuring dimensions.
+
+credits: "Element.measure / .expose methods by Daniel Steigerwald License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Element.Measure]
+
+...
+*/
+
+(function(){
+
+var getStylesList = function(styles, planes){
+	var list = [];
+	Object.each(planes, function(directions){
+		Object.each(directions, function(edge){
+			styles.each(function(style){
+				list.push(style + '-' + edge + (style == 'border' ? '-width' : ''));
+			});
+		});
+	});
+	return list;
+};
+
+var calculateEdgeSize = function(edge, styles){
+	var total = 0;
+	Object.each(styles, function(value, style){
+		if (style.test(edge)) total = total + value.toInt();
+	});
+	return total;
+};
+
+var isVisible = function(el){
+	return !!(!el || el.offsetHeight || el.offsetWidth);
+};
+
+
+Element.implement({
+
+	measure: function(fn){
+		if (isVisible(this)) return fn.call(this);
+		var parent = this.getParent(),
+			toMeasure = [];
+		while (!isVisible(parent) && parent != document.body){
+			toMeasure.push(parent.expose());
+			parent = parent.getParent();
+		}
+		var restore = this.expose(),
+			result = fn.call(this);
+		restore();
+		toMeasure.each(function(restore){
+			restore();
+		});
+		return result;
+	},
+
+	expose: function(){
+		if (this.getStyle('display') != 'none') return function(){};
+		var before = this.style.cssText;
+		this.setStyles({
+			display: 'block',
+			position: 'absolute',
+			visibility: 'hidden'
+		});
+		return function(){
+			this.style.cssText = before;
+		}.bind(this);
+	},
+
+	getDimensions: function(options){
+		options = Object.merge({computeSize: false}, options);
+		var dim = {x: 0, y: 0};
+
+		var getSize = function(el, options){
+			return (options.computeSize) ? el.getComputedSize(options) : el.getSize();
+		};
+
+		var parent = this.getParent('body');
+
+		if (parent && this.getStyle('display') == 'none'){
+			dim = this.measure(function(){
+				return getSize(this, options);
+			});
+		} else if (parent){
+			try { //safari sometimes crashes here, so catch it
+				dim = getSize(this, options);
+			}catch(e){}
+		}
+
+		return Object.append(dim, (dim.x || dim.x === 0) ? {
+				width: dim.x,
+				height: dim.y
+			} : {
+				x: dim.width,
+				y: dim.height
+			}
+		);
+	},
+
+	getComputedSize: function(options){
+		
+
+		options = Object.merge({
+			styles: ['padding','border'],
+			planes: {
+				height: ['top','bottom'],
+				width: ['left','right']
+			},
+			mode: 'both'
+		}, options);
+
+		var styles = {},
+			size = {width: 0, height: 0},
+			dimensions;
+
+		if (options.mode == 'vertical'){
+			delete size.width;
+			delete options.planes.width;
+		} else if (options.mode == 'horizontal'){
+			delete size.height;
+			delete options.planes.height;
+		}
+
+		getStylesList(options.styles, options.planes).each(function(style){
+			styles[style] = this.getStyle(style).toInt();
+		}, this);
+
+		Object.each(options.planes, function(edges, plane){
+
+			var capitalized = plane.capitalize(),
+				style = this.getStyle(plane);
+
+			if (style == 'auto' && !dimensions) dimensions = this.getDimensions();
+
+			style = styles[plane] = (style == 'auto') ? dimensions[plane] : style.toInt();
+			size['total' + capitalized] = style;
+
+			edges.each(function(edge){
+				var edgesize = calculateEdgeSize(edge, styles);
+				size['computed' + edge.capitalize()] = edgesize;
+				size['total' + capitalized] += edgesize;
+			});
+
+		}, this);
+
+		return Object.append(size, styles);
 	}
 
 });
 
 })();
 
+/*
+---
+
+script: Slider.js
+
+name: Slider
+
+description: Class for creating horizontal and vertical slider controls.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Element.Dimensions
+  - Core/Number
+  - Class.Binds
+  - Drag
+  - Element.Measure
+
+provides: [Slider]
+
+...
+*/
+
+var Slider = new Class({
+
+	Implements: [Events, Options],
+
+	Binds: ['clickedElement', 'draggedKnob', 'scrolledElement'],
+
+	options: {/*
+		onTick: function(intPosition){},
+		onMove: function(){},
+		onChange: function(intStep){},
+		onComplete: function(strStep){},*/
+		onTick: function(position){
+			this.setKnobPosition(position);
+		},
+		initialStep: 0,
+		snap: false,
+		offset: 0,
+		range: false,
+		wheel: false,
+		steps: 100,
+		mode: 'horizontal'
+	},
+
+	initialize: function(element, knob, options){
+		this.setOptions(options);
+		options = this.options;
+		this.element = document.id(element);
+		knob = this.knob = document.id(knob);
+		this.previousChange = this.previousEnd = this.step = options.initialStep ? options.initialStep : options.range ? options.range[0] : 0;
+
+		var limit = {},
+			modifiers = {x: false, y: false};
+
+		switch (options.mode){
+			case 'vertical':
+				this.axis = 'y';
+				this.property = 'top';
+				this.offset = 'offsetHeight';
+				break;
+			case 'horizontal':
+				this.axis = 'x';
+				this.property = 'left';
+				this.offset = 'offsetWidth';
+		}
+
+		this.setSliderDimensions();
+		this.setRange(options.range, null, true);
+
+		if (knob.getStyle('position') == 'static') knob.setStyle('position', 'relative');
+		knob.setStyle(this.property, -options.offset);
+		modifiers[this.axis] = this.property;
+		limit[this.axis] = [-options.offset, this.full - options.offset];
+
+		var dragOptions = {
+			snap: 0,
+			limit: limit,
+			modifiers: modifiers,
+			onDrag: this.draggedKnob,
+			onStart: this.draggedKnob,
+			onBeforeStart: (function(){
+				this.isDragging = true;
+			}).bind(this),
+			onCancel: function(){
+				this.isDragging = false;
+			}.bind(this),
+			onComplete: function(){
+				this.isDragging = false;
+				this.draggedKnob();
+				this.end();
+			}.bind(this)
+		};
+		if (options.snap) this.setSnap(dragOptions);
+
+		this.drag = new Drag(knob, dragOptions);
+		if (options.initialStep != null) this.set(options.initialStep, true);
+		this.attach();
+	},
+
+	attach: function(){
+		this.element.addEvent('mousedown', this.clickedElement);
+		if (this.options.wheel) this.element.addEvent('mousewheel', this.scrolledElement);
+		this.drag.attach();
+		return this;
+	},
+
+	detach: function(){
+		this.element.removeEvent('mousedown', this.clickedElement)
+			.removeEvent('mousewheel', this.scrolledElement);
+		this.drag.detach();
+		return this;
+	},
+
+	autosize: function(){
+		this.setSliderDimensions()
+			.setKnobPosition(this.toPosition(this.step));
+		this.drag.options.limit[this.axis] = [-this.options.offset, this.full - this.options.offset];
+		if (this.options.snap) this.setSnap();
+		return this;
+	},
+
+	setSnap: function(options){
+		if (!options) options = this.drag.options;
+		options.grid = Math.ceil(this.stepWidth);
+		options.limit[this.axis][1] = this.element[this.offset];
+		return this;
+	},
+
+	setKnobPosition: function(position){
+		if (this.options.snap) position = this.toPosition(this.step);
+		this.knob.setStyle(this.property, position);
+		return this;
+	},
+
+	setSliderDimensions: function(){
+		this.full = this.element.measure(function(){
+			this.half = this.knob[this.offset] / 2;
+			return this.element[this.offset] - this.knob[this.offset] + (this.options.offset * 2);
+		}.bind(this));
+		return this;
+	},
+
+	set: function(step, silently){
+		if (!((this.range > 0) ^ (step < this.min))) step = this.min;
+		if (!((this.range > 0) ^ (step > this.max))) step = this.max;
+
+		this.step = (step).round(this.modulus.decimalLength);
+		if (silently) this.checkStep().setKnobPosition(this.toPosition(this.step));
+		else this.checkStep().fireEvent('tick', this.toPosition(this.step)).fireEvent('move').end();
+		return this;
+	},
+
+	setRange: function(range, pos, silently){
+		this.min = Array.pick([range[0], 0]);
+		this.max = Array.pick([range[1], this.options.steps]);
+		this.range = this.max - this.min;
+		this.steps = this.options.steps || this.full;
+		var stepSize = this.stepSize = Math.abs(this.range) / this.steps;
+		this.stepWidth = this.stepSize * this.full / Math.abs(this.range);
+		this.setModulus();
+
+		if (range) this.set(Array.pick([pos, this.step]).limit(this.min,this.max), silently);
+		return this;
+	},
+    
+	setModulus: function(){
+		var decimals = ((this.stepSize + '').split('.')[1] || []).length,
+			modulus = 1 + '';
+		while (decimals--) modulus += '0';
+		this.modulus = {multiplier: (modulus).toInt(10), decimalLength: modulus.length - 1};
+	},
+
+	clickedElement: function(event){
+		if (this.isDragging || event.target == this.knob) return;
+
+		var dir = this.range < 0 ? -1 : 1,
+			position = event.page[this.axis] - this.element.getPosition()[this.axis] - this.half;
+
+		position = position.limit(-this.options.offset, this.full - this.options.offset);
+
+		this.step = (this.min + dir * this.toStep(position)).round(this.modulus.decimalLength);
+
+		this.checkStep()
+			.fireEvent('tick', position)
+			.fireEvent('move')
+			.end();
+	},
+
+	scrolledElement: function(event){
+		var mode = (this.options.mode == 'horizontal') ? (event.wheel < 0) : (event.wheel > 0);
+		this.set(this.step + (mode ? -1 : 1) * this.stepSize);
+		event.stop();
+	},
+
+	draggedKnob: function(){
+		var dir = this.range < 0 ? -1 : 1,
+			position = this.drag.value.now[this.axis];
+
+		position = position.limit(-this.options.offset, this.full -this.options.offset);
+
+		this.step = (this.min + dir * this.toStep(position)).round(this.modulus.decimalLength);
+		this.checkStep();
+		this.fireEvent('move');
+	},
+
+	checkStep: function(){
+		var step = this.step;
+		if (this.previousChange != step){
+			this.previousChange = step;
+			this.fireEvent('change', step);
+		}
+		return this;
+	},
+
+	end: function(){
+		var step = this.step;
+		if (this.previousEnd !== step){
+			this.previousEnd = step;
+			this.fireEvent('complete', step + '');
+		}
+		return this;
+	},
+
+	toStep: function(position){
+		var step = (position + this.options.offset) * this.stepSize / this.full * this.steps;
+		return this.options.steps ? (step - (step * this.modulus.multiplier) % (this.stepSize * this.modulus.multiplier) / this.modulus.multiplier).round(this.modulus.decimalLength) : step;
+	},
+
+	toPosition: function(step){
+		return (this.full * Math.abs(this.min - step)) / (this.steps * this.stepSize) - this.options.offset || 0;
+	}
+
+});
+
+/*
+---
+
+script: Sortables.js
+
+name: Sortables
+
+description: Class for creating a drag and drop sorting interface for lists of items.
+
+license: MIT-style license
+
+authors:
+  - Tom Occhino
+
+requires:
+  - Core/Fx.Morph
+  - Drag.Move
+
+provides: [Sortables]
+
+...
+*/
+
+var Sortables = new Class({
+
+	Implements: [Events, Options],
+
+	options: {/*
+		onSort: function(element, clone){},
+		onStart: function(element, clone){},
+		onComplete: function(element){},*/
+		opacity: 1,
+		clone: false,
+		revert: false,
+		handle: false,
+		dragOptions: {},
+		unDraggableTags: ['button', 'input', 'a', 'textarea', 'select', 'option']
+	},
+
+	initialize: function(lists, options){
+		this.setOptions(options);
+
+		this.elements = [];
+		this.lists = [];
+		this.idle = true;
+
+		this.addLists($$(document.id(lists) || lists));
+
+		if (!this.options.clone) this.options.revert = false;
+		if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
+			duration: 250,
+			link: 'cancel'
+		}, this.options.revert));
+	},
+
+	attach: function(){
+		this.addLists(this.lists);
+		return this;
+	},
+
+	detach: function(){
+		this.lists = this.removeLists(this.lists);
+		return this;
+	},
+
+	addItems: function(){
+		Array.flatten(arguments).each(function(element){
+			this.elements.push(element);
+			var start = element.retrieve('sortables:start', function(event){
+				this.start.call(this, event, element);
+			}.bind(this));
+			(this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
+		}, this);
+		return this;
+	},
+
+	addLists: function(){
+		Array.flatten(arguments).each(function(list){
+			this.lists.include(list);
+			this.addItems(list.getChildren());
+		}, this);
+		return this;
+	},
+
+	removeItems: function(){
+		return $$(Array.flatten(arguments).map(function(element){
+			this.elements.erase(element);
+			var start = element.retrieve('sortables:start');
+			(this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
+
+			return element;
+		}, this));
+	},
+
+	removeLists: function(){
+		return $$(Array.flatten(arguments).map(function(list){
+			this.lists.erase(list);
+			this.removeItems(list.getChildren());
+
+			return list;
+		}, this));
+	},
+    
+	getDroppableCoordinates: function (element){
+		var offsetParent = element.getOffsetParent();
+		var position = element.getPosition(offsetParent);
+		var scroll = {
+			w: window.getScroll(),
+			offsetParent: offsetParent.getScroll()
+		};
+		position.x += scroll.offsetParent.x;
+		position.y += scroll.offsetParent.y;
+
+		if (offsetParent.getStyle('position') == 'fixed'){
+			position.x -= scroll.w.x;
+			position.y -= scroll.w.y;
+		}
+
+        return position;
+	},
+
+	getClone: function(event, element){
+		if (!this.options.clone) return new Element(element.tagName).inject(document.body);
+		if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
+		var clone = element.clone(true).setStyles({
+			margin: 0,
+			position: 'absolute',
+			visibility: 'hidden',
+			width: element.getStyle('width')
+		}).addEvent('mousedown', function(event){
+			element.fireEvent('mousedown', event);
+		});
+		//prevent the duplicated radio inputs from unchecking the real one
+		if (clone.get('html').test('radio')){
+			clone.getElements('input[type=radio]').each(function(input, i){
+				input.set('name', 'clone_' + i);
+				if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
+			});
+		}
+
+		return clone.inject(this.list).setPosition(this.getDroppableCoordinates(this.element));
+	},
+
+	getDroppables: function(){
+		var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
+		if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
+		return droppables;
+	},
+
+	insert: function(dragging, element){
+		var where = 'inside';
+		if (this.lists.contains(element)){
+			this.list = element;
+			this.drag.droppables = this.getDroppables();
+		} else {
+			where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
+		}
+		this.element.inject(element, where);
+		this.fireEvent('sort', [this.element, this.clone]);
+	},
+
+	start: function(event, element){
+		if (
+			!this.idle ||
+			event.rightClick ||
+			(!this.options.handle && this.options.unDraggableTags.contains(event.target.get('tag')))
+		) return;
+
+		this.idle = false;
+		this.element = element;
+		this.opacity = element.getStyle('opacity');
+		this.list = element.getParent();
+		this.clone = this.getClone(event, element);
+
+		this.drag = new Drag.Move(this.clone, Object.merge({
+			
+			droppables: this.getDroppables()
+		}, this.options.dragOptions)).addEvents({
+			onSnap: function(){
+				event.stop();
+				this.clone.setStyle('visibility', 'visible');
+				this.element.setStyle('opacity', this.options.opacity || 0);
+				this.fireEvent('start', [this.element, this.clone]);
+			}.bind(this),
+			onEnter: this.insert.bind(this),
+			onCancel: this.end.bind(this),
+			onComplete: this.end.bind(this)
+		});
+
+		this.clone.inject(this.element, 'before');
+		this.drag.start(event);
+	},
+
+	end: function(){
+		this.drag.detach();
+		this.element.setStyle('opacity', this.opacity);
+		var self = this;
+		if (this.effect){
+			var dim = this.element.getStyles('width', 'height'),
+				clone = this.clone,
+				pos = clone.computePosition(this.getDroppableCoordinates(clone));
+
+			var destroy = function(){
+				this.removeEvent('cancel', destroy);
+				clone.destroy();
+				self.reset();
+			};
+
+			this.effect.element = clone;
+			this.effect.start({
+				top: pos.top,
+				left: pos.left,
+				width: dim.width,
+				height: dim.height,
+				opacity: 0.25
+			}).addEvent('cancel', destroy).chain(destroy);
+		} else {
+			this.clone.destroy();
+			self.reset();
+		}
+		
+	},
+
+	reset: function(){
+		this.idle = true;
+		this.fireEvent('complete', this.element);
+	},
+
+	serialize: function(){
+		var params = Array.link(arguments, {
+			modifier: Type.isFunction,
+			index: function(obj){
+				return obj != null;
+			}
+		});
+		var serial = this.lists.map(function(list){
+			return list.getChildren().map(params.modifier || function(element){
+				return element.get('id');
+			}, this);
+		}, this);
+
+		var index = params.index;
+		if (this.lists.length == 1) index = 0;
+		return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
+	}
+
+});
+
+/*
+---
+
+name: Element.Event.Pseudos
+
+description: Adds the functionality to add pseudo events for Elements
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Core/Element.Event, Core/Element.Delegation, Events.Pseudos]
+
+provides: [Element.Event.Pseudos, Element.Delegation.Pseudo]
+
+...
+*/
+
+(function(){
+
+var pseudos = {relay: false},
+	copyFromEvents = ['once', 'throttle', 'pause'],
+	count = copyFromEvents.length;
+
+while (count--) pseudos[copyFromEvents[count]] = Events.lookupPseudo(copyFromEvents[count]);
+
+DOMEvent.definePseudo = function(key, listener){
+	pseudos[key] = listener;
+	return this;
+};
+
+var proto = Element.prototype;
+[Element, Window, Document].invoke('implement', Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
+
+})();
+
+/*
+---
+
+name: Element.Event.Pseudos.Keys
+
+description: Adds functionality fire events if certain keycombinations are pressed
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires: [Element.Event.Pseudos]
+
+provides: [Element.Event.Pseudos.Keys]
+
+...
+*/
+
+(function(){
+
+var keysStoreKey = '$moo:keys-pressed',
+	keysKeyupStoreKey = '$moo:keys-keyup';
+
+
+DOMEvent.definePseudo('keys', function(split, fn, args){
+
+	var event = args[0],
+		keys = [],
+		pressed = this.retrieve(keysStoreKey, []),
+		value = split.value;
+
+	if (value != '+') keys.append(value.replace('++', function(){
+		keys.push('+'); // shift++ and shift+++a
+		return '';
+	}).split('+'));
+	else keys = ['+'];
+
+	pressed.include(event.key);
+
+	if (keys.every(function(key){
+		return pressed.contains(key);
+	})) fn.apply(this, args);
+
+	this.store(keysStoreKey, pressed);
+
+	if (!this.retrieve(keysKeyupStoreKey)){
+		var keyup = function(event){
+			(function(){
+				pressed = this.retrieve(keysStoreKey, []).erase(event.key);
+				this.store(keysStoreKey, pressed);
+			}).delay(0, this); // Fix for IE
+		};
+		this.store(keysKeyupStoreKey, keyup).addEvent('keyup', keyup);
+	}
+
+});
+
+DOMEvent.defineKeys({
+	'16': 'shift',
+	'17': 'control',
+	'18': 'alt',
+	'20': 'capslock',
+	'33': 'pageup',
+	'34': 'pagedown',
+	'35': 'end',
+	'36': 'home',
+	'144': 'numlock',
+	'145': 'scrolllock',
+	'186': ';',
+	'187': '=',
+	'188': ',',
+	'190': '.',
+	'191': '/',
+	'192': '`',
+	'219': '[',
+	'220': '\\',
+	'221': ']',
+	'222': "'",
+	'107': '+',
+	'109': '-', // subtract
+	'189': '-'  // dash
+})
+
+})();
+
+/*
+---
+
+script: String.Extras.js
+
+name: String.Extras
+
+description: Extends the String native object to include methods useful in managing various kinds of strings (query strings, urls, html, etc).
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Guillermo Rauch
+  - Christopher Pitt
+
+requires:
+  - Core/String
+  - Core/Array
+  - MooTools.More
+
+provides: [String.Extras]
+
+...
+*/
+
+(function(){
+
+var special = {
+	'a': /[àáâãäåăą]/g,
+	'A': /[ÀÁÂÃÄÅĂĄ]/g,
+	'c': /[ćčç]/g,
+	'C': /[ĆČÇ]/g,
+	'd': /[ďđ]/g,
+	'D': /[ĎÐ]/g,
+	'e': /[èéêëěę]/g,
+	'E': /[ÈÉÊËĚĘ]/g,
+	'g': /[ğ]/g,
+	'G': /[Ğ]/g,
+	'i': /[ìíîï]/g,
+	'I': /[ÌÍÎÏ]/g,
+	'l': /[ĺľł]/g,
+	'L': /[ĹĽŁ]/g,
+	'n': /[ñňń]/g,
+	'N': /[ÑŇŃ]/g,
+	'o': /[òóôõöøő]/g,
+	'O': /[ÒÓÔÕÖØ]/g,
+	'r': /[řŕ]/g,
+	'R': /[ŘŔ]/g,
+	's': /[ššş]/g,
+	'S': /[ŠŞŚ]/g,
+	't': /[ťţ]/g,
+	'T': /[ŤŢ]/g,
+	'u': /[ùúûůüµ]/g,
+	'U': /[ÙÚÛŮÜ]/g,
+	'y': /[ÿý]/g,
+	'Y': /[ŸÝ]/g,
+	'z': /[žźż]/g,
+	'Z': /[ŽŹŻ]/g,
+	'th': /[þ]/g,
+	'TH': /[Þ]/g,
+	'dh': /[ð]/g,
+	'DH': /[Ð]/g,
+	'ss': /[ß]/g,
+	'oe': /[œ]/g,
+	'OE': /[Œ]/g,
+	'ae': /[æ]/g,
+	'AE': /[Æ]/g
+},
+
+tidy = {
+	' ': /[\xa0\u2002\u2003\u2009]/g,
+	'*': /[\xb7]/g,
+	'\'': /[\u2018\u2019]/g,
+	'"': /[\u201c\u201d]/g,
+	'...': /[\u2026]/g,
+	'-': /[\u2013]/g,
+//	'--': /[\u2014]/g,
+	'&raquo;': /[\uFFFD]/g
+},
+
+conversions = {
+	ms: 1,
+	s: 1000,
+	m: 6e4,
+	h: 36e5
+},
+
+findUnits = /(\d*.?\d+)([msh]+)/;
+
+var walk = function(string, replacements){
+	var result = string, key;
+	for (key in replacements) result = result.replace(replacements[key], key);
+	return result;
+};
+
+var getRegexForTag = function(tag, contents){
+	tag = tag || '';
+	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "([^>]+)?>",
+		reg = new RegExp(regstr, "gi");
+	return reg;
+};
+
+String.implement({
+
+	standardize: function(){
+		return walk(this, special);
+	},
+
+	repeat: function(times){
+		return new Array(times + 1).join(this);
+	},
+
+	pad: function(length, str, direction){
+		if (this.length >= length) return this;
+
+		var pad = (str == null ? ' ' : '' + str)
+			.repeat(length - this.length)
+			.substr(0, length - this.length);
+
+		if (!direction || direction == 'right') return this + pad;
+		if (direction == 'left') return pad + this;
+
+		return pad.substr(0, (pad.length / 2).floor()) + this + pad.substr(0, (pad.length / 2).ceil());
+	},
+
+	getTags: function(tag, contents){
+		return this.match(getRegexForTag(tag, contents)) || [];
+	},
+
+	stripTags: function(tag, contents){
+		return this.replace(getRegexForTag(tag, contents), '');
+	},
+
+	tidy: function(){
+		return walk(this, tidy);
+	},
+
+	truncate: function(max, trail, atChar){
+		var string = this;
+		if (trail == null && arguments.length == 1) trail = '…';
+		if (string.length > max){
+			string = string.substring(0, max);
+			if (atChar){
+				var index = string.lastIndexOf(atChar);
+				if (index != -1) string = string.substr(0, index);
+			}
+			if (trail) string += trail;
+		}
+		return string;
+	},
+
+	ms: function(){
+	  // "Borrowed" from https://gist.github.com/1503944
+		var units = findUnits.exec(this);
+		if (units == null) return Number(this);
+		return Number(units[1]) * conversions[units[2]];
+	}
+
+});
+
+})();
+
+/*
+---
+
+script: Element.Forms.js
+
+name: Element.Forms
+
+description: Extends the Element native object to include methods useful in managing inputs.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element
+  - String.Extras
+  - MooTools.More
+
+provides: [Element.Forms]
+
+...
+*/
+
+Element.implement({
+
+	tidy: function(){
+		this.set('value', this.get('value').tidy());
+	},
+
+	getTextInRange: function(start, end){
+		return this.get('value').substring(start, end);
+	},
+
+	getSelectedText: function(){
+		if (this.setSelectionRange) return this.getTextInRange(this.getSelectionStart(), this.getSelectionEnd());
+		return document.selection.createRange().text;
+	},
+
+	getSelectedRange: function(){
+		if (this.selectionStart != null){
+			return {
+				start: this.selectionStart,
+				end: this.selectionEnd
+			};
+		}
+
+		var pos = {
+			start: 0,
+			end: 0
+		};
+		var range = this.getDocument().selection.createRange();
+		if (!range || range.parentElement() != this) return pos;
+		var duplicate = range.duplicate();
+
+		if (this.type == 'text'){
+			pos.start = 0 - duplicate.moveStart('character', -100000);
+			pos.end = pos.start + range.text.length;
+		} else {
+			var value = this.get('value');
+			var offset = value.length;
+			duplicate.moveToElementText(this);
+			duplicate.setEndPoint('StartToEnd', range);
+			if (duplicate.text.length) offset -= value.match(/[\n\r]*$/)[0].length;
+			pos.end = offset - duplicate.text.length;
+			duplicate.setEndPoint('StartToStart', range);
+			pos.start = offset - duplicate.text.length;
+		}
+		return pos;
+	},
+
+	getSelectionStart: function(){
+		return this.getSelectedRange().start;
+	},
+
+	getSelectionEnd: function(){
+		return this.getSelectedRange().end;
+	},
+
+	setCaretPosition: function(pos){
+		if (pos == 'end') pos = this.get('value').length;
+		this.selectRange(pos, pos);
+		return this;
+	},
+
+	getCaretPosition: function(){
+		return this.getSelectedRange().start;
+	},
+
+	selectRange: function(start, end){
+		if (this.setSelectionRange){
+			this.focus();
+			this.setSelectionRange(start, end);
+		} else {
+			var value = this.get('value');
+			var diff = value.substr(start, end - start).replace(/\r/g, '').length;
+			start = value.substr(0, start).replace(/\r/g, '').length;
+			var range = this.createTextRange();
+			range.collapse(true);
+			range.moveEnd('character', start + diff);
+			range.moveStart('character', start);
+			range.select();
+		}
+		return this;
+	},
+
+	insertAtCursor: function(value, select){
+		var pos = this.getSelectedRange();
+		var text = this.get('value');
+		this.set('value', text.substring(0, pos.start) + value + text.substring(pos.end, text.length));
+		if (select !== false) this.selectRange(pos.start, pos.start + value.length);
+		else this.setCaretPosition(pos.start + value.length);
+		return this;
+	},
+
+	insertAroundCursor: function(options, select){
+		options = Object.append({
+			before: '',
+			defaultMiddle: '',
+			after: ''
+		}, options);
+
+		var value = this.getSelectedText() || options.defaultMiddle;
+		var pos = this.getSelectedRange();
+		var text = this.get('value');
+
+		if (pos.start == pos.end){
+			this.set('value', text.substring(0, pos.start) + options.before + value + options.after + text.substring(pos.end, text.length));
+			this.selectRange(pos.start + options.before.length, pos.end + options.before.length + value.length);
+		} else {
+			var current = text.substring(pos.start, pos.end);
+			this.set('value', text.substring(0, pos.start) + options.before + current + options.after + text.substring(pos.end, text.length));
+			var selStart = pos.start + options.before.length;
+			if (select !== false) this.selectRange(selStart, selStart + current.length);
+			else this.setCaretPosition(selStart + text.length);
+		}
+		return this;
+	}
+
+});
+
+/*
+---
+
+script: Element.Pin.js
+
+name: Element.Pin
+
+description: Extends the Element native object to include the pin method useful for fixed positioning for elements.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - Core/Element.Style
+  - MooTools.More
+
+provides: [Element.Pin]
+
+...
+*/
+
+(function(){
+	var supportsPositionFixed = false,
+		supportTested = false;
+
+	var testPositionFixed = function(){
+		var test = new Element('div').setStyles({
+			position: 'fixed',
+			top: 0,
+			right: 0
+		}).inject(document.body);
+		supportsPositionFixed = (test.offsetTop === 0);
+		test.dispose();
+		supportTested = true;
+	};
+
+	Element.implement({
+
+		pin: function(enable, forceScroll){
+			if (!supportTested) testPositionFixed();
+			if (this.getStyle('display') == 'none') return this;
+
+			var pinnedPosition,
+				scroll = window.getScroll(),
+				parent,
+				scrollFixer;
+
+			if (enable !== false){
+				pinnedPosition = this.getPosition();
+				if (!this.retrieve('pin:_pinned')) {
+					var currentPosition = {
+						top: pinnedPosition.y - scroll.y,
+						left: pinnedPosition.x - scroll.x,
+						margin: '0px',
+						padding: '0px'
+					};
+
+					if (supportsPositionFixed && !forceScroll){
+						this.setStyle('position', 'fixed').setStyles(currentPosition);
+					} else {
+
+						parent = this.getOffsetParent();
+						var position = this.getPosition(parent),
+							styles = this.getStyles('left', 'top');
+
+						if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
+						if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
+
+						position = {
+							x: styles.left.toInt() - scroll.x,
+							y: styles.top.toInt() - scroll.y
+						};
+
+						scrollFixer = function(){
+							if (!this.retrieve('pin:_pinned')) return;
+							var scroll = window.getScroll();
+							this.setStyles({
+								left: position.x + scroll.x,
+								top: position.y + scroll.y
+							});
+						}.bind(this);
+
+						this.store('pin:_scrollFixer', scrollFixer);
+						window.addEvent('scroll', scrollFixer);
+					}
+					this.store('pin:_pinned', true);
+				}
+
+			} else {
+				if (!this.retrieve('pin:_pinned')) return this;
+
+				parent = this.getParent();
+				var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
+
+				pinnedPosition = this.getPosition();
+
+				this.store('pin:_pinned', false);
+				scrollFixer = this.retrieve('pin:_scrollFixer');
+				if (!scrollFixer){
+					this.setStyles({
+						position: 'absolute',
+						top: pinnedPosition.y + scroll.y,
+						left: pinnedPosition.x + scroll.x
+					});
+				} else {
+					this.store('pin:_scrollFixer', null);
+					window.removeEvent('scroll', scrollFixer);
+				}
+				this.removeClass('isPinned');
+			}
+			return this;
+		},
+
+		unpin: function(){
+			return this.pin(false);
+		},
+
+		togglePin: function(){
+			return this.pin(!this.retrieve('pin:_pinned'));
+		}
+
+	});
+
+
+
+})();
+
+/*
+---
+
+script: Element.Position.js
+
+name: Element.Position
+
+description: Extends the Element native object to include methods useful positioning elements relative to others.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Jacob Thornton
+
+requires:
+  - Core/Options
+  - Core/Element.Dimensions
+  - Element.Measure
+
+provides: [Element.Position]
+
+...
+*/
+
+(function(original){
+
+var local = Element.Position = {
+
+	options: {/*
+		edge: false,
+		returnPos: false,
+		minimum: {x: 0, y: 0},
+		maximum: {x: 0, y: 0},
+		relFixedPosition: false,
+		ignoreMargins: false,
+		ignoreScroll: false,
+		allowNegative: false,*/
+		relativeTo: document.body,
+		position: {
+			x: 'center', //left, center, right
+			y: 'center' //top, center, bottom
+		},
+		offset: {x: 0, y: 0}
+	},
+
+	getOptions: function(element, options){
+		options = Object.merge({}, local.options, options);
+		local.setPositionOption(options);
+		local.setEdgeOption(options);
+		local.setOffsetOption(element, options);
+		local.setDimensionsOption(element, options);
+		return options;
+	},
+
+	setPositionOption: function(options){
+		options.position = local.getCoordinateFromValue(options.position);
+	},
+
+	setEdgeOption: function(options){
+		var edgeOption = local.getCoordinateFromValue(options.edge);
+		options.edge = edgeOption ? edgeOption :
+			(options.position.x == 'center' && options.position.y == 'center') ? {x: 'center', y: 'center'} :
+			{x: 'left', y: 'top'};
+	},
+
+	setOffsetOption: function(element, options){
+		var parentOffset = {x: 0, y: 0};
+		var parentScroll = {x: 0, y: 0};
+		var offsetParent = element.measure(function(){
+			return document.id(this.getOffsetParent());
+		});
+
+		if (!offsetParent || offsetParent == element.getDocument().body) return;
+
+		parentScroll = offsetParent.getScroll();
+		parentOffset = offsetParent.measure(function(){
+			var position = this.getPosition();
+			if (this.getStyle('position') == 'fixed'){
+				var scroll = window.getScroll();
+				position.x += scroll.x;
+				position.y += scroll.y;
+			}
+			return position;
+		});
+
+		options.offset = {
+			parentPositioned: offsetParent != document.id(options.relativeTo),
+			x: options.offset.x - parentOffset.x + parentScroll.x,
+			y: options.offset.y - parentOffset.y + parentScroll.y
+		};
+	},
+
+	setDimensionsOption: function(element, options){
+		options.dimensions = element.getDimensions({
+			computeSize: true,
+			styles: ['padding', 'border', 'margin']
+		});
+	},
+
+	getPosition: function(element, options){
+		var position = {};
+		options = local.getOptions(element, options);
+		var relativeTo = document.id(options.relativeTo) || document.body;
+
+		local.setPositionCoordinates(options, position, relativeTo);
+		if (options.edge) local.toEdge(position, options);
+
+		var offset = options.offset;
+		position.left = ((position.x >= 0 || offset.parentPositioned || options.allowNegative) ? position.x : 0).toInt();
+		position.top = ((position.y >= 0 || offset.parentPositioned || options.allowNegative) ? position.y : 0).toInt();
+
+		local.toMinMax(position, options);
+
+		if (options.relFixedPosition || relativeTo.getStyle('position') == 'fixed') local.toRelFixedPosition(relativeTo, position);
+		if (options.ignoreScroll) local.toIgnoreScroll(relativeTo, position);
+		if (options.ignoreMargins) local.toIgnoreMargins(position, options);
+
+		position.left = Math.ceil(position.left);
+		position.top = Math.ceil(position.top);
+		delete position.x;
+		delete position.y;
+
+		return position;
+	},
+
+	setPositionCoordinates: function(options, position, relativeTo){
+		var offsetY = options.offset.y,
+			offsetX = options.offset.x,
+			calc = (relativeTo == document.body) ? window.getScroll() : relativeTo.getPosition(),
+			top = calc.y,
+			left = calc.x,
+			winSize = window.getSize();
+
+		switch(options.position.x){
+			case 'left': position.x = left + offsetX; break;
+			case 'right': position.x = left + offsetX + relativeTo.offsetWidth; break;
+			default: position.x = left + ((relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2) + offsetX; break;
+		}
+
+		switch(options.position.y){
+			case 'top': position.y = top + offsetY; break;
+			case 'bottom': position.y = top + offsetY + relativeTo.offsetHeight; break;
+			default: position.y = top + ((relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2) + offsetY; break;
+		}
+	},
+
+	toMinMax: function(position, options){
+		var xy = {left: 'x', top: 'y'}, value;
+		['minimum', 'maximum'].each(function(minmax){
+			['left', 'top'].each(function(lr){
+				value = options[minmax] ? options[minmax][xy[lr]] : null;
+				if (value != null && ((minmax == 'minimum') ? position[lr] < value : position[lr] > value)) position[lr] = value;
+			});
+		});
+	},
+
+	toRelFixedPosition: function(relativeTo, position){
+		var winScroll = window.getScroll();
+		position.top += winScroll.y;
+		position.left += winScroll.x;
+	},
+
+	toIgnoreScroll: function(relativeTo, position){
+		var relScroll = relativeTo.getScroll();
+		position.top -= relScroll.y;
+		position.left -= relScroll.x;
+	},
+
+	toIgnoreMargins: function(position, options){
+		position.left += options.edge.x == 'right'
+			? options.dimensions['margin-right']
+			: (options.edge.x != 'center'
+				? -options.dimensions['margin-left']
+				: -options.dimensions['margin-left'] + ((options.dimensions['margin-right'] + options.dimensions['margin-left']) / 2));
+
+		position.top += options.edge.y == 'bottom'
+			? options.dimensions['margin-bottom']
+			: (options.edge.y != 'center'
+				? -options.dimensions['margin-top']
+				: -options.dimensions['margin-top'] + ((options.dimensions['margin-bottom'] + options.dimensions['margin-top']) / 2));
+	},
+
+	toEdge: function(position, options){
+		var edgeOffset = {},
+			dimensions = options.dimensions,
+			edge = options.edge;
+
+		switch(edge.x){
+			case 'left': edgeOffset.x = 0; break;
+			case 'right': edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft; break;
+			// center
+			default: edgeOffset.x = -(Math.round(dimensions.totalWidth / 2)); break;
+		}
+
+		switch(edge.y){
+			case 'top': edgeOffset.y = 0; break;
+			case 'bottom': edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom; break;
+			// center
+			default: edgeOffset.y = -(Math.round(dimensions.totalHeight / 2)); break;
+		}
+
+		position.x += edgeOffset.x;
+		position.y += edgeOffset.y;
+	},
+
+	getCoordinateFromValue: function(option){
+		if (typeOf(option) != 'string') return option;
+		option = option.toLowerCase();
+
+		return {
+			x: option.test('left') ? 'left'
+				: (option.test('right') ? 'right' : 'center'),
+			y: option.test(/upper|top/) ? 'top'
+				: (option.test('bottom') ? 'bottom' : 'center')
+		};
+	}
+
+};
+
+Element.implement({
+
+	position: function(options){
+		if (options && (options.x != null || options.y != null)){
+			return (original ? original.apply(this, arguments) : this);
+		}
+		var position = this.setStyle('position', 'absolute').calculatePosition(options);
+		return (options && options.returnPos) ? position : this.setStyles(position);
+	},
+
+	calculatePosition: function(options){
+		return local.getPosition(this, options);
+	}
+
+});
+
+})(Element.prototype.position);
+
+/*
+---
+
+script: Element.Shortcuts.js
+
+name: Element.Shortcuts
+
+description: Extends the Element native object to include some shortcut methods.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Style
+  - MooTools.More
+
+provides: [Element.Shortcuts]
+
+...
+*/
+
+Element.implement({
+
+	isDisplayed: function(){
+		return this.getStyle('display') != 'none';
+	},
+
+	isVisible: function(){
+		var w = this.offsetWidth,
+			h = this.offsetHeight;
+		return (w == 0 && h == 0) ? false : (w > 0 && h > 0) ? true : this.style.display != 'none';
+	},
+
+	toggle: function(){
+		return this[this.isDisplayed() ? 'hide' : 'show']();
+	},
+
+	hide: function(){
+		var d;
+		try {
+			//IE fails here if the element is not in the dom
+			d = this.getStyle('display');
+		} catch(e){}
+		if (d == 'none') return this;
+		return this.store('element:_originalDisplay', d || '').setStyle('display', 'none');
+	},
+
+	show: function(display){
+		if (!display && this.isDisplayed()) return this;
+		display = display || this.retrieve('element:_originalDisplay') || 'block';
+		return this.setStyle('display', (display == 'none') ? 'block' : display);
+	},
+
+	swapClass: function(remove, add){
+		return this.removeClass(remove).addClass(add);
+	}
+
+});
+
+Document.implement({
+
+	clearSelection: function(){
+		if (window.getSelection){
+			var selection = window.getSelection();
+			if (selection && selection.removeAllRanges) selection.removeAllRanges();
+		} else if (document.selection && document.selection.empty){
+			try {
+				//IE fails here if selected element is not in dom
+				document.selection.empty();
+			} catch(e){}
+		}
+	}
+
+});
+
+/*
+---
+
+script: Elements.From.js
+
+name: Elements.From
+
+description: Returns a collection of elements from a string of html.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/String
+  - Core/Element
+  - MooTools.More
+
+provides: [Elements.from, Elements.From]
+
+...
+*/
+
+Elements.from = function(text, excludeScripts){
+	if (excludeScripts || excludeScripts == null) text = text.stripScripts();
+
+	var container, match = text.match(/^\s*(?:<!--.*?-->\s*)*<(t[dhr]|tbody|tfoot|thead)/i);
+
+	if (match){
+		container = new Element('table');
+		var tag = match[1].toLowerCase();
+		if (['td', 'th', 'tr'].contains(tag)){
+			container = new Element('tbody').inject(container);
+			if (tag != 'tr') container = new Element('tr').inject(container);
+		}
+	}
+
+	return (container || new Element('div')).set('html', text).getChildren();
+};
+
+/*
+---
+
+script: IframeShim.js
+
+name: IframeShim
+
+description: Defines IframeShim, a class for obscuring select lists and flash objects in IE.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Options
+  - Core/Events
+  - Element.Position
+  - Class.Occlude
+
+provides: [IframeShim]
+
+...
+*/
+
+(function(){
+
+var browsers = false;
+
+
+this.IframeShim = new Class({
+
+	Implements: [Options, Events, Class.Occlude],
+
+	options: {
+		className: 'iframeShim',
+		src: 'javascript:false;document.write("");',
+		display: false,
+		zIndex: null,
+		margin: 0,
+		offset: {x: 0, y: 0},
+		browsers: browsers
+	},
+
+	property: 'IframeShim',
+
+	initialize: function(element, options){
+		this.element = document.id(element);
+		if (this.occlude()) return this.occluded;
+		this.setOptions(options);
+		this.makeShim();
+		return this;
+	},
+
+	makeShim: function(){
+		if (this.options.browsers){
+			var zIndex = this.element.getStyle('zIndex').toInt();
+
+			if (!zIndex){
+				zIndex = 1;
+				var pos = this.element.getStyle('position');
+				if (pos == 'static' || !pos) this.element.setStyle('position', 'relative');
+				this.element.setStyle('zIndex', zIndex);
+			}
+			zIndex = ((this.options.zIndex != null || this.options.zIndex === 0) && zIndex > this.options.zIndex) ? this.options.zIndex : zIndex - 1;
+			if (zIndex < 0) zIndex = 1;
+			this.shim = new Element('iframe', {
+				src: this.options.src,
+				scrolling: 'no',
+				frameborder: 0,
+				styles: {
+					zIndex: zIndex,
+					position: 'absolute',
+					border: 'none',
+					filter: 'progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)'
+				},
+				'class': this.options.className
+			}).store('IframeShim', this);
+			var inject = (function(){
+				this.shim.inject(this.element, 'after');
+				this[this.options.display ? 'show' : 'hide']();
+				this.fireEvent('inject');
+			}).bind(this);
+			if (!IframeShim.ready) window.addEvent('load', inject);
+			else inject();
+		} else {
+			this.position = this.hide = this.show = this.dispose = Function.from(this);
+		}
+	},
+
+	position: function(){
+		if (!IframeShim.ready || !this.shim) return this;
+		var size = this.element.measure(function(){
+			return this.getSize();
+		});
+		if (this.options.margin != undefined){
+			size.x = size.x - (this.options.margin * 2);
+			size.y = size.y - (this.options.margin * 2);
+			this.options.offset.x += this.options.margin;
+			this.options.offset.y += this.options.margin;
+		}
+		this.shim.set({width: size.x, height: size.y}).position({
+			relativeTo: this.element,
+			offset: this.options.offset
+		});
+		return this;
+	},
+
+	hide: function(){
+		if (this.shim) this.shim.setStyle('display', 'none');
+		return this;
+	},
+
+	show: function(){
+		if (this.shim) this.shim.setStyle('display', 'block');
+		return this.position();
+	},
+
+	dispose: function(){
+		if (this.shim) this.shim.dispose();
+		return this;
+	},
+
+	destroy: function(){
+		if (this.shim) this.shim.destroy();
+		return this;
+	}
+
+});
+
+})();
+
+window.addEvent('load', function(){
+	IframeShim.ready = true;
+});
+
+/*
+---
+
+script: Mask.js
+
+name: Mask
+
+description: Creates a mask element to cover another.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Element.Event
+  - Class.Binds
+  - Element.Position
+  - IframeShim
+
+provides: [Mask]
+
+...
+*/
+
+var Mask = new Class({
+
+	Implements: [Options, Events],
+
+	Binds: ['position'],
+
+	options: {/*
+		onShow: function(){},
+		onHide: function(){},
+		onDestroy: function(){},
+		onClick: function(event){},
+		inject: {
+			where: 'after',
+			target: null,
+		},
+		hideOnClick: false,
+		id: null,
+		destroyOnHide: false,*/
+		style: {},
+		'class': 'mask',
+		maskMargins: false,
+		useIframeShim: true,
+		iframeShimOptions: {}
+	},
+
+	initialize: function(target, options){
+		this.target = document.id(target) || document.id(document.body);
+		this.target.store('mask', this);
+		this.setOptions(options);
+		this.render();
+		this.inject();
+	},
+
+	render: function(){
+		this.element = new Element('div', {
+			'class': this.options['class'],
+			id: this.options.id || 'mask-' + String.uniqueID(),
+			styles: Object.merge({}, this.options.style, {
+				display: 'none'
+			}),
+			events: {
+				click: function(event){
+					this.fireEvent('click', event);
+					if (this.options.hideOnClick) this.hide();
+				}.bind(this)
+			}
+		});
+
+		this.hidden = true;
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	inject: function(target, where){
+		where = where || (this.options.inject ? this.options.inject.where : '') || (this.target == document.body ? 'inside' : 'after');
+		target = target || (this.options.inject && this.options.inject.target) || this.target;
+
+		this.element.inject(target, where);
+
+		if (this.options.useIframeShim){
+			this.shim = new IframeShim(this.element, this.options.iframeShimOptions);
+
+			this.addEvents({
+				show: this.shim.show.bind(this.shim),
+				hide: this.shim.hide.bind(this.shim),
+				destroy: this.shim.destroy.bind(this.shim)
+			});
+		}
+	},
+
+	position: function(){
+		this.resize(this.options.width, this.options.height);
+
+		this.element.position({
+			relativeTo: this.target,
+			position: 'topLeft',
+			ignoreMargins: !this.options.maskMargins,
+			ignoreScroll: this.target == document.body
+		});
+
+		return this;
+	},
+
+	resize: function(x, y){
+		var opt = {
+			styles: ['padding', 'border']
+		};
+		if (this.options.maskMargins) opt.styles.push('margin');
+
+		var dim = this.target.getComputedSize(opt);
+		if (this.target == document.body){
+			this.element.setStyles({width: 0, height: 0});
+			var win = window.getScrollSize();
+			if (dim.totalHeight < win.y) dim.totalHeight = win.y;
+			if (dim.totalWidth < win.x) dim.totalWidth = win.x;
+		}
+		this.element.setStyles({
+			width: Array.pick([x, dim.totalWidth, dim.x]),
+			height: Array.pick([y, dim.totalHeight, dim.y])
+		});
+
+		return this;
+	},
+
+	show: function(){
+		if (!this.hidden) return this;
+
+		window.addEvent('resize', this.position);
+		this.position();
+		this.showMask.apply(this, arguments);
+
+		return this;
+	},
+
+	showMask: function(){
+		this.element.setStyle('display', 'block');
+		this.hidden = false;
+		this.fireEvent('show');
+	},
+
+	hide: function(){
+		if (this.hidden) return this;
+
+		window.removeEvent('resize', this.position);
+		this.hideMask.apply(this, arguments);
+		if (this.options.destroyOnHide) return this.destroy();
+
+		return this;
+	},
+
+	hideMask: function(){
+		this.element.setStyle('display', 'none');
+		this.hidden = true;
+		this.fireEvent('hide');
+	},
+
+	toggle: function(){
+		this[this.hidden ? 'show' : 'hide']();
+	},
+
+	destroy: function(){
+		this.hide();
+		this.element.destroy();
+		this.fireEvent('destroy');
+		this.target.eliminate('mask');
+	}
+
+});
+
+Element.Properties.mask = {
+
+	set: function(options){
+		var mask = this.retrieve('mask');
+		if (mask) mask.destroy();
+		return this.eliminate('mask').store('mask:options', options);
+	},
+
+	get: function(){
+		var mask = this.retrieve('mask');
+		if (!mask){
+			mask = new Mask(this, this.retrieve('mask:options'));
+			this.store('mask', mask);
+		}
+		return mask;
+	}
+
+};
+
+Element.implement({
+
+	mask: function(options){
+		if (options) this.set('mask', options);
+		this.get('mask').show();
+		return this;
+	},
+
+	unmask: function(){
+		this.get('mask').hide();
+		return this;
+	}
+
+});
+
+/*
+---
+
+script: Spinner.js
+
+name: Spinner
+
+description: Adds a semi-transparent overlay over a dom element with a spinnin ajax icon.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Fx.Tween
+  - Core/Request
+  - Class.refactor
+  - Mask
+
+provides: [Spinner]
+
+...
+*/
+
+var Spinner = new Class({
+
+	Extends: Mask,
+
+	Implements: Chain,
+
+	options: {/*
+		message: false,*/
+		'class': 'spinner',
+		containerPosition: {},
+		content: {
+			'class': 'spinner-content'
+		},
+		messageContainer: {
+			'class': 'spinner-msg'
+		},
+		img: {
+			'class': 'spinner-img'
+		},
+		fxOptions: {
+			link: 'chain'
+		}
+	},
+
+	initialize: function(target, options){
+		this.target = document.id(target) || document.id(document.body);
+		this.target.store('spinner', this);
+		this.setOptions(options);
+		this.render();
+		this.inject();
+
+		// Add this to events for when noFx is true; parent methods handle hide/show.
+		var deactivate = function(){ this.active = false; }.bind(this);
+		this.addEvents({
+			hide: deactivate,
+			show: deactivate
+		});
+	},
+
+	render: function(){
+		this.parent();
+
+		this.element.set('id', this.options.id || 'spinner-' + String.uniqueID());
+
+		this.content = document.id(this.options.content) || new Element('div', this.options.content);
+		this.content.inject(this.element);
+
+		if (this.options.message){
+			this.msg = document.id(this.options.message) || new Element('p', this.options.messageContainer).appendText(this.options.message);
+			this.msg.inject(this.content);
+		}
+
+		if (this.options.img){
+			this.img = document.id(this.options.img) || new Element('div', this.options.img);
+			this.img.inject(this.content);
+		}
+
+		this.element.set('tween', this.options.fxOptions);
+	},
+
+	show: function(noFx){
+		if (this.active) return this.chain(this.show.bind(this));
+		if (!this.hidden){
+			this.callChain.delay(20, this);
+			return this;
+		}
+
+		this.target.set('aria-busy', 'true');
+		this.active = true;
+
+		return this.parent(noFx);
+	},
+
+	showMask: function(noFx){
+		var pos = function(){
+			this.content.position(Object.merge({
+				relativeTo: this.element
+			}, this.options.containerPosition));
+		}.bind(this);
+
+		if (noFx){
+			this.parent();
+			pos();
+		} else {
+			if (!this.options.style.opacity) this.options.style.opacity = this.element.getStyle('opacity').toFloat();
+			this.element.setStyles({
+				display: 'block',
+				opacity: 0
+			}).tween('opacity', this.options.style.opacity);
+			pos();
+			this.hidden = false;
+			this.fireEvent('show');
+			this.callChain();
+		}
+	},
+
+	hide: function(noFx){
+		if (this.active) return this.chain(this.hide.bind(this));
+		if (this.hidden){
+			this.callChain.delay(20, this);
+			return this;
+		}
+
+		this.target.set('aria-busy', 'false');
+		this.active = true;
+
+		return this.parent(noFx);
+	},
+
+	hideMask: function(noFx){
+		if (noFx) return this.parent();
+		this.element.tween('opacity', 0).get('tween').chain(function(){
+			this.element.setStyle('display', 'none');
+			this.hidden = true;
+			this.fireEvent('hide');
+			this.callChain();
+		}.bind(this));
+	},
+
+	destroy: function(){
+		this.content.destroy();
+		this.parent();
+		this.target.eliminate('spinner');
+	}
+
+});
+
+Request = Class.refactor(Request, {
+
+	options: {
+		useSpinner: false,
+		spinnerOptions: {},
+		spinnerTarget: false
+	},
+
+	initialize: function(options){
+		this._send = this.send;
+		this.send = function(options){
+			var spinner = this.getSpinner();
+			if (spinner) spinner.chain(this._send.pass(options, this)).show();
+			else this._send(options);
+			return this;
+		};
+		this.previous(options);
+	},
+
+	getSpinner: function(){
+		if (!this.spinner){
+			var update = document.id(this.options.spinnerTarget) || document.id(this.options.update);
+			if (this.options.useSpinner && update){
+				update.set('spinner', this.options.spinnerOptions);
+				var spinner = this.spinner = update.get('spinner');
+				['complete', 'exception', 'cancel'].each(function(event){
+					this.addEvent(event, spinner.hide.bind(spinner));
+				}, this);
+			}
+		}
+		return this.spinner;
+	}
+
+});
+
+Element.Properties.spinner = {
+
+	set: function(options){
+		var spinner = this.retrieve('spinner');
+		if (spinner) spinner.destroy();
+		return this.eliminate('spinner').store('spinner:options', options);
+	},
+
+	get: function(){
+		var spinner = this.retrieve('spinner');
+		if (!spinner){
+			spinner = new Spinner(this, this.retrieve('spinner:options'));
+			this.store('spinner', spinner);
+		}
+		return spinner;
+	}
+
+};
+
+Element.implement({
+
+	spin: function(options){
+		if (options) this.set('spinner', options);
+		this.get('spinner').show();
+		return this;
+	},
+
+	unspin: function(){
+		this.get('spinner').hide();
+		return this;
+	}
+
+});
+
+/*
+---
+
+script: String.QueryString.js
+
+name: String.QueryString
+
+description: Methods for dealing with URI query strings.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+  - Aaron Newton
+  - Lennart Pilon
+  - Valerio Proietti
+
+requires:
+  - Core/Array
+  - Core/String
+  - MooTools.More
+
+provides: [String.QueryString]
+
+...
+*/
+
+String.implement({
+
+	parseQueryString: function(decodeKeys, decodeValues){
+		if (decodeKeys == null) decodeKeys = true;
+		if (decodeValues == null) decodeValues = true;
+
+		var vars = this.split(/[&;]/),
+			object = {};
+		if (!vars.length) return object;
+
+		vars.each(function(val){
+			var index = val.indexOf('=') + 1,
+				value = index ? val.substr(index) : '',
+				keys = index ? val.substr(0, index - 1).match(/([^\]\[]+|(\B)(?=\]))/g) : [val],
+				obj = object;
+			if (!keys) return;
+			if (decodeValues) value = decodeURIComponent(value);
+			keys.each(function(key, i){
+				if (decodeKeys) key = decodeURIComponent(key);
+				var current = obj[key];
+
+				if (i < keys.length - 1) obj = obj[key] = current || {};
+				else if (typeOf(current) == 'array') current.push(value);
+				else obj[key] = current != null ? [current, value] : value;
+			});
+		});
+
+		return object;
+	},
+
+	cleanQueryString: function(method){
+		return this.split('&').filter(function(val){
+			var index = val.indexOf('='),
+				key = index < 0 ? '' : val.substr(0, index),
+				value = val.substr(index + 1);
+
+			return method ? method.call(null, key, value) : (value || value === 0);
+		}).join('&');
+	}
+
+});
+
+/*
+---
+
+script: Form.Request.js
+
+name: Form.Request
+
+description: Handles the basic functionality of submitting a form and updating a dom element with the result.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Request.HTML
+  - Class.Binds
+  - Class.Occlude
+  - Spinner
+  - String.QueryString
+  - Element.Delegation.Pseudo
+
+provides: [Form.Request]
+
+...
+*/
+
+if (!window.Form) window.Form = {};
+
+(function(){
+
+	Form.Request = new Class({
+
+		Binds: ['onSubmit', 'onFormValidate'],
+
+		Implements: [Options, Events, Class.Occlude],
+
+		options: {/*
+			onFailure: function(){},
+			onSuccess: function(){}, // aliased to onComplete,
+			onSend: function(){}*/
+			requestOptions: {
+				evalScripts: true,
+				useSpinner: true,
+				emulation: false,
+				link: 'ignore'
+			},
+			sendButtonClicked: true,
+			extraData: {},
+			resetForm: true
+		},
+
+		property: 'form.request',
+
+		initialize: function(form, target, options){
+			this.element = document.id(form);
+			if (this.occlude()) return this.occluded;
+			this.setOptions(options)
+				.setTarget(target)
+				.attach();
+		},
+
+		setTarget: function(target){
+			this.target = document.id(target);
+			if (!this.request){
+				this.makeRequest();
+			} else {
+				this.request.setOptions({
+					update: this.target
+				});
+			}
+			return this;
+		},
+
+		toElement: function(){
+			return this.element;
+		},
+
+		makeRequest: function(){
+			var self = this;
+			this.request = new Request.HTML(Object.merge({
+					update: this.target,
+					emulation: false,
+					spinnerTarget: this.element,
+					method: this.element.get('method') || 'post'
+			}, this.options.requestOptions)).addEvents({
+				success: function(tree, elements, html, javascript){
+					['complete', 'success'].each(function(evt){
+						self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
+					});
+				},
+				failure: function(){
+					self.fireEvent('complete', arguments).fireEvent('failure', arguments);
+				},
+				exception: function(){
+					self.fireEvent('failure', arguments);
+				}
+			});
+			return this.attachReset();
+		},
+
+		attachReset: function(){
+			if (!this.options.resetForm) return this;
+			this.request.addEvent('success', function(){
+				Function.attempt(function(){
+					this.element.reset();
+				}.bind(this));
+				if (window.OverText) OverText.update();
+			}.bind(this));
+			return this;
+		},
+
+		attach: function(attach){
+			var method = (attach != false) ? 'addEvent' : 'removeEvent';
+			this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
+
+			var fv = this.element.retrieve('validator');
+			if (fv) fv[method]('onFormValidate', this.onFormValidate);
+			else this.element[method]('submit', this.onSubmit);
+
+			return this;
+		},
+
+		detach: function(){
+			return this.attach(false);
+		},
+
+		//public method
+		enable: function(){
+			return this.attach();
+		},
+
+		//public method
+		disable: function(){
+			return this.detach();
+		},
+
+		onFormValidate: function(valid, form, event){
+			//if there's no event, then this wasn't a submit event
+			if (!event) return;
+			var fv = this.element.retrieve('validator');
+			if (valid || (fv && !fv.options.stopOnFailure)){
+				event.stop();
+				this.send();
+			}
+		},
+
+		onSubmit: function(event){
+			var fv = this.element.retrieve('validator');
+			if (fv){
+				//form validator was created after Form.Request
+				this.element.removeEvent('submit', this.onSubmit);
+				fv.addEvent('onFormValidate', this.onFormValidate);
+				fv.validate(event);
+				return;
+			}
+			if (event) event.stop();
+			this.send();
+		},
+
+		saveClickedButton: function(event, target){
+			var targetName = target.get('name');
+			if (!targetName || !this.options.sendButtonClicked) return;
+			this.options.extraData[targetName] = target.get('value') || true;
+			this.clickedCleaner = function(){
+				delete this.options.extraData[targetName];
+				this.clickedCleaner = function(){};
+			}.bind(this);
+		},
+
+		clickedCleaner: function(){},
+
+		send: function(){
+			var str = this.element.toQueryString().trim(),
+				data = Object.toQueryString(this.options.extraData);
+
+			if (str) str += "&" + data;
+			else str = data;
+
+			this.fireEvent('send', [this.element, str.parseQueryString()]);
+			this.request.send({
+				data: str,
+				url: this.options.requestOptions.url || this.element.get('action')
+			});
+			this.clickedCleaner();
+			return this;
+		}
+
+	});
+
+	Element.implement('formUpdate', function(update, options){
+		var fq = this.retrieve('form.request');
+		if (!fq){
+			fq = new Form.Request(this, update, options);
+		} else {
+			if (update) fq.setTarget(update);
+			if (options) fq.setOptions(options).makeRequest();
+		}
+		fq.send();
+		return this;
+	});
+
+})();
+
+/*
+---
+
+script: Fx.Reveal.js
+
+name: Fx.Reveal
+
+description: Defines Fx.Reveal, a class that shows and hides elements with a transition.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Fx.Morph
+  - Element.Shortcuts
+  - Element.Measure
+
+provides: [Fx.Reveal]
+
+...
+*/
+
+(function(){
+
+
+var hideTheseOf = function(object){
+	var hideThese = object.options.hideInputs;
+	if (window.OverText){
+		var otClasses = [null];
+		OverText.each(function(ot){
+			otClasses.include('.' + ot.options.labelClass);
+		});
+		if (otClasses) hideThese += otClasses.join(', ');
+	}
+	return (hideThese) ? object.element.getElements(hideThese) : null;
+};
+
+
+Fx.Reveal = new Class({
+
+	Extends: Fx.Morph,
+
+	options: {/*
+		onShow: function(thisElement){},
+		onHide: function(thisElement){},
+		onComplete: function(thisElement){},
+		heightOverride: null,
+		widthOverride: null,*/
+		link: 'cancel',
+		styles: ['padding', 'border', 'margin'],
+		transitionOpacity: 'opacity' in document.documentElement,
+		mode: 'vertical',
+		display: function(){
+			return this.element.get('tag') != 'tr' ? 'block' : 'table-row';
+		},
+		opacity: 1,
+		hideInputs: !('opacity' in document.documentElement) ? 'select, input, textarea, object, embed' : null
+	},
+
+	dissolve: function(){
+		if (!this.hiding && !this.showing){
+			if (this.element.getStyle('display') != 'none'){
+				this.hiding = true;
+				this.showing = false;
+				this.hidden = true;
+				this.cssText = this.element.style.cssText;
+
+				var startStyles = this.element.getComputedSize({
+					styles: this.options.styles,
+					mode: this.options.mode
+				});
+				if (this.options.transitionOpacity) startStyles.opacity = this.options.opacity;
+
+				var zero = {};
+				Object.each(startStyles, function(style, name){
+					zero[name] = [style, 0];
+				});
+
+				this.element.setStyles({
+					display: Function.from(this.options.display).call(this),
+					overflow: 'hidden'
+				});
+
+				var hideThese = hideTheseOf(this);
+				if (hideThese) hideThese.setStyle('visibility', 'hidden');
+
+				this.$chain.unshift(function(){
+					if (this.hidden){
+						this.hiding = false;
+						this.element.style.cssText = this.cssText;
+						this.element.setStyle('display', 'none');
+						if (hideThese) hideThese.setStyle('visibility', 'visible');
+					}
+					this.fireEvent('hide', this.element);
+					this.callChain();
+				}.bind(this));
+
+				this.start(zero);
+			} else {
+				this.callChain.delay(10, this);
+				this.fireEvent('complete', this.element);
+				this.fireEvent('hide', this.element);
+			}
+		} else if (this.options.link == 'chain'){
+			this.chain(this.dissolve.bind(this));
+		} else if (this.options.link == 'cancel' && !this.hiding){
+			this.cancel();
+			this.dissolve();
+		}
+		return this;
+	},
+
+	reveal: function(){
+		if (!this.showing && !this.hiding){
+			if (this.element.getStyle('display') == 'none'){
+				this.hiding = false;
+				this.showing = true;
+				this.hidden = false;
+				this.cssText = this.element.style.cssText;
+
+				var startStyles;
+				this.element.measure(function(){
+					startStyles = this.element.getComputedSize({
+						styles: this.options.styles,
+						mode: this.options.mode
+					});
+				}.bind(this));
+				if (this.options.heightOverride != null) startStyles.height = this.options.heightOverride.toInt();
+				if (this.options.widthOverride != null) startStyles.width = this.options.widthOverride.toInt();
+				if (this.options.transitionOpacity){
+					this.element.setStyle('opacity', 0);
+					startStyles.opacity = this.options.opacity;
+				}
+
+				var zero = {
+					height: 0,
+					display: Function.from(this.options.display).call(this)
+				};
+				Object.each(startStyles, function(style, name){
+					zero[name] = 0;
+				});
+				zero.overflow = 'hidden';
+
+				this.element.setStyles(zero);
+
+				var hideThese = hideTheseOf(this);
+				if (hideThese) hideThese.setStyle('visibility', 'hidden');
+
+				this.$chain.unshift(function(){
+					this.element.style.cssText = this.cssText;
+					this.element.setStyle('display', Function.from(this.options.display).call(this));
+					if (!this.hidden) this.showing = false;
+					if (hideThese) hideThese.setStyle('visibility', 'visible');
+					this.callChain();
+					this.fireEvent('show', this.element);
+				}.bind(this));
+
+				this.start(startStyles);
+			} else {
+				this.callChain();
+				this.fireEvent('complete', this.element);
+				this.fireEvent('show', this.element);
+			}
+		} else if (this.options.link == 'chain'){
+			this.chain(this.reveal.bind(this));
+		} else if (this.options.link == 'cancel' && !this.showing){
+			this.cancel();
+			this.reveal();
+		}
+		return this;
+	},
+
+	toggle: function(){
+		if (this.element.getStyle('display') == 'none'){
+			this.reveal();
+		} else {
+			this.dissolve();
+		}
+		return this;
+	},
+
+	cancel: function(){
+		this.parent.apply(this, arguments);
+		if (this.cssText != null) this.element.style.cssText = this.cssText;
+		this.hiding = false;
+		this.showing = false;
+		return this;
+	}
+
+});
+
+Element.Properties.reveal = {
+
+	set: function(options){
+		this.get('reveal').cancel().setOptions(options);
+		return this;
+	},
+
+	get: function(){
+		var reveal = this.retrieve('reveal');
+		if (!reveal){
+			reveal = new Fx.Reveal(this);
+			this.store('reveal', reveal);
+		}
+		return reveal;
+	}
+
+};
+
+Element.Properties.dissolve = Element.Properties.reveal;
+
+Element.implement({
+
+	reveal: function(options){
+		this.get('reveal').setOptions(options).reveal();
+		return this;
+	},
+
+	dissolve: function(options){
+		this.get('reveal').setOptions(options).dissolve();
+		return this;
+	},
+
+	nix: function(options){
+		var params = Array.link(arguments, {destroy: Type.isBoolean, options: Type.isObject});
+		this.get('reveal').setOptions(options).dissolve().chain(function(){
+			this[params.destroy ? 'destroy' : 'dispose']();
+		}.bind(this));
+		return this;
+	},
+
+	wink: function(){
+		var params = Array.link(arguments, {duration: Type.isNumber, options: Type.isObject});
+		var reveal = this.get('reveal').setOptions(params.options);
+		reveal.reveal().chain(function(){
+			(function(){
+				reveal.dissolve();
+			}).delay(params.duration || 2000);
+		});
+	}
+
+});
+
+})();
+
+/*
+---
+
+script: Form.Request.Append.js
+
+name: Form.Request.Append
+
+description: Handles the basic functionality of submitting a form and updating a dom element with the result. The result is appended to the DOM element instead of replacing its contents.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Form.Request
+  - Fx.Reveal
+  - Elements.from
+
+provides: [Form.Request.Append]
+
+...
+*/
+
+Form.Request.Append = new Class({
+
+	Extends: Form.Request,
+
+	options: {
+		//onBeforeEffect: function(){},
+		useReveal: true,
+		revealOptions: {},
+		inject: 'bottom'
+	},
+
+	makeRequest: function(){
+		this.request = new Request.HTML(Object.merge({
+				url: this.element.get('action'),
+				method: this.element.get('method') || 'post',
+				spinnerTarget: this.element
+			}, this.options.requestOptions, {
+				evalScripts: false
+			})
+		).addEvents({
+			success: function(tree, elements, html, javascript){
+				var container;
+				var kids = Elements.from(html);
+				if (kids.length == 1){
+					container = kids[0];
+				} else {
+					 container = new Element('div', {
+						styles: {
+							display: 'none'
+						}
+					}).adopt(kids);
+				}
+				container.inject(this.target, this.options.inject);
+				if (this.options.requestOptions.evalScripts) Browser.exec(javascript);
+				this.fireEvent('beforeEffect', container);
+				var finish = function(){
+					this.fireEvent('success', [container, this.target, tree, elements, html, javascript]);
+				}.bind(this);
+				if (this.options.useReveal){
+					container.set('reveal', this.options.revealOptions).get('reveal').chain(finish);
+					container.reveal();
+				} else {
+					finish();
+				}
+			}.bind(this),
+			failure: function(xhr){
+				this.fireEvent('failure', xhr);
+			}.bind(this)
+		});
+		this.attachReset();
+	}
+
+});
 
 /*
 ---
@@ -198,7 +3606,7 @@ authors:
 
 requires:
   - Core/Object
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Object.Extras]
 
@@ -249,7 +3657,6 @@ Object.extend({
 
 })();
 
-
 /*
 ---
 
@@ -267,8 +3674,8 @@ authors:
 
 requires:
   - Core/Events
-  - /Object.Extras
-  - /MooTools.More
+  - Object.Extras
+  - MooTools.More
 
 provides: [Locale, Lang]
 
@@ -417,7 +3824,6 @@ Locale.Set = new Class({
 
 })();
 
-
 /*
 ---
 
@@ -431,7 +3837,7 @@ authors:
   - Aaron Newton
 
 requires:
-  - /Locale
+  - Locale
 
 provides: [Locale.en-US.Date]
 
@@ -489,7 +3895,6 @@ Locale.define('en-US', 'Date', {
 
 });
 
-
 /*
 ---
 
@@ -697,19 +4102,19 @@ Date.implement({
 	},
 
 	isValid: function(date){
-		return !isNaN((date || this).valueOf());
+		if (!date) date = this;
+		return typeOf(date) == 'date' && !isNaN(date.valueOf());
 	},
 
-	format: function(f){
+	format: function(format){
 		if (!this.isValid()) return 'invalid date';
-		if (!f) f = '%x %X';
 
-		var formatLower = f.toLowerCase();
-		if (formatters[formatLower]) return formatters[formatLower](this); // it's a formatter!
-		f = formats[formatLower] || f; // replace short-hand with actual format
+		if (!format) format = '%x %X';
+		if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
+		if (typeof format == 'function') return format(this);
 
 		var d = this;
-		return f.replace(/%([a-z%])/gi,
+		return format.replace(/%([a-z%])/gi,
 			function($0, $1){
 				switch ($1){
 					case 'a': return Date.getMsg('days_abbr')[d.get('day')];
@@ -756,18 +4161,15 @@ Date.implement({
 	strftime: 'format'
 });
 
-var formats = {
-	db: '%Y-%m-%d %H:%M:%S',
-	compact: '%Y%m%dT%H%M%S',
-	'short': '%d %b %H:%M',
-	'long': '%B %d, %Y %H:%M'
-};
-
 // The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
 var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
 	rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
-var formatters = {
+var formats = {
+	db: '%Y-%m-%d %H:%M:%S',
+	compact: '%Y%m%dT%H%M%S',
+	'short': '%d %b %H:%M',
+	'long': '%B %d, %Y %H:%M',
 	rfc822: function(date){
 		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
 	},
@@ -787,7 +4189,6 @@ var formatters = {
 	}
 };
 
-
 var parsePatterns = [],
 	nativeParse = Date.parse;
 
@@ -899,11 +4300,6 @@ Date.extend({
 		return this;
 	},
 
-	defineFormats: function(formats){
-		for (var name in formats) Date.defineFormat(name, formats[name]);
-		return this;
-	},
-
 	
 
 	defineParser: function(pattern){
@@ -922,6 +4318,8 @@ Date.extend({
 		return this;
 	}
 
+}).extend({
+	defineFormats: Date.defineFormat.overloadSetter()
 });
 
 var regexOf = function(type){
@@ -1056,3384 +4454,6 @@ Locale.addEvent('change', function(language){
 
 })();
 
-
-/*
----
-
-script: Date.Extras.js
-
-name: Date.Extras
-
-description: Extends the Date native object to include extra methods (on top of those in Date.js).
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - /Date
-
-provides: [Date.Extras]
-
-...
-*/
-
-Date.implement({
-
-	timeDiffInWords: function(to){
-		return Date.distanceOfTimeInWords(this, to || new Date);
-	},
-
-	timeDiff: function(to, separator){
-		if (to == null) to = new Date;
-		var delta = ((to - this) / 1000).floor().abs();
-
-		var vals = [],
-			durations = [60, 60, 24, 365, 0],
-			names = ['s', 'm', 'h', 'd', 'y'],
-			value, duration;
-
-		for (var item = 0; item < durations.length; item++){
-			if (item && !delta) break;
-			value = delta;
-			if ((duration = durations[item])){
-				value = (delta % duration);
-				delta = (delta / duration).floor();
-			}
-			vals.unshift(value + (names[item] || ''));
-		}
-
-		return vals.join(separator || ':');
-	}
-
-}).extend({
-
-	distanceOfTimeInWords: function(from, to){
-		return Date.getTimePhrase(((to - from) / 1000).toInt());
-	},
-
-	getTimePhrase: function(delta){
-		var suffix = (delta < 0) ? 'Until' : 'Ago';
-		if (delta < 0) delta *= -1;
-
-		var units = {
-			minute: 60,
-			hour: 60,
-			day: 24,
-			week: 7,
-			month: 52 / 12,
-			year: 12,
-			eon: Infinity
-		};
-
-		var msg = 'lessThanMinute';
-
-		for (var unit in units){
-			var interval = units[unit];
-			if (delta < 1.5 * interval){
-				if (delta > 0.75 * interval) msg = unit;
-				break;
-			}
-			delta /= interval;
-			msg = unit + 's';
-		}
-
-		delta = delta.round();
-		return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
-	}
-
-}).defineParsers(
-
-	{
-		// "today", "tomorrow", "yesterday"
-		re: /^(?:tod|tom|yes)/i,
-		handler: function(bits){
-			var d = new Date().clearTime();
-			switch (bits[0]){
-				case 'tom': return d.increment();
-				case 'yes': return d.decrement();
-				default: return d;
-			}
-		}
-	},
-
-	{
-		// "next Wednesday", "last Thursday"
-		re: /^(next|last) ([a-z]+)$/i,
-		handler: function(bits){
-			var d = new Date().clearTime();
-			var day = d.getDay();
-			var newDay = Date.parseDay(bits[2], true);
-			var addDays = newDay - day;
-			if (newDay <= day) addDays += 7;
-			if (bits[1] == 'last') addDays -= 7;
-			return d.set('date', d.getDate() + addDays);
-		}
-	}
-
-).alias('timeAgoInWords', 'timeDiffInWords');
-
-
-/*
----
-
-name: Locale.en-US.Number
-
-description: Number messages for US English.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires:
-  - /Locale
-
-provides: [Locale.en-US.Number]
-
-...
-*/
-
-Locale.define('en-US', 'Number', {
-
-	decimal: '.',
-	group: ',',
-
-/* 	Commented properties are the defaults for Number.format
-	decimals: 0,
-	precision: 0,
-	scientific: null,
-
-	prefix: null,
-	suffic: null,
-
-	// Negative/Currency/percentage will mixin Number
-	negative: {
-		prefix: '-'
-	},*/
-
-	currency: {
-//		decimals: 2,
-		prefix: '$ '
-	}/*,
-
-	percentage: {
-		decimals: 2,
-		suffix: '%'
-	}*/
-
-});
-
-
-
-
-/*
----
-name: Number.Format
-description: Extends the Number Type object to include a number formatting method.
-license: MIT-style license
-authors: [Arian Stolwijk]
-requires: [Core/Number, Locale.en-US.Number]
-# Number.Extras is for compatibility
-provides: [Number.Format, Number.Extras]
-...
-*/
-
-
-Number.implement({
-
-	format: function(options){
-		// Thanks dojo and YUI for some inspiration
-		var value = this;
-		options = options ? Object.clone(options) : {};
-		var getOption = function(key){
-			if (options[key] != null) return options[key];
-			return Locale.get('Number.' + key);
-		};
-
-		var negative = value < 0,
-			decimal = getOption('decimal'),
-			precision = getOption('precision'),
-			group = getOption('group'),
-			decimals = getOption('decimals');
-
-		if (negative){
-			var negativeLocale = getOption('negative') || {};
-			if (negativeLocale.prefix == null && negativeLocale.suffix == null) negativeLocale.prefix = '-';
-			['prefix', 'suffix'].each(function(key){
-				if (negativeLocale[key]) options[key] = getOption(key) + negativeLocale[key];
-			});
-
-			value = -value;
-		}
-
-		var prefix = getOption('prefix'),
-			suffix = getOption('suffix');
-
-		if (decimals !== '' && decimals >= 0 && decimals <= 20) value = value.toFixed(decimals);
-		if (precision >= 1 && precision <= 21) value = (+value).toPrecision(precision);
-
-		value += '';
-		var index;
-		if (getOption('scientific') === false && value.indexOf('e') > -1){
-			var match = value.split('e'),
-				zeros = +match[1];
-			value = match[0].replace('.', '');
-
-			if (zeros < 0){
-				zeros = -zeros - 1;
-				index = match[0].indexOf('.');
-				if (index > -1) zeros -= index - 1;
-				while (zeros--) value = '0' + value;
-				value = '0.' + value;
-			} else {
-				index = match[0].lastIndexOf('.');
-				if (index > -1) zeros -= match[0].length - index - 1;
-				while (zeros--) value += '0';
-			}
-		}
-
-		if (decimal != '.') value = value.replace('.', decimal);
-
-		if (group){
-			index = value.lastIndexOf(decimal);
-			index = (index > -1) ? index : value.length;
-			var newOutput = value.substring(index),
-				i = index;
-
-			while (i--){
-				if ((index - i - 1) % 3 == 0 && i != (index - 1)) newOutput = group + newOutput;
-				newOutput = value.charAt(i) + newOutput;
-			}
-
-			value = newOutput;
-		}
-
-		if (prefix) value = prefix + value;
-		if (suffix) value += suffix;
-
-		return value;
-	},
-
-	formatCurrency: function(){
-		var locale = Locale.get('Number.currency') || {};
-		if (locale.scientific == null) locale.scientific = false;
-		if (locale.decimals == null) locale.decimals = 2;
-
-		return this.format(locale);
-	},
-
-	formatPercentage: function(){
-		var locale = Locale.get('Number.percentage') || {};
-		if (locale.suffix == null) locale.suffix = '%';
-		if (locale.decimals == null) locale.decimals = 2;
-
-		return this.format(locale);
-	}
-
-});
-
-
-/*
----
-
-script: String.Extras.js
-
-name: String.Extras
-
-description: Extends the String native object to include methods useful in managing various kinds of strings (query strings, urls, html, etc).
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Guillermo Rauch
-  - Christopher Pitt
-
-requires:
-  - Core/String
-  - Core/Array
-  - MooTools.More
-
-provides: [String.Extras]
-
-...
-*/
-
-(function(){
-
-var special = {
-	'a': /[àáâãäåăą]/g,
-	'A': /[ÀÁÂÃÄÅĂĄ]/g,
-	'c': /[ćčç]/g,
-	'C': /[ĆČÇ]/g,
-	'd': /[ďđ]/g,
-	'D': /[ĎÐ]/g,
-	'e': /[èéêëěę]/g,
-	'E': /[ÈÉÊËĚĘ]/g,
-	'g': /[ğ]/g,
-	'G': /[Ğ]/g,
-	'i': /[ìíîï]/g,
-	'I': /[ÌÍÎÏ]/g,
-	'l': /[ĺľł]/g,
-	'L': /[ĹĽŁ]/g,
-	'n': /[ñňń]/g,
-	'N': /[ÑŇŃ]/g,
-	'o': /[òóôõöøő]/g,
-	'O': /[ÒÓÔÕÖØ]/g,
-	'r': /[řŕ]/g,
-	'R': /[ŘŔ]/g,
-	's': /[ššş]/g,
-	'S': /[ŠŞŚ]/g,
-	't': /[ťţ]/g,
-	'T': /[ŤŢ]/g,
-	'ue': /[ü]/g,
-	'UE': /[Ü]/g,
-	'u': /[ùúûůµ]/g,
-	'U': /[ÙÚÛŮ]/g,
-	'y': /[ÿý]/g,
-	'Y': /[ŸÝ]/g,
-	'z': /[žźż]/g,
-	'Z': /[ŽŹŻ]/g,
-	'th': /[þ]/g,
-	'TH': /[Þ]/g,
-	'dh': /[ð]/g,
-	'DH': /[Ð]/g,
-	'ss': /[ß]/g,
-	'oe': /[œ]/g,
-	'OE': /[Œ]/g,
-	'ae': /[æ]/g,
-	'AE': /[Æ]/g
-},
-
-tidy = {
-	' ': /[\xa0\u2002\u2003\u2009]/g,
-	'*': /[\xb7]/g,
-	'\'': /[\u2018\u2019]/g,
-	'"': /[\u201c\u201d]/g,
-	'...': /[\u2026]/g,
-	'-': /[\u2013]/g,
-//	'--': /[\u2014]/g,
-	'&raquo;': /[\uFFFD]/g
-};
-
-var walk = function(string, replacements){
-	var result = string, key;
-	for (key in replacements) result = result.replace(replacements[key], key);
-	return result;
-};
-
-var getRegexForTag = function(tag, contents){
-	tag = tag || '';
-	var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)<\/" + tag + "(?!\\w)>" : "<\/?" + tag + "([^>]+)?>",
-		reg = new RegExp(regstr, "gi");
-	return reg;
-};
-
-String.implement({
-
-	standardize: function(){
-		return walk(this, special);
-	},
-
-	repeat: function(times){
-		return new Array(times + 1).join(this);
-	},
-
-	pad: function(length, str, direction){
-		if (this.length >= length) return this;
-
-		var pad = (str == null ? ' ' : '' + str)
-			.repeat(length - this.length)
-			.substr(0, length - this.length);
-
-		if (!direction || direction == 'right') return this + pad;
-		if (direction == 'left') return pad + this;
-
-		return pad.substr(0, (pad.length / 2).floor()) + this + pad.substr(0, (pad.length / 2).ceil());
-	},
-
-	getTags: function(tag, contents){
-		return this.match(getRegexForTag(tag, contents)) || [];
-	},
-
-	stripTags: function(tag, contents){
-		return this.replace(getRegexForTag(tag, contents), '');
-	},
-
-	tidy: function(){
-		return walk(this, tidy);
-	},
-
-	truncate: function(max, trail, atChar){
-		var string = this;
-		if (trail == null && arguments.length == 1) trail = '…';
-		if (string.length > max){
-			string = string.substring(0, max);
-			if (atChar){
-				var index = string.lastIndexOf(atChar);
-				if (index != -1) string = string.substr(0, index);
-			}
-			if (trail) string += trail;
-		}
-		return string;
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: String.QueryString.js
-
-name: String.QueryString
-
-description: Methods for dealing with URI query strings.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-  - Aaron Newton
-  - Lennart Pilon
-  - Valerio Proietti
-
-requires:
-  - Core/Array
-  - Core/String
-  - /MooTools.More
-
-provides: [String.QueryString]
-
-...
-*/
-
-String.implement({
-
-	parseQueryString: function(decodeKeys, decodeValues){
-		if (decodeKeys == null) decodeKeys = true;
-		if (decodeValues == null) decodeValues = true;
-
-		var vars = this.split(/[&;]/),
-			object = {};
-		if (!vars.length) return object;
-
-		vars.each(function(val){
-			var index = val.indexOf('=') + 1,
-				value = index ? val.substr(index) : '',
-				keys = index ? val.substr(0, index - 1).match(/([^\]\[]+|(\B)(?=\]))/g) : [val],
-				obj = object;
-			if (!keys) return;
-			if (decodeValues) value = decodeURIComponent(value);
-			keys.each(function(key, i){
-				if (decodeKeys) key = decodeURIComponent(key);
-				var current = obj[key];
-
-				if (i < keys.length - 1) obj = obj[key] = current || {};
-				else if (typeOf(current) == 'array') current.push(value);
-				else obj[key] = current != null ? [current, value] : value;
-			});
-		});
-
-		return object;
-	},
-
-	cleanQueryString: function(method){
-		return this.split('&').filter(function(val){
-			var index = val.indexOf('='),
-				key = index < 0 ? '' : val.substr(0, index),
-				value = val.substr(index + 1);
-
-			return method ? method.call(null, key, value) : (value || value === 0);
-		}).join('&');
-	}
-
-});
-
-
-/*
----
-
-script: URI.js
-
-name: URI
-
-description: Provides methods useful in managing the window location and uris.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-  - Aaron Newton
-
-requires:
-  - Core/Object
-  - Core/Class
-  - Core/Class.Extras
-  - Core/Element
-  - /String.QueryString
-
-provides: [URI]
-
-...
-*/
-
-(function(){
-
-var toString = function(){
-	return this.get('value');
-};
-
-var URI = this.URI = new Class({
-
-	Implements: Options,
-
-	options: {
-		/*base: false*/
-	},
-
-	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
-	parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
-	schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
-
-	initialize: function(uri, options){
-		this.setOptions(options);
-		var base = this.options.base || URI.base;
-		if (!uri) uri = base;
-
-		if (uri && uri.parsed) this.parsed = Object.clone(uri.parsed);
-		else this.set('value', uri.href || uri.toString(), base ? new URI(base) : false);
-	},
-
-	parse: function(value, base){
-		var bits = value.match(this.regex);
-		if (!bits) return false;
-		bits.shift();
-		return this.merge(bits.associate(this.parts), base);
-	},
-
-	merge: function(bits, base){
-		if ((!bits || !bits.scheme) && (!base || !base.scheme)) return false;
-		if (base){
-			this.parts.every(function(part){
-				if (bits[part]) return false;
-				bits[part] = base[part] || '';
-				return true;
-			});
-		}
-		bits.port = bits.port || this.schemes[bits.scheme.toLowerCase()];
-		bits.directory = bits.directory ? this.parseDirectory(bits.directory, base ? base.directory : '') : '/';
-		return bits;
-	},
-
-	parseDirectory: function(directory, baseDirectory){
-		directory = (directory.substr(0, 1) == '/' ? '' : (baseDirectory || '/')) + directory;
-		if (!directory.test(URI.regs.directoryDot)) return directory;
-		var result = [];
-		directory.replace(URI.regs.endSlash, '').split('/').each(function(dir){
-			if (dir == '..' && result.length > 0) result.pop();
-			else if (dir != '.') result.push(dir);
-		});
-		return result.join('/') + '/';
-	},
-
-	combine: function(bits){
-		return bits.value || bits.scheme + '://' +
-			(bits.user ? bits.user + (bits.password ? ':' + bits.password : '') + '@' : '') +
-			(bits.host || '') + (bits.port && bits.port != this.schemes[bits.scheme] ? ':' + bits.port : '') +
-			(bits.directory || '/') + (bits.file || '') +
-			(bits.query ? '?' + bits.query : '') +
-			(bits.fragment ? '#' + bits.fragment : '');
-	},
-
-	set: function(part, value, base){
-		if (part == 'value'){
-			var scheme = value.match(URI.regs.scheme);
-			if (scheme) scheme = scheme[1];
-			if (scheme && this.schemes[scheme.toLowerCase()] == null) this.parsed = { scheme: scheme, value: value };
-			else this.parsed = this.parse(value, (base || this).parsed) || (scheme ? { scheme: scheme, value: value } : { value: value });
-		} else if (part == 'data'){
-			this.setData(value);
-		} else {
-			this.parsed[part] = value;
-		}
-		return this;
-	},
-
-	get: function(part, base){
-		switch (part){
-			case 'value': return this.combine(this.parsed, base ? base.parsed : false);
-			case 'data' : return this.getData();
-		}
-		return this.parsed[part] || '';
-	},
-
-	go: function(){
-		document.location.href = this.toString();
-	},
-
-	toURI: function(){
-		return this;
-	},
-
-	getData: function(key, part){
-		var qs = this.get(part || 'query');
-		if (!(qs || qs === 0)) return key ? null : {};
-		var obj = qs.parseQueryString();
-		return key ? obj[key] : obj;
-	},
-
-	setData: function(values, merge, part){
-		if (typeof values == 'string'){
-			var data = this.getData();
-			data[arguments[0]] = arguments[1];
-			values = data;
-		} else if (merge){
-			values = Object.merge(this.getData(), values);
-		}
-		return this.set(part || 'query', Object.toQueryString(values));
-	},
-
-	clearData: function(part){
-		return this.set(part || 'query', '');
-	},
-
-	toString: toString,
-	valueOf: toString
-
-});
-
-URI.regs = {
-	endSlash: /\/$/,
-	scheme: /^(\w+):/,
-	directoryDot: /\.\/|\.$/
-};
-
-URI.base = new URI(Array.from(document.getElements('base[href]', true)).getLast(), {base: document.location});
-
-String.implement({
-
-	toURI: function(options){
-		return new URI(this, options);
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Class.Refactor.js
-
-name: Class.Refactor
-
-description: Extends a class onto itself with new property, preserving any items attached to the class's namespace.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - /MooTools.More
-
-# Some modules declare themselves dependent on Class.Refactor
-provides: [Class.refactor, Class.Refactor]
-
-...
-*/
-
-Class.refactor = function(original, refactors){
-
-	Object.each(refactors, function(item, name){
-		var origin = original.prototype[name];
-		origin = (origin && origin.$origin) || origin || function(){};
-		original.implement(name, (typeof item == 'function') ? function(){
-			var old = this.previous;
-			this.previous = origin;
-			var value = item.apply(this, arguments);
-			this.previous = old;
-			return value;
-		} : item);
-	});
-
-	return original;
-
-};
-
-
-/*
----
-
-script: URI.Relative.js
-
-name: URI.Relative
-
-description: Extends the URI class to add methods for computing relative and absolute urls.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-
-
-requires:
-  - /Class.refactor
-  - /URI
-
-provides: [URI.Relative]
-
-...
-*/
-
-URI = Class.refactor(URI, {
-
-	combine: function(bits, base){
-		if (!base || bits.scheme != base.scheme || bits.host != base.host || bits.port != base.port)
-			return this.previous.apply(this, arguments);
-		var end = bits.file + (bits.query ? '?' + bits.query : '') + (bits.fragment ? '#' + bits.fragment : '');
-
-		if (!base.directory) return (bits.directory || (bits.file ? '' : './')) + end;
-
-		var baseDir = base.directory.split('/'),
-			relDir = bits.directory.split('/'),
-			path = '',
-			offset;
-
-		var i = 0;
-		for (offset = 0; offset < baseDir.length && offset < relDir.length && baseDir[offset] == relDir[offset]; offset++);
-		for (i = 0; i < baseDir.length - offset - 1; i++) path += '../';
-		for (i = offset; i < relDir.length - 1; i++) path += relDir[i] + '/';
-
-		return (path || (bits.file ? '' : './')) + end;
-	},
-
-	toAbsolute: function(base){
-		base = new URI(base);
-		if (base) base.set('directory', '').set('file', '');
-		return this.toRelative(base);
-	},
-
-	toRelative: function(base){
-		return this.get('value', new URI(base));
-	}
-
-});
-
-
-/*
----
-
-name: Hash
-
-description: Contains Hash Prototypes. Provides a means for overcoming the JavaScript practical impossibility of extending native Objects.
-
-license: MIT-style license.
-
-requires:
-  - Core/Object
-  - /MooTools.More
-
-provides: [Hash]
-
-...
-*/
-
-(function(){
-
-if (this.Hash) return;
-
-var Hash = this.Hash = new Type('Hash', function(object){
-	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
-	for (var key in object) this[key] = object[key];
-	return this;
-});
-
-this.$H = function(object){
-	return new Hash(object);
-};
-
-Hash.implement({
-
-	forEach: function(fn, bind){
-		Object.forEach(this, fn, bind);
-	},
-
-	getClean: function(){
-		var clean = {};
-		for (var key in this){
-			if (this.hasOwnProperty(key)) clean[key] = this[key];
-		}
-		return clean;
-	},
-
-	getLength: function(){
-		var length = 0;
-		for (var key in this){
-			if (this.hasOwnProperty(key)) length++;
-		}
-		return length;
-	}
-
-});
-
-Hash.alias('each', 'forEach');
-
-Hash.implement({
-
-	has: Object.prototype.hasOwnProperty,
-
-	keyOf: function(value){
-		return Object.keyOf(this, value);
-	},
-
-	hasValue: function(value){
-		return Object.contains(this, value);
-	},
-
-	extend: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.set(this, key, value);
-		}, this);
-		return this;
-	},
-
-	combine: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.include(this, key, value);
-		}, this);
-		return this;
-	},
-
-	erase: function(key){
-		if (this.hasOwnProperty(key)) delete this[key];
-		return this;
-	},
-
-	get: function(key){
-		return (this.hasOwnProperty(key)) ? this[key] : null;
-	},
-
-	set: function(key, value){
-		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
-		return this;
-	},
-
-	empty: function(){
-		Hash.each(this, function(value, key){
-			delete this[key];
-		}, this);
-		return this;
-	},
-
-	include: function(key, value){
-		if (this[key] == undefined) this[key] = value;
-		return this;
-	},
-
-	map: function(fn, bind){
-		return new Hash(Object.map(this, fn, bind));
-	},
-
-	filter: function(fn, bind){
-		return new Hash(Object.filter(this, fn, bind));
-	},
-
-	every: function(fn, bind){
-		return Object.every(this, fn, bind);
-	},
-
-	some: function(fn, bind){
-		return Object.some(this, fn, bind);
-	},
-
-	getKeys: function(){
-		return Object.keys(this);
-	},
-
-	getValues: function(){
-		return Object.values(this);
-	},
-
-	toQueryString: function(base){
-		return Object.toQueryString(this, base);
-	}
-
-});
-
-Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
-
-
-})();
-
-
-
-/*
----
-
-script: Hash.Extras.js
-
-name: Hash.Extras
-
-description: Extends the Hash Type to include getFromPath which allows a path notation to child elements.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - /Hash
-  - /Object.Extras
-
-provides: [Hash.Extras]
-
-...
-*/
-
-Hash.implement({
-
-	getFromPath: function(notation){
-		return Object.getFromPath(this, notation);
-	},
-
-	cleanValues: function(method){
-		return new Hash(Object.cleanValues(this, method));
-	},
-
-	run: function(){
-		Object.run(arguments);
-	}
-
-});
-
-
-/*
----
-
-script: Element.Forms.js
-
-name: Element.Forms
-
-description: Extends the Element native object to include methods useful in managing inputs.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element
-  - /String.Extras
-  - /MooTools.More
-
-provides: [Element.Forms]
-
-...
-*/
-
-Element.implement({
-
-	tidy: function(){
-		this.set('value', this.get('value').tidy());
-	},
-
-	getTextInRange: function(start, end){
-		return this.get('value').substring(start, end);
-	},
-
-	getSelectedText: function(){
-		if (this.setSelectionRange) return this.getTextInRange(this.getSelectionStart(), this.getSelectionEnd());
-		return document.selection.createRange().text;
-	},
-
-	getSelectedRange: function(){
-		if (this.selectionStart != null){
-			return {
-				start: this.selectionStart,
-				end: this.selectionEnd
-			};
-		}
-
-		var pos = {
-			start: 0,
-			end: 0
-		};
-		var range = this.getDocument().selection.createRange();
-		if (!range || range.parentElement() != this) return pos;
-		var duplicate = range.duplicate();
-
-		if (this.type == 'text'){
-			pos.start = 0 - duplicate.moveStart('character', -100000);
-			pos.end = pos.start + range.text.length;
-		} else {
-			var value = this.get('value');
-			var offset = value.length;
-			duplicate.moveToElementText(this);
-			duplicate.setEndPoint('StartToEnd', range);
-			if (duplicate.text.length) offset -= value.match(/[\n\r]*$/)[0].length;
-			pos.end = offset - duplicate.text.length;
-			duplicate.setEndPoint('StartToStart', range);
-			pos.start = offset - duplicate.text.length;
-		}
-		return pos;
-	},
-
-	getSelectionStart: function(){
-		return this.getSelectedRange().start;
-	},
-
-	getSelectionEnd: function(){
-		return this.getSelectedRange().end;
-	},
-
-	setCaretPosition: function(pos){
-		if (pos == 'end') pos = this.get('value').length;
-		this.selectRange(pos, pos);
-		return this;
-	},
-
-	getCaretPosition: function(){
-		return this.getSelectedRange().start;
-	},
-
-	selectRange: function(start, end){
-		if (this.setSelectionRange){
-			this.focus();
-			this.setSelectionRange(start, end);
-		} else {
-			var value = this.get('value');
-			var diff = value.substr(start, end - start).replace(/\r/g, '').length;
-			start = value.substr(0, start).replace(/\r/g, '').length;
-			var range = this.createTextRange();
-			range.collapse(true);
-			range.moveEnd('character', start + diff);
-			range.moveStart('character', start);
-			range.select();
-		}
-		return this;
-	},
-
-	insertAtCursor: function(value, select){
-		var pos = this.getSelectedRange();
-		var text = this.get('value');
-		this.set('value', text.substring(0, pos.start) + value + text.substring(pos.end, text.length));
-		if (select !== false) this.selectRange(pos.start, pos.start + value.length);
-		else this.setCaretPosition(pos.start + value.length);
-		return this;
-	},
-
-	insertAroundCursor: function(options, select){
-		options = Object.append({
-			before: '',
-			defaultMiddle: '',
-			after: ''
-		}, options);
-
-		var value = this.getSelectedText() || options.defaultMiddle;
-		var pos = this.getSelectedRange();
-		var text = this.get('value');
-
-		if (pos.start == pos.end){
-			this.set('value', text.substring(0, pos.start) + options.before + value + options.after + text.substring(pos.end, text.length));
-			this.selectRange(pos.start + options.before.length, pos.end + options.before.length + value.length);
-		} else {
-			var current = text.substring(pos.start, pos.end);
-			this.set('value', text.substring(0, pos.start) + options.before + current + options.after + text.substring(pos.end, text.length));
-			var selStart = pos.start + options.before.length;
-			if (select !== false) this.selectRange(selStart, selStart + current.length);
-			else this.setCaretPosition(selStart + text.length);
-		}
-		return this;
-	}
-
-});
-
-
-/*
----
-
-script: Elements.From.js
-
-name: Elements.From
-
-description: Returns a collection of elements from a string of html.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/String
-  - Core/Element
-  - /MooTools.More
-
-provides: [Elements.from, Elements.From]
-
-...
-*/
-
-Elements.from = function(text, excludeScripts){
-	if (excludeScripts || excludeScripts == null) text = text.stripScripts();
-
-	var container, match = text.match(/^\s*<(t[dhr]|tbody|tfoot|thead)/i);
-
-	if (match){
-		container = new Element('table');
-		var tag = match[1].toLowerCase();
-		if (['td', 'th', 'tr'].contains(tag)){
-			container = new Element('tbody').inject(container);
-			if (tag != 'tr') container = new Element('tr').inject(container);
-		}
-	}
-
-	return (container || new Element('div')).set('html', text).getChildren();
-};
-
-
-/*
----
-
-name: Events.Pseudos
-
-description: Adds the functionality to add pseudo events
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Core/Class.Extras, Core/Slick.Parser, More/MooTools.More]
-
-provides: [Events.Pseudos]
-
-...
-*/
-
-Events.Pseudos = function(pseudos, addEvent, removeEvent){
-
-	var storeKey = 'monitorEvents:';
-
-	var storageOf = function(object){
-		return {
-			store: object.store ? function(key, value){
-				object.store(storeKey + key, value);
-			} : function(key, value){
-				(object.$monitorEvents || (object.$monitorEvents = {}))[key] = value;
-			},
-			retrieve: object.retrieve ? function(key, dflt){
-				return object.retrieve(storeKey + key, dflt);
-			} : function(key, dflt){
-				if (!object.$monitorEvents) return dflt;
-				return object.$monitorEvents[key] || dflt;
-			}
-		};
-	};
-
-	var splitType = function(type){
-		if (type.indexOf(':') == -1 || !pseudos) return null;
-
-		var parsed = Slick.parse(type).expressions[0][0],
-			parsedPseudos = parsed.pseudos,
-			l = parsedPseudos.length,
-			splits = [];
-
-		while (l--) if (pseudos[parsedPseudos[l].key]){
-			splits.push({
-				event: parsed.tag,
-				value: parsedPseudos[l].value,
-				pseudo: parsedPseudos[l].key,
-				original: type
-			});
-		}
-
-		return splits.length ? splits : null;
-	};
-
-	var mergePseudoOptions = function(split){
-		return Object.merge.apply(this, split.map(function(item){
-			return pseudos[item.pseudo].options || {};
-		}));
-	};
-
-	return {
-
-		addEvent: function(type, fn, internal){
-			var split = splitType(type);
-			if (!split) return addEvent.call(this, type, fn, internal);
-
-			var storage = storageOf(this),
-				events = storage.retrieve(type, []),
-				eventType = split[0].event,
-				options = mergePseudoOptions(split),
-				stack = fn,
-				eventOptions = options[eventType] || {},
-				args = Array.slice(arguments, 2),
-				self = this,
-				monitor;
-
-			if (eventOptions.args) args.append(Array.from(eventOptions.args));
-			if (eventOptions.base) eventType = eventOptions.base;
-			if (eventOptions.onAdd) eventOptions.onAdd(this);
-
-			split.each(function(item){
-				var stackFn = stack;
-				stack = function(){
-					(eventOptions.listener || pseudos[item.pseudo].listener).call(self, item, stackFn, arguments, monitor, options);
-				};
-			});
-			monitor = stack.bind(this);
-
-			events.include({event: fn, monitor: monitor});
-			storage.store(type, events);
-
-			addEvent.apply(this, [type, fn].concat(args));
-			return addEvent.apply(this, [eventType, monitor].concat(args));
-		},
-
-		removeEvent: function(type, fn){
-			var split = splitType(type);
-			if (!split) return removeEvent.call(this, type, fn);
-
-			var storage = storageOf(this),
-				events = storage.retrieve(type);
-			if (!events) return this;
-
-			var eventType = split[0].event,
-				options = mergePseudoOptions(split),
-				eventOptions = options[eventType] || {},
-				args = Array.slice(arguments, 2);
-
-			if (eventOptions.args) args.append(Array.from(eventOptions.args));
-			if (eventOptions.base) eventType = eventOptions.base;
-			if (eventOptions.onRemove) eventOptions.onRemove(this);
-
-			removeEvent.apply(this, [type, fn].concat(args));
-			events.each(function(monitor, i){
-				if (!fn || monitor.event == fn) removeEvent.apply(this, [eventType, monitor.monitor].concat(args));
-				delete events[i];
-			}, this);
-
-			storage.store(type, events);
-			return this;
-		}
-
-	};
-
-};
-
-(function(){
-
-var pseudos = {
-
-	once: {
-		listener: function(split, fn, args, monitor){
-			fn.apply(this, args);
-			this.removeEvent(split.event, monitor)
-				.removeEvent(split.original, fn);
-		}
-	},
-
-	throttle: {
-		listener: function(split, fn, args){
-			if (!fn._throttled){
-				fn.apply(this, args);
-				fn._throttled = setTimeout(function(){
-					fn._throttled = false;
-				}, split.value || 250);
-			}
-		}
-	},
-
-	pause: {
-		listener: function(split, fn, args){
-			clearTimeout(fn._pause);
-			fn._pause = fn.delay(split.value || 250, this, args);
-		}
-	}
-
-};
-
-Events.definePseudo = function(key, listener){
-	pseudos[key] = Type.isFunction(listener) ? {listener: listener} : listener;
-	return this;
-};
-
-Events.lookupPseudo = function(key){
-	return pseudos[key];
-};
-
-var proto = Events.prototype;
-Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
-
-['Request', 'Fx'].each(function(klass){
-	if (this[klass]) this[klass].implement(Events.prototype);
-});
-
-})();
-
-
-/*
----
-
-name: Element.Event.Pseudos
-
-description: Adds the functionality to add pseudo events for Elements
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Core/Element.Event, Events.Pseudos]
-
-provides: [Element.Event.Pseudos]
-
-...
-*/
-
-(function(){
-
-var pseudos = {},
-	copyFromEvents = ['once', 'throttle', 'pause'],
-	count = copyFromEvents.length;
-
-while (count--) pseudos[copyFromEvents[count]] = Events.lookupPseudo(copyFromEvents[count]);
-
-Event.definePseudo = function(key, listener){
-	pseudos[key] = Type.isFunction(listener) ? {listener: listener} : listener;
-	return this;
-};
-
-var proto = Element.prototype;
-[Element, Window, Document].invoke('implement', Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
-
-})();
-
-
-/*
----
-
-name: Element.Event.Pseudos.Keys
-
-description: Adds functionality fire events if certain keycombinations are pressed
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Element.Event.Pseudos]
-
-provides: [Element.Event.Pseudos.Keys]
-
-...
-*/
-
-(function(){
-
-var keysStoreKey = '$moo:keys-pressed',
-	keysKeyupStoreKey = '$moo:keys-keyup';
-
-
-Event.definePseudo('keys', function(split, fn, args){
-
-	var event = args[0],
-		keys = [],
-		pressed = this.retrieve(keysStoreKey, []);
-
-	keys.append(split.value.replace('++', function(){
-		keys.push('+'); // shift++ and shift+++a
-		return '';
-	}).split('+'));
-
-	pressed.include(event.key);
-
-	if (keys.every(function(key){
-		return pressed.contains(key);
-	})) fn.apply(this, args);
-
-	this.store(keysStoreKey, pressed);
-
-	if (!this.retrieve(keysKeyupStoreKey)){
-		var keyup = function(event){
-			(function(){
-				pressed = this.retrieve(keysStoreKey, []).erase(event.key);
-				this.store(keysStoreKey, pressed);
-			}).delay(0, this); // Fix for IE
-		};
-		this.store(keysKeyupStoreKey, keyup).addEvent('keyup', keyup);
-	}
-
-});
-
-Object.append(Event.Keys, {
-	'shift': 16,
-	'control': 17,
-	'alt': 18,
-	'capslock': 20,
-	'pageup': 33,
-	'pagedown': 34,
-	'end': 35,
-	'home': 36,
-	'numlock': 144,
-	'scrolllock': 145,
-	';': 186,
-	'=': 187,
-	',': 188,
-	'-': Browser.firefox ? 109 : 189,
-	'.': 190,
-	'/': 191,
-	'`': 192,
-	'[': 219,
-	'\\': 220,
-	']': 221,
-	"'": 222,
-	'+': 107
-});
-
-})();
-
-
-/*
----
-
-script: Element.Pin.js
-
-name: Element.Pin
-
-description: Extends the Element native object to include the pin method useful for fixed positioning for elements.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - Core/Element.Style
-  - /MooTools.More
-
-provides: [Element.Pin]
-
-...
-*/
-
-(function(){
-	var supportsPositionFixed = false,
-		supportTested = false;
-
-	var testPositionFixed = function(){
-		var test = new Element('div').setStyles({
-			position: 'fixed',
-			top: 0,
-			right: 0
-		}).inject(document.body);
-		supportsPositionFixed = (test.offsetTop === 0);
-		test.dispose();
-		supportTested = true;
-	};
-
-	Element.implement({
-
-		pin: function(enable, forceScroll){
-			if (!supportTested) testPositionFixed();
-			if (this.getStyle('display') == 'none') return this;
-
-			var pinnedPosition,
-				scroll = window.getScroll(),
-				parent,
-				scrollFixer;
-
-			if (enable !== false){
-				pinnedPosition = this.getPosition(supportsPositionFixed ? document.body : this.getOffsetParent());
-				if (!this.retrieve('pin:_pinned')){
-					var currentPosition = {
-						top: pinnedPosition.y - scroll.y,
-						left: pinnedPosition.x - scroll.x
-					};
-
-					if (supportsPositionFixed && !forceScroll){
-						this.setStyle('position', 'fixed').setStyles(currentPosition);
-					} else {
-
-						parent = this.getOffsetParent();
-						var position = this.getPosition(parent),
-							styles = this.getStyles('left', 'top');
-
-						if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
-						if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
-
-						position = {
-							x: styles.left.toInt() - scroll.x,
-							y: styles.top.toInt() - scroll.y
-						};
-
-						scrollFixer = function(){
-							if (!this.retrieve('pin:_pinned')) return;
-							var scroll = window.getScroll();
-							this.setStyles({
-								left: position.x + scroll.x,
-								top: position.y + scroll.y
-							});
-						}.bind(this);
-
-						this.store('pin:_scrollFixer', scrollFixer);
-						window.addEvent('scroll', scrollFixer);
-					}
-					this.store('pin:_pinned', true);
-				}
-
-			} else {
-				if (!this.retrieve('pin:_pinned')) return this;
-
-				parent = this.getParent();
-				var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
-
-				pinnedPosition = this.getPosition(offsetParent);
-
-				this.store('pin:_pinned', false);
-				scrollFixer = this.retrieve('pin:_scrollFixer');
-				if (!scrollFixer){
-					this.setStyles({
-						position: 'absolute',
-						top: pinnedPosition.y + scroll.y,
-						left: pinnedPosition.x + scroll.x
-					});
-				} else {
-					this.store('pin:_scrollFixer', null);
-					window.removeEvent('scroll', scrollFixer);
-				}
-				this.removeClass('isPinned');
-			}
-			return this;
-		},
-
-		unpin: function(){
-			return this.pin(false);
-		},
-
-		togglePin: function(){
-			return this.pin(!this.retrieve('pin:_pinned'));
-		}
-
-	});
-
-
-
-})();
-
-
-/*
----
-
-script: Element.Measure.js
-
-name: Element.Measure
-
-description: Extends the Element native object to include methods useful in measuring dimensions.
-
-credits: "Element.measure / .expose methods by Daniel Steigerwald License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - /MooTools.More
-
-provides: [Element.Measure]
-
-...
-*/
-
-(function(){
-
-var getStylesList = function(styles, planes){
-	var list = [];
-	Object.each(planes, function(directions){
-		Object.each(directions, function(edge){
-			styles.each(function(style){
-				list.push(style + '-' + edge + (style == 'border' ? '-width' : ''));
-			});
-		});
-	});
-	return list;
-};
-
-var calculateEdgeSize = function(edge, styles){
-	var total = 0;
-	Object.each(styles, function(value, style){
-		if (style.test(edge)) total = total + value.toInt();
-	});
-	return total;
-};
-
-var isVisible = function(el){
-	return !!(!el || el.offsetHeight || el.offsetWidth);
-};
-
-
-Element.implement({
-
-	measure: function(fn){
-		if (isVisible(this)) return fn.call(this);
-		var parent = this.getParent(),
-			toMeasure = [];
-		while (!isVisible(parent) && parent != document.body){
-			toMeasure.push(parent.expose());
-			parent = parent.getParent();
-		}
-		var restore = this.expose(),
-			result = fn.call(this);
-		restore();
-		toMeasure.each(function(restore){
-			restore();
-		});
-		return result;
-	},
-
-	expose: function(){
-		if (this.getStyle('display') != 'none') return function(){};
-		var before = this.style.cssText;
-		this.setStyles({
-			display: 'block',
-			position: 'absolute',
-			visibility: 'hidden'
-		});
-		return function(){
-			this.style.cssText = before;
-		}.bind(this);
-	},
-
-	getDimensions: function(options){
-		options = Object.merge({computeSize: false}, options);
-		var dim = {x: 0, y: 0};
-
-		var getSize = function(el, options){
-			return (options.computeSize) ? el.getComputedSize(options) : el.getSize();
-		};
-
-		var parent = this.getParent('body');
-
-		if (parent && this.getStyle('display') == 'none'){
-			dim = this.measure(function(){
-				return getSize(this, options);
-			});
-		} else if (parent){
-			try { //safari sometimes crashes here, so catch it
-				dim = getSize(this, options);
-			}catch(e){}
-		}
-
-		return Object.append(dim, (dim.x || dim.x === 0) ? {
-				width: dim.x,
-				height: dim.y
-			} : {
-				x: dim.width,
-				y: dim.height
-			}
-		);
-	},
-
-	getComputedSize: function(options){
-		
-
-		options = Object.merge({
-			styles: ['padding','border'],
-			planes: {
-				height: ['top','bottom'],
-				width: ['left','right']
-			},
-			mode: 'both'
-		}, options);
-
-		var styles = {},
-			size = {width: 0, height: 0},
-			dimensions;
-
-		if (options.mode == 'vertical'){
-			delete size.width;
-			delete options.planes.width;
-		} else if (options.mode == 'horizontal'){
-			delete size.height;
-			delete options.planes.height;
-		}
-
-		getStylesList(options.styles, options.planes).each(function(style){
-			styles[style] = this.getStyle(style).toInt();
-		}, this);
-
-		Object.each(options.planes, function(edges, plane){
-
-			var capitalized = plane.capitalize(),
-				style = this.getStyle(plane);
-
-			if (style == 'auto' && !dimensions) dimensions = this.getDimensions();
-
-			style = styles[plane] = (style == 'auto') ? dimensions[plane] : style.toInt();
-			size['total' + capitalized] = style;
-
-			edges.each(function(edge){
-				var edgesize = calculateEdgeSize(edge, styles);
-				size['computed' + edge.capitalize()] = edgesize;
-				size['total' + capitalized] += edgesize;
-			});
-
-		}, this);
-
-		return Object.append(size, styles);
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Element.Position.js
-
-name: Element.Position
-
-description: Extends the Element native object to include methods useful positioning elements relative to others.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Jacob Thornton
-
-requires:
-  - Core/Options
-  - Core/Element.Dimensions
-  - Element.Measure
-
-provides: [Element.Position]
-
-...
-*/
-
-(function(original){
-
-var local = Element.Position = {
-
-	options: {/*
-		edge: false,
-		returnPos: false,
-		minimum: {x: 0, y: 0},
-		maximum: {x: 0, y: 0},
-		relFixedPosition: false,
-		ignoreMargins: false,
-		ignoreScroll: false,
-		allowNegative: false,*/
-		relativeTo: document.body,
-		position: {
-			x: 'center', //left, center, right
-			y: 'center' //top, center, bottom
-		},
-		offset: {x: 0, y: 0}
-	},
-
-	getOptions: function(element, options){
-		options = Object.merge({}, local.options, options);
-		local.setPositionOption(options);
-		local.setEdgeOption(options);
-		local.setOffsetOption(element, options);
-		local.setDimensionsOption(element, options);
-		return options;
-	},
-
-	setPositionOption: function(options){
-		options.position = local.getCoordinateFromValue(options.position);
-	},
-
-	setEdgeOption: function(options){
-		var edgeOption = local.getCoordinateFromValue(options.edge);
-		options.edge = edgeOption ? edgeOption :
-			(options.position.x == 'center' && options.position.y == 'center') ? {x: 'center', y: 'center'} :
-			{x: 'left', y: 'top'};
-	},
-
-	setOffsetOption: function(element, options){
-		var parentOffset = {x: 0, y: 0},
-			offsetParent = element.measure(function(){
-				return document.id(this.getOffsetParent());
-			}),
-			parentScroll = offsetParent.getScroll();
-
-		if (!offsetParent || offsetParent == element.getDocument().body) return;
-		parentOffset = offsetParent.measure(function(){
-			var position = this.getPosition();
-			if (this.getStyle('position') == 'fixed'){
-				var scroll = window.getScroll();
-				position.x += scroll.x;
-				position.y += scroll.y;
-			}
-			return position;
-		});
-
-		options.offset = {
-			parentPositioned: offsetParent != document.id(options.relativeTo),
-			x: options.offset.x - parentOffset.x + parentScroll.x,
-			y: options.offset.y - parentOffset.y + parentScroll.y
-		};
-	},
-
-	setDimensionsOption: function(element, options){
-		options.dimensions = element.getDimensions({
-			computeSize: true,
-			styles: ['padding', 'border', 'margin']
-		});
-	},
-
-	getPosition: function(element, options){
-		var position = {};
-		options = local.getOptions(element, options);
-		var relativeTo = document.id(options.relativeTo) || document.body;
-
-		local.setPositionCoordinates(options, position, relativeTo);
-		if (options.edge) local.toEdge(position, options);
-
-		var offset = options.offset;
-		position.left = ((position.x >= 0 || offset.parentPositioned || options.allowNegative) ? position.x : 0).toInt();
-		position.top = ((position.y >= 0 || offset.parentPositioned || options.allowNegative) ? position.y : 0).toInt();
-
-		local.toMinMax(position, options);
-
-		if (options.relFixedPosition || relativeTo.getStyle('position') == 'fixed') local.toRelFixedPosition(relativeTo, position);
-		if (options.ignoreScroll) local.toIgnoreScroll(relativeTo, position);
-		if (options.ignoreMargins) local.toIgnoreMargins(position, options);
-
-		position.left = Math.ceil(position.left);
-		position.top = Math.ceil(position.top);
-		delete position.x;
-		delete position.y;
-
-		return position;
-	},
-
-	setPositionCoordinates: function(options, position, relativeTo){
-		var offsetY = options.offset.y,
-			offsetX = options.offset.x,
-			calc = (relativeTo == document.body) ? window.getScroll() : relativeTo.getPosition(),
-			top = calc.y,
-			left = calc.x,
-			winSize = window.getSize();
-
-		switch(options.position.x){
-			case 'left': position.x = left + offsetX; break;
-			case 'right': position.x = left + offsetX + relativeTo.offsetWidth; break;
-			default: position.x = left + ((relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2) + offsetX; break;
-		}
-
-		switch(options.position.y){
-			case 'top': position.y = top + offsetY; break;
-			case 'bottom': position.y = top + offsetY + relativeTo.offsetHeight; break;
-			default: position.y = top + ((relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2) + offsetY; break;
-		}
-	},
-
-	toMinMax: function(position, options){
-		var xy = {left: 'x', top: 'y'}, value;
-		['minimum', 'maximum'].each(function(minmax){
-			['left', 'top'].each(function(lr){
-				value = options[minmax] ? options[minmax][xy[lr]] : null;
-				if (value != null && ((minmax == 'minimum') ? position[lr] < value : position[lr] > value)) position[lr] = value;
-			});
-		});
-	},
-
-	toRelFixedPosition: function(relativeTo, position){
-		var winScroll = window.getScroll();
-		position.top += winScroll.y;
-		position.left += winScroll.x;
-	},
-
-	toIgnoreScroll: function(relativeTo, position){
-		var relScroll = relativeTo.getScroll();
-		position.top -= relScroll.y;
-		position.left -= relScroll.x;
-	},
-
-	toIgnoreMargins: function(position, options){
-		position.left += options.edge.x == 'right'
-			? options.dimensions['margin-right']
-			: (options.edge.x != 'center'
-				? -options.dimensions['margin-left']
-				: -options.dimensions['margin-left'] + ((options.dimensions['margin-right'] + options.dimensions['margin-left']) / 2));
-
-		position.top += options.edge.y == 'bottom'
-			? options.dimensions['margin-bottom']
-			: (options.edge.y != 'center'
-				? -options.dimensions['margin-top']
-				: -options.dimensions['margin-top'] + ((options.dimensions['margin-bottom'] + options.dimensions['margin-top']) / 2));
-	},
-
-	toEdge: function(position, options){
-		var edgeOffset = {},
-			dimensions = options.dimensions,
-			edge = options.edge;
-
-		switch(edge.x){
-			case 'left': edgeOffset.x = 0; break;
-			case 'right': edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft; break;
-			// center
-			default: edgeOffset.x = -(Math.round(dimensions.totalWidth / 2)); break;
-		}
-
-		switch(edge.y){
-			case 'top': edgeOffset.y = 0; break;
-			case 'bottom': edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom; break;
-			// center
-			default: edgeOffset.y = -(Math.round(dimensions.totalHeight / 2)); break;
-		}
-
-		position.x += edgeOffset.x;
-		position.y += edgeOffset.y;
-	},
-
-	getCoordinateFromValue: function(option){
-		if (typeOf(option) != 'string') return option;
-		option = option.toLowerCase();
-
-		return {
-			x: option.test('left') ? 'left'
-				: (option.test('right') ? 'right' : 'center'),
-			y: option.test(/upper|top/) ? 'top'
-				: (option.test('bottom') ? 'bottom' : 'center')
-		};
-	}
-
-};
-
-Element.implement({
-
-	position: function(options){
-		if (options && (options.x != null || options.y != null)) {
-			return (original ? original.apply(this, arguments) : this);
-		}
-		var position = this.setStyle('position', 'absolute').calculatePosition(options);
-		return (options && options.returnPos) ? position : this.setStyles(position);
-	},
-
-	calculatePosition: function(options){
-		return local.getPosition(this, options);
-	}
-
-});
-
-})(Element.prototype.position);
-
-
-/*
----
-
-script: Element.Shortcuts.js
-
-name: Element.Shortcuts
-
-description: Extends the Element native object to include some shortcut methods.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Style
-  - /MooTools.More
-
-provides: [Element.Shortcuts]
-
-...
-*/
-
-Element.implement({
-
-	isDisplayed: function(){
-		return this.getStyle('display') != 'none';
-	},
-
-	isVisible: function(){
-		var w = this.offsetWidth,
-			h = this.offsetHeight;
-		return (w == 0 && h == 0) ? false : (w > 0 && h > 0) ? true : this.style.display != 'none';
-	},
-
-	toggle: function(){
-		return this[this.isDisplayed() ? 'hide' : 'show']();
-	},
-
-	hide: function(){
-		var d;
-		try {
-			//IE fails here if the element is not in the dom
-			d = this.getStyle('display');
-		} catch(e){}
-		if (d == 'none') return this;
-		return this.store('element:_originalDisplay', d || '').setStyle('display', 'none');
-	},
-
-	show: function(display){
-		if (!display && this.isDisplayed()) return this;
-		display = display || this.retrieve('element:_originalDisplay') || 'block';
-		return this.setStyle('display', (display == 'none') ? 'block' : display);
-	},
-
-	swapClass: function(remove, add){
-		return this.removeClass(remove).addClass(add);
-	}
-
-});
-
-Document.implement({
-
-	clearSelection: function(){
-		if (window.getSelection){
-			var selection = window.getSelection();
-			if (selection && selection.removeAllRanges) selection.removeAllRanges();
-		} else if (document.selection && document.selection.empty){
-			try {
-				//IE fails here if selected element is not in dom
-				document.selection.empty();
-			} catch(e){}
-		}
-	}
-
-});
-
-
-/*
----
-
-script: Class.Binds.js
-
-name: Class.Binds
-
-description: Automagically binds specified methods in a class to the instance of the class.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - /MooTools.More
-
-provides: [Class.Binds]
-
-...
-*/
-
-Class.Mutators.Binds = function(binds){
-	if (!this.prototype.initialize) this.implement('initialize', function(){});
-	return Array.from(binds).concat(this.prototype.Binds || []);
-};
-
-Class.Mutators.initialize = function(initialize){
-	return function(){
-		Array.from(this.Binds).each(function(name){
-			var original = this[name];
-			if (original) this[name] = original.bind(this);
-		}, this);
-		return initialize.apply(this, arguments);
-	};
-};
-
-
-/*
----
-
-script: Class.Occlude.js
-
-name: Class.Occlude
-
-description: Prevents a class from being applied to a DOM element twice.
-
-license: MIT-style license.
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - Core/Element
-  - /MooTools.More
-
-provides: [Class.Occlude]
-
-...
-*/
-
-Class.Occlude = new Class({
-
-	occlude: function(property, element){
-		element = document.id(element || this.element);
-		var instance = element.retrieve(property || this.property);
-		if (instance && !this.occluded)
-			return (this.occluded = instance);
-
-		this.occluded = false;
-		element.store(property || this.property, this);
-		return this.occluded;
-	}
-
-});
-
-
-/*
----
-
-script: IframeShim.js
-
-name: IframeShim
-
-description: Defines IframeShim, a class for obscuring select lists and flash objects in IE.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/Options
-  - Core/Events
-  - /Element.Position
-  - /Class.Occlude
-
-provides: [IframeShim]
-
-...
-*/
-
-var IframeShim = new Class({
-
-	Implements: [Options, Events, Class.Occlude],
-
-	options: {
-		className: 'iframeShim',
-		src: 'javascript:false;document.write("");',
-		display: false,
-		zIndex: null,
-		margin: 0,
-		offset: {x: 0, y: 0},
-		browsers: (Browser.ie6 || (Browser.firefox && Browser.version < 3 && Browser.Platform.mac))
-	},
-
-	property: 'IframeShim',
-
-	initialize: function(element, options){
-		this.element = document.id(element);
-		if (this.occlude()) return this.occluded;
-		this.setOptions(options);
-		this.makeShim();
-		return this;
-	},
-
-	makeShim: function(){
-		if (this.options.browsers){
-			var zIndex = this.element.getStyle('zIndex').toInt();
-
-			if (!zIndex){
-				zIndex = 1;
-				var pos = this.element.getStyle('position');
-				if (pos == 'static' || !pos) this.element.setStyle('position', 'relative');
-				this.element.setStyle('zIndex', zIndex);
-			}
-			zIndex = ((this.options.zIndex != null || this.options.zIndex === 0) && zIndex > this.options.zIndex) ? this.options.zIndex : zIndex - 1;
-			if (zIndex < 0) zIndex = 1;
-			this.shim = new Element('iframe', {
-				src: this.options.src,
-				scrolling: 'no',
-				frameborder: 0,
-				styles: {
-					zIndex: zIndex,
-					position: 'absolute',
-					border: 'none',
-					filter: 'progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)'
-				},
-				'class': this.options.className
-			}).store('IframeShim', this);
-			var inject = (function(){
-				this.shim.inject(this.element, 'after');
-				this[this.options.display ? 'show' : 'hide']();
-				this.fireEvent('inject');
-			}).bind(this);
-			if (!IframeShim.ready) window.addEvent('load', inject);
-			else inject();
-		} else {
-			this.position = this.hide = this.show = this.dispose = Function.from(this);
-		}
-	},
-
-	position: function(){
-		if (!IframeShim.ready || !this.shim) return this;
-		var size = this.element.measure(function(){
-			return this.getSize();
-		});
-		if (this.options.margin != undefined){
-			size.x = size.x - (this.options.margin * 2);
-			size.y = size.y - (this.options.margin * 2);
-			this.options.offset.x += this.options.margin;
-			this.options.offset.y += this.options.margin;
-		}
-		this.shim.set({width: size.x, height: size.y}).position({
-			relativeTo: this.element,
-			offset: this.options.offset
-		});
-		return this;
-	},
-
-	hide: function(){
-		if (this.shim) this.shim.setStyle('display', 'none');
-		return this;
-	},
-
-	show: function(){
-		if (this.shim) this.shim.setStyle('display', 'block');
-		return this.position();
-	},
-
-	dispose: function(){
-		if (this.shim) this.shim.dispose();
-		return this;
-	},
-
-	destroy: function(){
-		if (this.shim) this.shim.destroy();
-		return this;
-	}
-
-});
-
-window.addEvent('load', function(){
-	IframeShim.ready = true;
-});
-
-
-/*
----
-
-script: Mask.js
-
-name: Mask
-
-description: Creates a mask element to cover another.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Event
-  - /Class.Binds
-  - /Element.Position
-  - /IframeShim
-
-provides: [Mask]
-
-...
-*/
-
-var Mask = new Class({
-
-	Implements: [Options, Events],
-
-	Binds: ['position'],
-
-	options: {/*
-		onShow: function(){},
-		onHide: function(){},
-		onDestroy: function(){},
-		onClick: function(event){},
-		inject: {
-			where: 'after',
-			target: null,
-		},
-		hideOnClick: false,
-		id: null,
-		destroyOnHide: false,*/
-		style: {},
-		'class': 'mask',
-		maskMargins: false,
-		useIframeShim: true,
-		iframeShimOptions: {}
-	},
-
-	initialize: function(target, options){
-		this.target = document.id(target) || document.id(document.body);
-		this.target.store('mask', this);
-		this.setOptions(options);
-		this.render();
-		this.inject();
-	},
-
-	render: function(){
-		this.element = new Element('div', {
-			'class': this.options['class'],
-			id: this.options.id || 'mask-' + String.uniqueID(),
-			styles: Object.merge({}, this.options.style, {
-				display: 'none'
-			}),
-			events: {
-				click: function(event){
-					this.fireEvent('click', event);
-					if (this.options.hideOnClick) this.hide();
-				}.bind(this)
-			}
-		});
-
-		this.hidden = true;
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	inject: function(target, where){
-		where = where || (this.options.inject ? this.options.inject.where : '') || this.target == document.body ? 'inside' : 'after';
-		target = target || (this.options.inject && this.options.inject.target) || this.target;
-
-		this.element.inject(target, where);
-
-		if (this.options.useIframeShim){
-			this.shim = new IframeShim(this.element, this.options.iframeShimOptions);
-
-			this.addEvents({
-				show: this.shim.show.bind(this.shim),
-				hide: this.shim.hide.bind(this.shim),
-				destroy: this.shim.destroy.bind(this.shim)
-			});
-		}
-	},
-
-	position: function(){
-		this.resize(this.options.width, this.options.height);
-
-		this.element.position({
-			relativeTo: this.target,
-			position: 'topLeft',
-			ignoreMargins: !this.options.maskMargins,
-			ignoreScroll: this.target == document.body
-		});
-
-		return this;
-	},
-
-	resize: function(x, y){
-		var opt = {
-			styles: ['padding', 'border']
-		};
-		if (this.options.maskMargins) opt.styles.push('margin');
-
-		var dim = this.target.getComputedSize(opt);
-		if (this.target == document.body){
-			this.element.setStyles({width: 0, height: 0});
-			var win = window.getScrollSize();
-			if (dim.totalHeight < win.y) dim.totalHeight = win.y;
-			if (dim.totalWidth < win.x) dim.totalWidth = win.x;
-		}
-		this.element.setStyles({
-			width: Array.pick([x, dim.totalWidth, dim.x]),
-			height: Array.pick([y, dim.totalHeight, dim.y])
-		});
-
-		return this;
-	},
-
-	show: function(){
-		if (!this.hidden) return this;
-
-		window.addEvent('resize', this.position);
-		this.position();
-		this.showMask.apply(this, arguments);
-
-		return this;
-	},
-
-	showMask: function(){
-		this.element.setStyle('display', 'block');
-		this.hidden = false;
-		this.fireEvent('show');
-	},
-
-	hide: function(){
-		if (this.hidden) return this;
-
-		window.removeEvent('resize', this.position);
-		this.hideMask.apply(this, arguments);
-		if (this.options.destroyOnHide) return this.destroy();
-
-		return this;
-	},
-
-	hideMask: function(){
-		this.element.setStyle('display', 'none');
-		this.hidden = true;
-		this.fireEvent('hide');
-	},
-
-	toggle: function(){
-		this[this.hidden ? 'show' : 'hide']();
-	},
-
-	destroy: function(){
-		this.hide();
-		this.element.destroy();
-		this.fireEvent('destroy');
-		this.target.eliminate('mask');
-	}
-
-});
-
-Element.Properties.mask = {
-
-	set: function(options){
-		var mask = this.retrieve('mask');
-		if (mask) mask.destroy();
-		return this.eliminate('mask').store('mask:options', options);
-	},
-
-	get: function(){
-		var mask = this.retrieve('mask');
-		if (!mask){
-			mask = new Mask(this, this.retrieve('mask:options'));
-			this.store('mask', mask);
-		}
-		return mask;
-	}
-
-};
-
-Element.implement({
-
-	mask: function(options){
-		if (options) this.set('mask', options);
-		this.get('mask').show();
-		return this;
-	},
-
-	unmask: function(){
-		this.get('mask').hide();
-		return this;
-	}
-
-});
-
-
-/*
----
-
-script: Spinner.js
-
-name: Spinner
-
-description: Adds a semi-transparent overlay over a dom element with a spinnin ajax icon.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Fx.Tween
-  - Core/Request
-  - /Class.refactor
-  - /Mask
-
-provides: [Spinner]
-
-...
-*/
-
-var Spinner = new Class({
-
-	Extends: Mask,
-
-	Implements: Chain,
-
-	options: {/*
-		message: false,*/
-		'class': 'spinner',
-		containerPosition: {},
-		content: {
-			'class': 'spinner-content'
-		},
-		messageContainer: {
-			'class': 'spinner-msg'
-		},
-		img: {
-			'class': 'spinner-img'
-		},
-		fxOptions: {
-			link: 'chain'
-		}
-	},
-
-	initialize: function(target, options){
-		this.target = document.id(target) || document.id(document.body);
-		this.target.store('spinner', this);
-		this.setOptions(options);
-		this.render();
-		this.inject();
-
-		// Add this to events for when noFx is true; parent methods handle hide/show.
-		var deactivate = function(){ this.active = false; }.bind(this);
-		this.addEvents({
-			hide: deactivate,
-			show: deactivate
-		});
-	},
-
-	render: function(){
-		this.parent();
-
-		this.element.set('id', this.options.id || 'spinner-' + String.uniqueID());
-
-		this.content = document.id(this.options.content) || new Element('div', this.options.content);
-		this.content.inject(this.element);
-
-		if (this.options.message){
-			this.msg = document.id(this.options.message) || new Element('p', this.options.messageContainer).appendText(this.options.message);
-			this.msg.inject(this.content);
-		}
-
-		if (this.options.img){
-			this.img = document.id(this.options.img) || new Element('div', this.options.img);
-			this.img.inject(this.content);
-		}
-
-		this.element.set('tween', this.options.fxOptions);
-	},
-
-	show: function(noFx){
-		if (this.active) return this.chain(this.show.bind(this));
-		if (!this.hidden){
-			this.callChain.delay(20, this);
-			return this;
-		}
-
-		this.active = true;
-
-		return this.parent(noFx);
-	},
-
-	showMask: function(noFx){
-		var pos = function(){
-			this.content.position(Object.merge({
-				relativeTo: this.element
-			}, this.options.containerPosition));
-		}.bind(this);
-
-		if (noFx){
-			this.parent();
-			pos();
-		} else {
-			if (!this.options.style.opacity) this.options.style.opacity = this.element.getStyle('opacity').toFloat();
-			this.element.setStyles({
-				display: 'block',
-				opacity: 0
-			}).tween('opacity', this.options.style.opacity);
-			pos();
-			this.hidden = false;
-			this.fireEvent('show');
-			this.callChain();
-		}
-	},
-
-	hide: function(noFx){
-		if (this.active) return this.chain(this.hide.bind(this));
-		if (this.hidden){
-			this.callChain.delay(20, this);
-			return this;
-		}
-		this.active = true;
-		return this.parent(noFx);
-	},
-
-	hideMask: function(noFx){
-		if (noFx) return this.parent();
-		this.element.tween('opacity', 0).get('tween').chain(function(){
-			this.element.setStyle('display', 'none');
-			this.hidden = true;
-			this.fireEvent('hide');
-			this.callChain();
-		}.bind(this));
-	},
-
-	destroy: function(){
-		this.content.destroy();
-		this.parent();
-		this.target.eliminate('spinner');
-	}
-
-});
-
-Request = Class.refactor(Request, {
-
-	options: {
-		useSpinner: false,
-		spinnerOptions: {},
-		spinnerTarget: false
-	},
-
-	initialize: function(options){
-		this._send = this.send;
-		this.send = function(options){
-			var spinner = this.getSpinner();
-			if (spinner) spinner.chain(this._send.pass(options, this)).show();
-			else this._send(options);
-			return this;
-		};
-		this.previous(options);
-	},
-
-	getSpinner: function(){
-		if (!this.spinner){
-			var update = document.id(this.options.spinnerTarget) || document.id(this.options.update);
-			if (this.options.useSpinner && update){
-				update.set('spinner', this.options.spinnerOptions);
-				var spinner = this.spinner = update.get('spinner');
-				['complete', 'exception', 'cancel'].each(function(event){
-					this.addEvent(event, spinner.hide.bind(spinner));
-				}, this);
-			}
-		}
-		return this.spinner;
-	}
-
-});
-
-Element.Properties.spinner = {
-
-	set: function(options){
-		var spinner = this.retrieve('spinner');
-		if (spinner) spinner.destroy();
-		return this.eliminate('spinner').store('spinner:options', options);
-	},
-
-	get: function(){
-		var spinner = this.retrieve('spinner');
-		if (!spinner){
-			spinner = new Spinner(this, this.retrieve('spinner:options'));
-			this.store('spinner', spinner);
-		}
-		return spinner;
-	}
-
-};
-
-Element.implement({
-
-	spin: function(options){
-		if (options) this.set('spinner', options);
-		this.get('spinner').show();
-		return this;
-	},
-
-	unspin: function(){
-		this.get('spinner').hide();
-		return this;
-	}
-
-});
-
-
-/*
----
-
-script: Element.Delegation.js
-
-name: Element.Delegation
-
-description: Extends the Element native object to include the delegate method for more efficient event management.
-
-credits:
-  - "Event checking based on the work of Daniel Steigerwald. License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Daniel Steigerwald
-
-requires: [/MooTools.More, Element.Event.Pseudos]
-
-provides: [Element.Delegation]
-
-...
-*/
-
-(function(){
-
-var eventListenerSupport = !(window.attachEvent && !window.addEventListener),
-	nativeEvents = Element.NativeEvents;
-
-nativeEvents.focusin = 2;
-nativeEvents.focusout = 2;
-
-var check = function(split, target, event){
-	var elementEvent = Element.Events[split.event], condition;
-	if (elementEvent) condition = elementEvent.condition;
-	return Slick.match(target, split.value) && (!condition || condition.call(target, event));
-};
-
-var bubbleUp = function(split, event, fn){
-	for (var target = event.target; target && target != this; target = document.id(target.parentNode)){
-		if (target && check(split, target, event)) return fn.call(target, event, target);
-	}
-};
-
-var formObserver = function(eventName){
-
-	var $delegationKey = '$delegation:';
-
-	return {
-		base: 'focusin',
-
-		onRemove: function(element){
-			element.retrieve($delegationKey + 'forms', []).each(function(el){
-				el.retrieve($delegationKey + 'listeners', []).each(function(listener){
-					el.removeEvent(eventName, listener);
-				});
-				el.eliminate($delegationKey + eventName + 'listeners')
-					.eliminate($delegationKey + eventName + 'originalFn');
-			});
-		},
-
-		listener: function(split, fn, args, monitor, options){
-			var event = args[0],
-				forms = this.retrieve($delegationKey + 'forms', []),
-				target = event.target,
-				form = (target.get('tag') == 'form') ? target : event.target.getParent('form');
-				
-			if (!form) return;
-				
-			var formEvents = form.retrieve($delegationKey + 'originalFn', []),
-				formListeners = form.retrieve($delegationKey + 'listeners', []),
-				self = this;
-
-			forms.include(form);
-			this.store($delegationKey + 'forms', forms);
-
-			if (!formEvents.contains(fn)){
-				var formListener = function(event){
-					bubbleUp.call(self, split, event, fn);
-				};
-				form.addEvent(eventName, formListener);
-
-				formEvents.push(fn);
-				formListeners.push(formListener);
-
-				form.store($delegationKey + eventName + 'originalFn', formEvents)
-					.store($delegationKey + eventName + 'listeners', formListeners);
-			}
-		}
-	};
-};
-
-var inputObserver = function(eventName){
-	return {
-		base: 'focusin',
-		listener: function(split, fn, args){
-			var events = {blur: function(){
-				this.removeEvents(events);
-			}}, self = this;
-			events[eventName] = function(event){
-				bubbleUp.call(self, split, event, fn);
-			};
-			args[0].target.addEvents(events);
-		}
-	};
-};
-
-var eventOptions = {
-	mouseenter: {
-		base: 'mouseover'
-	},
-	mouseleave: {
-		base: 'mouseout'
-	},
-	focus: {
-		base: 'focus' + (eventListenerSupport ? '' : 'in'),
-		args: [true]
-	},
-	blur: {
-		base: eventListenerSupport ? 'blur' : 'focusout',
-		args: [true]
-	}
-};
-
-if (!eventListenerSupport) Object.append(eventOptions, {
-	submit: formObserver('submit'),
-	reset: formObserver('reset'),
-	change: inputObserver('change'),
-	select: inputObserver('select')
-});
-
-Event.definePseudo('relay', {
-	listener: function(split, fn, args){
-		bubbleUp.call(this, split, args[0], fn);
-	},
-	options: eventOptions
-});
-
-})();
-
-
-/*
----
-
-script: Form.Request.js
-
-name: Form.Request
-
-description: Handles the basic functionality of submitting a form and updating a dom element with the result.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Request.HTML
-  - /Class.Binds
-  - /Class.Occlude
-  - /Spinner
-  - /String.QueryString
-  - /Element.Delegation
-
-provides: [Form.Request]
-
-...
-*/
-
-if (!window.Form) window.Form = {};
-
-(function(){
-
-	Form.Request = new Class({
-
-		Binds: ['onSubmit', 'onFormValidate'],
-
-		Implements: [Options, Events, Class.Occlude],
-
-		options: {/*
-			onFailure: function(){},
-			onSuccess: function(){}, // aliased to onComplete,
-			onSend: function(){}*/
-			requestOptions: {
-				evalScripts: true,
-				useSpinner: true,
-				emulation: false,
-				link: 'ignore'
-			},
-			sendButtonClicked: true,
-			extraData: {},
-			resetForm: true
-		},
-
-		property: 'form.request',
-
-		initialize: function(form, target, options){
-			this.element = document.id(form);
-			if (this.occlude()) return this.occluded;
-			this.setOptions(options)
-				.setTarget(target)
-				.attach();
-		},
-
-		setTarget: function(target){
-			this.target = document.id(target);
-			if (!this.request){
-				this.makeRequest();
-			} else {
-				this.request.setOptions({
-					update: this.target
-				});
-			}
-			return this;
-		},
-
-		toElement: function(){
-			return this.element;
-		},
-
-		makeRequest: function(){
-			var self = this;
-			this.request = new Request.HTML(Object.merge({
-					update: this.target,
-					emulation: false,
-					spinnerTarget: this.element,
-					method: this.element.get('method') || 'post'
-			}, this.options.requestOptions)).addEvents({
-				success: function(tree, elements, html, javascript){
-					['complete', 'success'].each(function(evt){
-						self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
-					});
-				},
-				failure: function(){
-					self.fireEvent('complete', arguments).fireEvent('failure', arguments);
-				},
-				exception: function(){
-					self.fireEvent('failure', arguments);
-				}
-			});
-			return this.attachReset();
-		},
-
-		attachReset: function(){
-			if (!this.options.resetForm) return this;
-			this.request.addEvent('success', function(){
-				Function.attempt(function(){
-					this.element.reset();
-				}.bind(this));
-				if (window.OverText) OverText.update();
-			}.bind(this));
-			return this;
-		},
-
-		attach: function(attach){
-			var method = (attach != false) ? 'addEvent' : 'removeEvent';
-			this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
-
-			var fv = this.element.retrieve('validator');
-			if (fv) fv[method]('onFormValidate', this.onFormValidate);
-			else this.element[method]('submit', this.onSubmit);
-
-			return this;
-		},
-
-		detach: function(){
-			return this.attach(false);
-		},
-
-		//public method
-		enable: function(){
-			return this.attach();
-		},
-
-		//public method
-		disable: function(){
-			return this.detach();
-		},
-
-		onFormValidate: function(valid, form, event){
-			//if there's no event, then this wasn't a submit event
-			if (!event) return;
-			var fv = this.element.retrieve('validator');
-			if (valid || (fv && !fv.options.stopOnFailure)){
-				event.stop();
-				this.send();
-			}
-		},
-
-		onSubmit: function(event){
-			var fv = this.element.retrieve('validator');
-			if (fv){
-				//form validator was created after Form.Request
-				this.element.removeEvent('submit', this.onSubmit);
-				fv.addEvent('onFormValidate', this.onFormValidate);
-				this.element.validate();
-				return;
-			}
-			if (event) event.stop();
-			this.send();
-		},
-
-		saveClickedButton: function(event, target){
-			var targetName = target.get('name');
-			if (!targetName || !this.options.sendButtonClicked) return;
-			this.options.extraData[targetName] = target.get('value') || true;
-			this.clickedCleaner = function(){
-				delete this.options.extraData[targetName];
-				this.clickedCleaner = function(){};
-			}.bind(this);
-		},
-
-		clickedCleaner: function(){},
-
-		send: function(){
-			var str = this.element.toQueryString().trim(),
-				data = Object.toQueryString(this.options.extraData);
-
-			if (str) str += "&" + data;
-			else str = data;
-
-			this.fireEvent('send', [this.element, str.parseQueryString()]);
-			this.request.send({
-				data: str,
-				url: this.options.requestOptions.url || this.element.get('action')
-			});
-			this.clickedCleaner();
-			return this;
-		}
-
-	});
-
-	Element.implement('formUpdate', function(update, options){
-		var fq = this.retrieve('form.request');
-		if (!fq) {
-			fq = new Form.Request(this, update, options);
-		} else {
-			if (update) fq.setTarget(update);
-			if (options) fq.setOptions(options).makeRequest();
-		}
-		fq.send();
-		return this;
-	});
-
-})();
-
-
-/*
----
-
-script: Fx.Reveal.js
-
-name: Fx.Reveal
-
-description: Defines Fx.Reveal, a class that shows and hides elements with a transition.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Fx.Morph
-  - /Element.Shortcuts
-  - /Element.Measure
-
-provides: [Fx.Reveal]
-
-...
-*/
-
-(function(){
-
-
-var hideTheseOf = function(object){
-	var hideThese = object.options.hideInputs;
-	if (window.OverText){
-		var otClasses = [null];
-		OverText.each(function(ot){
-			otClasses.include('.' + ot.options.labelClass);
-		});
-		if (otClasses) hideThese += otClasses.join(', ');
-	}
-	return (hideThese) ? object.element.getElements(hideThese) : null;
-};
-
-
-Fx.Reveal = new Class({
-
-	Extends: Fx.Morph,
-
-	options: {/*
-		onShow: function(thisElement){},
-		onHide: function(thisElement){},
-		onComplete: function(thisElement){},
-		heightOverride: null,
-		widthOverride: null,*/
-		link: 'cancel',
-		styles: ['padding', 'border', 'margin'],
-		transitionOpacity: !Browser.ie6,
-		mode: 'vertical',
-		display: function(){
-			return this.element.get('tag') != 'tr' ? 'block' : 'table-row';
-		},
-		opacity: 1,
-		hideInputs: Browser.ie ? 'select, input, textarea, object, embed' : null
-	},
-
-	dissolve: function(){
-		if (!this.hiding && !this.showing){
-			if (this.element.getStyle('display') != 'none'){
-				this.hiding = true;
-				this.showing = false;
-				this.hidden = true;
-				this.cssText = this.element.style.cssText;
-
-				var startStyles = this.element.getComputedSize({
-					styles: this.options.styles,
-					mode: this.options.mode
-				});
-				if (this.options.transitionOpacity) startStyles.opacity = this.options.opacity;
-
-				var zero = {};
-				Object.each(startStyles, function(style, name){
-					zero[name] = [style, 0];
-				});
-
-				this.element.setStyles({
-					display: Function.from(this.options.display).call(this),
-					overflow: 'hidden'
-				});
-
-				var hideThese = hideTheseOf(this);
-				if (hideThese) hideThese.setStyle('visibility', 'hidden');
-
-				this.$chain.unshift(function(){
-					if (this.hidden){
-						this.hiding = false;
-						this.element.style.cssText = this.cssText;
-						this.element.setStyle('display', 'none');
-						if (hideThese) hideThese.setStyle('visibility', 'visible');
-					}
-					this.fireEvent('hide', this.element);
-					this.callChain();
-				}.bind(this));
-
-				this.start(zero);
-			} else {
-				this.callChain.delay(10, this);
-				this.fireEvent('complete', this.element);
-				this.fireEvent('hide', this.element);
-			}
-		} else if (this.options.link == 'chain'){
-			this.chain(this.dissolve.bind(this));
-		} else if (this.options.link == 'cancel' && !this.hiding){
-			this.cancel();
-			this.dissolve();
-		}
-		return this;
-	},
-
-	reveal: function(){
-		if (!this.showing && !this.hiding){
-			if (this.element.getStyle('display') == 'none'){
-				this.hiding = false;
-				this.showing = true;
-				this.hidden = false;
-				this.cssText = this.element.style.cssText;
-
-				var startStyles;
-				this.element.measure(function(){
-					startStyles = this.element.getComputedSize({
-						styles: this.options.styles,
-						mode: this.options.mode
-					});
-				}.bind(this));
-				if (this.options.heightOverride != null) startStyles.height = this.options.heightOverride.toInt();
-				if (this.options.widthOverride != null) startStyles.width = this.options.widthOverride.toInt();
-				if (this.options.transitionOpacity){
-					this.element.setStyle('opacity', 0);
-					startStyles.opacity = this.options.opacity;
-				}
-
-				var zero = {
-					height: 0,
-					display: Function.from(this.options.display).call(this)
-				};
-				Object.each(startStyles, function(style, name){
-					zero[name] = 0;
-				});
-				zero.overflow = 'hidden';
-
-				this.element.setStyles(zero);
-
-				var hideThese = hideTheseOf(this);
-				if (hideThese) hideThese.setStyle('visibility', 'hidden');
-
-				this.$chain.unshift(function(){
-					this.element.style.cssText = this.cssText;
-					this.element.setStyle('display', Function.from(this.options.display).call(this));
-					if (!this.hidden) this.showing = false;
-					if (hideThese) hideThese.setStyle('visibility', 'visible');
-					this.callChain();
-					this.fireEvent('show', this.element);
-				}.bind(this));
-
-				this.start(startStyles);
-			} else {
-				this.callChain();
-				this.fireEvent('complete', this.element);
-				this.fireEvent('show', this.element);
-			}
-		} else if (this.options.link == 'chain'){
-			this.chain(this.reveal.bind(this));
-		} else if (this.options.link == 'cancel' && !this.showing){
-			this.cancel();
-			this.reveal();
-		}
-		return this;
-	},
-
-	toggle: function(){
-		if (this.element.getStyle('display') == 'none'){
-			this.reveal();
-		} else {
-			this.dissolve();
-		}
-		return this;
-	},
-
-	cancel: function(){
-		this.parent.apply(this, arguments);
-		if (this.cssText != null) this.element.style.cssText = this.cssText;
-		this.hiding = false;
-		this.showing = false;
-		return this;
-	}
-
-});
-
-Element.Properties.reveal = {
-
-	set: function(options){
-		this.get('reveal').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var reveal = this.retrieve('reveal');
-		if (!reveal){
-			reveal = new Fx.Reveal(this);
-			this.store('reveal', reveal);
-		}
-		return reveal;
-	}
-
-};
-
-Element.Properties.dissolve = Element.Properties.reveal;
-
-Element.implement({
-
-	reveal: function(options){
-		this.get('reveal').setOptions(options).reveal();
-		return this;
-	},
-
-	dissolve: function(options){
-		this.get('reveal').setOptions(options).dissolve();
-		return this;
-	},
-
-	nix: function(options){
-		var params = Array.link(arguments, {destroy: Type.isBoolean, options: Type.isObject});
-		this.get('reveal').setOptions(options).dissolve().chain(function(){
-			this[params.destroy ? 'destroy' : 'dispose']();
-		}.bind(this));
-		return this;
-	},
-
-	wink: function(){
-		var params = Array.link(arguments, {duration: Type.isNumber, options: Type.isObject});
-		var reveal = this.get('reveal').setOptions(params.options);
-		reveal.reveal().chain(function(){
-			(function(){
-				reveal.dissolve();
-			}).delay(params.duration || 2000);
-		});
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Form.Request.Append.js
-
-name: Form.Request.Append
-
-description: Handles the basic functionality of submitting a form and updating a dom element with the result. The result is appended to the DOM element instead of replacing its contents.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - /Form.Request
-  - /Fx.Reveal
-  - /Elements.from
-
-provides: [Form.Request.Append]
-
-...
-*/
-
-Form.Request.Append = new Class({
-
-	Extends: Form.Request,
-
-	options: {
-		//onBeforeEffect: function(){},
-		useReveal: true,
-		revealOptions: {},
-		inject: 'bottom'
-	},
-
-	makeRequest: function(){
-		this.request = new Request.HTML(Object.merge({
-				url: this.element.get('action'),
-				method: this.element.get('method') || 'post',
-				spinnerTarget: this.element
-			}, this.options.requestOptions, {
-				evalScripts: false
-			})
-		).addEvents({
-			success: function(tree, elements, html, javascript){
-				var container;
-				var kids = Elements.from(html);
-				if (kids.length == 1){
-					container = kids[0];
-				} else {
-					 container = new Element('div', {
-						styles: {
-							display: 'none'
-						}
-					}).adopt(kids);
-				}
-				container.inject(this.target, this.options.inject);
-				if (this.options.requestOptions.evalScripts) Browser.exec(javascript);
-				this.fireEvent('beforeEffect', container);
-				var finish = function(){
-					this.fireEvent('success', [container, this.target, tree, elements, html, javascript]);
-				}.bind(this);
-				if (this.options.useReveal){
-					container.set('reveal', this.options.revealOptions).get('reveal').chain(finish);
-					container.reveal();
-				} else {
-					finish();
-				}
-			}.bind(this),
-			failure: function(xhr){
-				this.fireEvent('failure', xhr);
-			}.bind(this)
-		});
-		this.attachReset();
-	}
-
-});
-
-
 /*
 ---
 
@@ -4447,7 +4467,7 @@ authors:
   - Aaron Newton
 
 requires:
-  - /Locale
+  - Locale
 
 provides: [Locale.en-US.Form.Validator]
 
@@ -4457,6 +4477,7 @@ provides: [Locale.en-US.Form.Validator]
 Locale.define('en-US', 'FormValidator', {
 
 	required: 'This field is required.',
+	length: 'Please enter {length} characters (you entered {elLength} characters)',
 	minLength: 'Please enter at least {minLength} characters (you entered {length} characters).',
 	maxLength: 'Please enter no more than {maxLength} characters (you entered {length} characters).',
 	integer: 'Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.',
@@ -4481,7 +4502,7 @@ Locale.define('en-US', 'FormValidator', {
 	match: 'This field needs to match the {matchName} field',
 	startDate: 'the start date',
 	endDate: 'the end date',
-	currendDate: 'the current date',
+	currentDate: 'the current date',
 	afterDate: 'The date should be the same or after {label}.',
 	beforeDate: 'The date should be the same or before {label}.',
 	startMonth: 'Please select a start month',
@@ -4490,7 +4511,6 @@ Locale.define('en-US', 'FormValidator', {
 
 });
 
-
 /*
 ---
 
@@ -4508,16 +4528,17 @@ authors:
 requires:
   - Core/Options
   - Core/Events
+  - Core/Element.Delegation
   - Core/Slick.Finder
   - Core/Element.Event
   - Core/Element.Style
   - Core/JSON
-  - /Locale
-  - /Class.Binds
-  - /Date
-  - /Element.Forms
-  - /Locale.en-US.Form.Validator
-  - /Element.Shortcuts
+  - Locale
+  - Class.Binds
+  - Date
+  - Element.Forms
+  - Locale.en-US.Form.Validator
+  - Element.Shortcuts
 
 provides: [Form.Validator, InputValidator, FormValidator.BaseValidators]
 
@@ -4577,7 +4598,7 @@ Element.Properties.validatorProps = {
 		if (this.retrieve('$moo:validatorProps')) return this.retrieve('$moo:validatorProps');
 		if (this.getProperty('data-validator-properties') || this.getProperty('validatorProps')){
 			try {
-				this.store('$moo:validatorProps', JSON.decode(this.getProperty('validatorProps') || this.getProperty('data-validator-properties')));
+				this.store('$moo:validatorProps', JSON.decode(this.getProperty('validatorProps') || this.getProperty('data-validator-properties'), false));
 			}catch(e){
 				return {};
 			}
@@ -4593,7 +4614,7 @@ Element.Properties.validatorProps = {
 					var split = cls.split(':');
 					if (split[1]){
 						try {
-							props[split[0]] = JSON.decode(split[1]);
+							props[split[0]] = JSON.decode(split[1], false);
 						} catch(e){}
 					}
 				});
@@ -4609,8 +4630,6 @@ Form.Validator = new Class({
 
 	Implements: [Options, Events],
 
-	Binds: ['onSubmit'],
-
 	options: {/*
 		onFormValidate: function(isValid, form, event){},
 		onElementValidate: function(isValid, field, className, warn){},
@@ -4636,11 +4655,15 @@ Form.Validator = new Class({
 	initialize: function(form, options){
 		this.setOptions(options);
 		this.element = document.id(form);
-		this.element.store('validator', this);
 		this.warningPrefix = Function.from(this.options.warningPrefix)();
 		this.errorPrefix = Function.from(this.options.errorPrefix)();
-		if (this.options.evaluateOnSubmit) this.element.addEvent('submit', this.onSubmit);
-		if (this.options.evaluateFieldsOnBlur || this.options.evaluateFieldsOnChange) this.watchFields(this.getFields());
+		this._bound = {
+			onSubmit: this.onSubmit.bind(this),
+			blurOrChange: function(event, field){
+				this.validationMonitor(field, true);
+			}.bind(this)
+		};
+		this.enable();
 	},
 
 	toElement: function(){
@@ -4651,13 +4674,24 @@ Form.Validator = new Class({
 		return (this.fields = this.element.getElements(this.options.fieldSelectors));
 	},
 
-	watchFields: function(fields){
-		fields.each(function(el){
-			if (this.options.evaluateFieldsOnBlur)
-				el.addEvent('blur', this.validationMonitor.pass([el, false], this));
-			if (this.options.evaluateFieldsOnChange)
-				el.addEvent('change', this.validationMonitor.pass([el, true], this));
-		}, this);
+	enable: function(){
+		this.element.store('validator', this);
+		if (this.options.evaluateOnSubmit) this.element.addEvent('submit', this._bound.onSubmit);
+		if (this.options.evaluateFieldsOnBlur){
+			this.element.addEvent('blur:relay(input,select,textarea)', this._bound.blurOrChange);
+		}
+		if (this.options.evaluateFieldsOnChange){
+			this.element.addEvent('change:relay(input,select,textarea)', this._bound.blurOrChange);
+		}
+	},
+
+	disable: function(){
+		this.element.eliminate('validator');
+		this.element.removeEvents({
+			submit: this._bound.onSubmit,
+			'blur:relay(input,select,textarea)': this._bound.blurOrChange,
+			'change:relay(input,select,textarea)': this._bound.blurOrChange
+		});
 	},
 
 	validationMonitor: function(){
@@ -4736,8 +4770,8 @@ Form.Validator = new Class({
 		var validator = this.getValidator(className);
 		if (warn != null) warn = false;
 		if (this.hasValidator(field, 'warnOnly')) warn = true;
-		var isValid = this.hasValidator(field, 'ignoreValidation') || (validator ? validator.test(field) : true);
-		if (validator && field.isVisible()) this.fireEvent('elementValidate', [isValid, field, className, warn]);
+		var isValid = field.hasClass('ignoreValidation') || (validator ? validator.test(field) : true);
+		if (validator) this.fireEvent('elementValidate', [isValid, field, className, warn]);
 		if (warn) return true;
 		return isValid;
 	},
@@ -4846,10 +4880,22 @@ Form.Validator.addAllThese([
 		}
 	}],
 
+	['length', {
+		errorMsg: function(element, props){
+			if (typeOf(props.length) != 'null')
+				return Form.Validator.getMsg('length').substitute({length: props.length, elLength: element.get('value').length});
+			else return '';
+		},
+		test: function(element, props){
+			if (typeOf(props.length) != 'null') return (element.get('value').length == props.length || element.get('value').length == 0);
+			else return true;
+		}
+	}],
+
 	['minLength', {
 		errorMsg: function(element, props){
 			if (typeOf(props.minLength) != 'null')
-				return Form.Validator.getMsg('minLength').substitute({minLength:props.minLength,length:element.get('value').length });
+				return Form.Validator.getMsg('minLength').substitute({minLength: props.minLength, length: element.get('value').length});
 			else return '';
 		},
 		test: function(element, props){
@@ -4862,7 +4908,7 @@ Form.Validator.addAllThese([
 		errorMsg: function(element, props){
 			//props is {maxLength:10}
 			if (typeOf(props.maxLength) != 'null')
-				return Form.Validator.getMsg('maxLength').substitute({maxLength:props.maxLength,length:element.get('value').length });
+				return Form.Validator.getMsg('maxLength').substitute({maxLength: props.maxLength, length: element.get('value').length});
 			else return '';
 		},
 		test: function(element, props){
@@ -4917,19 +4963,20 @@ Form.Validator.addAllThese([
 		},
 		test: function(element, props){
 			if (Form.Validator.getValidator('IsEmpty').test(element)) return true;
-			var dateLocale = Locale.getCurrent().sets.Date,
-				dateNouns = new RegExp([dateLocale.days, dateLocale.days_abbr, dateLocale.months, dateLocale.months_abbr].flatten().join('|'), 'i'),
+			var dateLocale = Locale.get('Date'),
+				dateNouns = new RegExp([dateLocale.days, dateLocale.days_abbr, dateLocale.months, dateLocale.months_abbr, dateLocale.AM, dateLocale.PM].flatten().join('|'), 'i'),
 				value = element.get('value'),
 				wordsInValue = value.match(/[a-z]+/gi);
 
-				if (wordsInValue && !wordsInValue.every(dateNouns.exec, dateNouns)) return false;
+			if (wordsInValue && !wordsInValue.every(dateNouns.exec, dateNouns)) return false;
 
-				var date = Date.parse(value),
-					format = props.dateFormat || '%x',
-					formatted = date.format(format);
+			var date = Date.parse(value);
+			if (!date) return false;
 
-				if (formatted != 'invalid date') element.set('value', formatted);
-				return date.isValid();
+			var format = props.dateFormat || '%x',
+				formatted = date.format(format);
+			if (formatted != 'invalid date') element.set('value', formatted);
+			return date.isValid();
 		}
 	}],
 
@@ -5012,199 +5059,6 @@ Element.implement({
 
 
 
-
-/*
----
-
-script: Form.Validator.Inline.js
-
-name: Form.Validator.Inline
-
-description: Extends Form.Validator to add inline messages.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - /Form.Validator
-
-provides: [Form.Validator.Inline]
-
-...
-*/
-
-Form.Validator.Inline = new Class({
-
-	Extends: Form.Validator,
-
-	options: {
-		showError: function(errorElement){
-			if (errorElement.reveal) errorElement.reveal();
-			else errorElement.setStyle('display', 'block');
-		},
-		hideError: function(errorElement){
-			if (errorElement.dissolve) errorElement.dissolve();
-			else errorElement.setStyle('display', 'none');
-		},
-		scrollToErrorsOnSubmit: true,
-		scrollToErrorsOnBlur: false,
-		scrollToErrorsOnChange: false,
-		scrollFxOptions: {
-			transition: 'quad:out',
-			offset: {
-				y: -20
-			}
-		}
-	},
-
-	initialize: function(form, options){
-		this.parent(form, options);
-		this.addEvent('onElementValidate', function(isValid, field, className, warn){
-			var validator = this.getValidator(className);
-			if (!isValid && validator.getError(field)){
-				if (warn) field.addClass('warning');
-				var advice = this.makeAdvice(className, field, validator.getError(field), warn);
-				this.insertAdvice(advice, field);
-				this.showAdvice(className, field);
-			} else {
-				this.hideAdvice(className, field);
-			}
-		});
-	},
-
-	makeAdvice: function(className, field, error, warn){
-		var errorMsg = (warn) ? this.warningPrefix : this.errorPrefix;
-			errorMsg += (this.options.useTitles) ? field.title || error:error;
-		var cssClass = (warn) ? 'warning-advice' : 'validation-advice';
-		var advice = this.getAdvice(className, field);
-		if (advice){
-			advice = advice.set('html', errorMsg);
-		} else {
-			advice = new Element('div', {
-				html: errorMsg,
-				styles: { display: 'none' },
-				id: 'advice-' + className.split(':')[0] + '-' + this.getFieldId(field)
-			}).addClass(cssClass);
-		}
-		field.store('$moo:advice-' + className, advice);
-		return advice;
-	},
-
-	getFieldId : function(field){
-		return field.id ? field.id : field.id = 'input_' + field.name;
-	},
-
-	showAdvice: function(className, field){
-		var advice = this.getAdvice(className, field);
-		if (
-			advice &&
-			!field.retrieve('$moo:' + this.getPropName(className)) &&
-			(
-				advice.getStyle('display') == 'none' ||
-				advice.getStyle('visiblity') == 'hidden' ||
-				advice.getStyle('opacity') == 0
-			)
-		){
-			field.store('$moo:' + this.getPropName(className), true);
-			this.options.showError(advice);
-			this.fireEvent('showAdvice', [field, advice, className]);
-		}
-	},
-
-	hideAdvice: function(className, field){
-		var advice = this.getAdvice(className, field);
-		if (advice && field.retrieve('$moo:' + this.getPropName(className))){
-			field.store('$moo:' + this.getPropName(className), false);
-			this.options.hideError(advice);
-			this.fireEvent('hideAdvice', [field, advice, className]);
-		}
-	},
-
-	getPropName: function(className){
-		return 'advice' + className;
-	},
-
-	resetField: function(field){
-		field = document.id(field);
-		if (!field) return this;
-		this.parent(field);
-		field.get('validators').each(function(className){
-			this.hideAdvice(className, field);
-		}, this);
-		return this;
-	},
-
-	getAllAdviceMessages: function(field, force){
-		var advice = [];
-		if (field.hasClass('ignoreValidation') && !force) return advice;
-		var validators = field.get('validators').some(function(cn){
-			var warner = cn.test('^warn-') || field.hasClass('warnOnly');
-			if (warner) cn = cn.replace(/^warn-/, '');
-			var validator = this.getValidator(cn);
-			if (!validator) return;
-			advice.push({
-				message: validator.getError(field),
-				warnOnly: warner,
-				passed: validator.test(),
-				validator: validator
-			});
-		}, this);
-		return advice;
-	},
-
-	getAdvice: function(className, field){
-		return field.retrieve('$moo:advice-' + className);
-	},
-
-	insertAdvice: function(advice, field){
-		//Check for error position prop
-		var props = field.get('validatorProps');
-		//Build advice
-		if (!props.msgPos || !document.id(props.msgPos)){
-			if (field.type && field.type.toLowerCase() == 'radio') field.getParent().adopt(advice);
-			else advice.inject(document.id(field), 'after');
-		} else {
-			document.id(props.msgPos).grab(advice);
-		}
-	},
-
-	validateField: function(field, force, scroll){
-		var result = this.parent(field, force);
-		if (((this.options.scrollToErrorsOnSubmit && scroll == null) || scroll) && !result){
-			var failed = document.id(this).getElement('.validation-failed');
-			var par = document.id(this).getParent();
-			while (par != document.body && par.getScrollSize().y == par.getSize().y){
-				par = par.getParent();
-			}
-			var fx = par.retrieve('$moo:fvScroller');
-			if (!fx && window.Fx && Fx.Scroll){
-				fx = new Fx.Scroll(par, this.options.scrollFxOptions);
-				par.store('$moo:fvScroller', fx);
-			}
-			if (failed){
-				if (fx) fx.toElement(failed);
-				else par.scrollTo(par.getScroll().x, failed.getPosition(par).y - 20);
-			}
-		}
-		return result;
-	},
-
-	watchFields: function(fields){
-		fields.each(function(el){
-		if (this.options.evaluateFieldsOnBlur){
-			el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
-		}
-		if (this.options.evaluateFieldsOnChange){
-				el.addEvent('change', this.validationMonitor.pass([el, true, this.options.scrollToErrorsOnChange], this));
-			}
-		}, this);
-	}
-
-});
-
-
 /*
 ---
 
@@ -5220,7 +5074,7 @@ authors:
   - Aaron Newton
 
 requires:
-  - /Form.Validator
+  - Form.Validator
 
 provides: [Form.Validator.Extras]
 
@@ -5401,7 +5255,8 @@ Form.Validator.addAllThese([
 			if (ccNum.test(/^4[0-9]{12}([0-9]{3})?$/)) valid_type = 'Visa';
 			else if (ccNum.test(/^5[1-5]([0-9]{14})$/)) valid_type = 'Master Card';
 			else if (ccNum.test(/^3[47][0-9]{13}$/)) valid_type = 'American Express';
-			else if (ccNum.test(/^6011[0-9]{12}$/)) valid_type = 'Discover';
+			else if (ccNum.test(/^6(?:011|5[0-9]{2})[0-9]{12}$/)) valid_type = 'Discover';
+			else if (ccNum.test(/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/)) valid_type = 'Diners Club';
 
 			if (valid_type){
 				var sum = 0;
@@ -5437,6 +5292,196 @@ Form.Validator.addAllThese([
 
 ]);
 
+/*
+---
+
+script: Form.Validator.Inline.js
+
+name: Form.Validator.Inline
+
+description: Extends Form.Validator to add inline messages.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Form.Validator
+
+provides: [Form.Validator.Inline]
+
+...
+*/
+
+Form.Validator.Inline = new Class({
+
+	Extends: Form.Validator,
+
+	options: {
+		showError: function(errorElement){
+			if (errorElement.reveal) errorElement.reveal();
+			else errorElement.setStyle('display', 'block');
+		},
+		hideError: function(errorElement){
+			if (errorElement.dissolve) errorElement.dissolve();
+			else errorElement.setStyle('display', 'none');
+		},
+		scrollToErrorsOnSubmit: true,
+		scrollToErrorsOnBlur: false,
+		scrollToErrorsOnChange: false,
+		scrollFxOptions: {
+			transition: 'quad:out',
+			offset: {
+				y: -20
+			}
+		}
+	},
+
+	initialize: function(form, options){
+		this.parent(form, options);
+		this.addEvent('onElementValidate', function(isValid, field, className, warn){
+			var validator = this.getValidator(className);
+			if (!isValid && validator.getError(field)){
+				if (warn) field.addClass('warning');
+				var advice = this.makeAdvice(className, field, validator.getError(field), warn);
+				this.insertAdvice(advice, field);
+				this.showAdvice(className, field);
+			} else {
+				this.hideAdvice(className, field);
+			}
+		});
+	},
+
+	makeAdvice: function(className, field, error, warn){
+		var errorMsg = (warn) ? this.warningPrefix : this.errorPrefix;
+			errorMsg += (this.options.useTitles) ? field.title || error:error;
+		var cssClass = (warn) ? 'warning-advice' : 'validation-advice';
+		var advice = this.getAdvice(className, field);
+		if (advice){
+			advice = advice.set('html', errorMsg);
+		} else {
+			advice = new Element('div', {
+				html: errorMsg,
+				styles: { display: 'none' },
+				id: 'advice-' + className.split(':')[0] + '-' + this.getFieldId(field)
+			}).addClass(cssClass);
+		}
+		field.store('$moo:advice-' + className, advice);
+		return advice;
+	},
+
+	getFieldId : function(field){
+		return field.id ? field.id : field.id = 'input_' + field.name;
+	},
+
+	showAdvice: function(className, field){
+		var advice = this.getAdvice(className, field);
+		if (
+			advice &&
+			!field.retrieve('$moo:' + this.getPropName(className)) &&
+			(
+				advice.getStyle('display') == 'none' ||
+				advice.getStyle('visibility') == 'hidden' ||
+				advice.getStyle('opacity') == 0
+			)
+		){
+			field.store('$moo:' + this.getPropName(className), true);
+			this.options.showError(advice);
+			this.fireEvent('showAdvice', [field, advice, className]);
+		}
+	},
+
+	hideAdvice: function(className, field){
+		var advice = this.getAdvice(className, field);
+		if (advice && field.retrieve('$moo:' + this.getPropName(className))){
+			field.store('$moo:' + this.getPropName(className), false);
+			this.options.hideError(advice);
+			this.fireEvent('hideAdvice', [field, advice, className]);
+		}
+	},
+
+	getPropName: function(className){
+		return 'advice' + className;
+	},
+
+	resetField: function(field){
+		field = document.id(field);
+		if (!field) return this;
+		this.parent(field);
+		field.get('validators').each(function(className){
+			this.hideAdvice(className, field);
+		}, this);
+		return this;
+	},
+
+	getAllAdviceMessages: function(field, force){
+		var advice = [];
+		if (field.hasClass('ignoreValidation') && !force) return advice;
+		var validators = field.get('validators').some(function(cn){
+			var warner = cn.test('^warn-') || field.hasClass('warnOnly');
+			if (warner) cn = cn.replace(/^warn-/, '');
+			var validator = this.getValidator(cn);
+			if (!validator) return;
+			advice.push({
+				message: validator.getError(field),
+				warnOnly: warner,
+				passed: validator.test(),
+				validator: validator
+			});
+		}, this);
+		return advice;
+	},
+
+	getAdvice: function(className, field){
+		return field.retrieve('$moo:advice-' + className);
+	},
+
+	insertAdvice: function(advice, field){
+		//Check for error position prop
+		var props = field.get('validatorProps');
+		//Build advice
+		if (!props.msgPos || !document.id(props.msgPos)){
+			if (field.type && field.type.toLowerCase() == 'radio') field.getParent().adopt(advice);
+			else advice.inject(document.id(field), 'after');
+		} else {
+			document.id(props.msgPos).grab(advice);
+		}
+	},
+
+	validateField: function(field, force, scroll){
+		var result = this.parent(field, force);
+		if (((this.options.scrollToErrorsOnSubmit && scroll == null) || scroll) && !result){
+			var failed = document.id(this).getElement('.validation-failed');
+			var par = document.id(this).getParent();
+			while (par != document.body && par.getScrollSize().y == par.getSize().y){
+				par = par.getParent();
+			}
+			var fx = par.retrieve('$moo:fvScroller');
+			if (!fx && window.Fx && Fx.Scroll){
+				fx = new Fx.Scroll(par, this.options.scrollFxOptions);
+				par.store('$moo:fvScroller', fx);
+			}
+			if (failed){
+				if (fx) fx.toElement(failed);
+				else par.scrollTo(par.getScroll().x, failed.getPosition(par).y - 20);
+			}
+		}
+		return result;
+	},
+
+	watchFields: function(fields){
+		fields.each(function(el){
+		if (this.options.evaluateFieldsOnBlur){
+			el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
+		}
+		if (this.options.evaluateFieldsOnChange){
+				el.addEvent('change', this.validationMonitor.pass([el, true, this.options.scrollToErrorsOnChange], this));
+			}
+		}, this);
+	}
+
+});
 
 /*
 ---
@@ -5573,7 +5618,6 @@ var OverText = new Class({
 			change: this.assert
 		});
 		window.addEvent('resize', this.reposition);
-		this.assert(true);
 		this.reposition();
 		return this;
 	},
@@ -5632,7 +5676,7 @@ var OverText = new Class({
 	},
 
 	show: function(){
-		if (this.text && !this.text.isDisplayed()){
+		if (document.id(this.text) && !this.text.isDisplayed()){
 			this.text.show();
 			this.reposition();
 			this.fireEvent('textShow', [this.text, this.element]);
@@ -5697,7 +5741,6 @@ Object.append(OverText, {
 });
 
 
-
 /*
 ---
 
@@ -5714,7 +5757,7 @@ authors:
 
 requires:
   - Core/Fx.CSS
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Fx.Elements]
 
@@ -5773,7 +5816,6 @@ Fx.Elements = new Class({
 
 });
 
-
 /*
 ---
 
@@ -5790,7 +5832,7 @@ authors:
 
 requires:
   - Core/Element.Event
-  - /Fx.Elements
+  - Fx.Elements
 
 provides: [Fx.Accordion]
 
@@ -5940,18 +5982,19 @@ Fx.Accordion = new Class({
 
 		if (useFx == null) useFx = true;
 		if (typeOf(index) == 'element') index = elements.indexOf(index);
-		if (index == this.previous && !options.alwaysHide) return this;
+		if (index == this.current && !options.alwaysHide) return this;
 
 		if (options.resetHeight){
-			var prev = elements[this.previous];
+			var prev = elements[this.current];
 			if (prev && !this.selfHidden){
 				for (var fx in effects) prev.setStyle(fx, prev[effects[fx]]);
 			}
 		}
 
-		if ((this.timer && options.link == 'chain') || (index === this.previous && !options.alwaysHide)) return this;
+		if ((this.timer && options.link == 'chain') || (index === this.current && !options.alwaysHide)) return this;
 
-		this.previous = index;
+		if (this.current != null) this.previous = this.current;
+		this.current = index;
 		this.selfHidden = false;
 
 		elements.each(function(el, i){
@@ -5983,7 +6026,6 @@ Fx.Accordion = new Class({
 
 
 
-
 /*
 ---
 
@@ -6000,7 +6042,7 @@ authors:
 
 requires:
   - Core/Fx.Morph
-  - /Element.Position
+  - Element.Position
 
 provides: [Fx.Move]
 
@@ -6056,6 +6098,176 @@ Element.implement({
 
 });
 
+/*
+---
+
+script: Fx.Scroll.js
+
+name: Fx.Scroll
+
+description: Effect to smoothly scroll any element, including the window.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Fx
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Fx.Scroll]
+
+...
+*/
+
+(function(){
+
+Fx.Scroll = new Class({
+
+	Extends: Fx,
+
+	options: {
+		offset: {x: 0, y: 0},
+		wheelStops: true
+	},
+
+	initialize: function(element, options){
+		this.element = this.subject = document.id(element);
+		this.parent(options);
+
+		if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
+
+		if (this.options.wheelStops){
+			var stopper = this.element,
+				cancel = this.cancel.pass(false, this);
+			this.addEvent('start', function(){
+				stopper.addEvent('mousewheel', cancel);
+			}, true);
+			this.addEvent('complete', function(){
+				stopper.removeEvent('mousewheel', cancel);
+			}, true);
+		}
+	},
+
+	set: function(){
+		var now = Array.flatten(arguments);
+		this.element.scrollTo(now[0], now[1]);
+		return this;
+	},
+
+	compute: function(from, to, delta){
+		return [0, 1].map(function(i){
+			return Fx.compute(from[i], to[i], delta);
+		});
+	},
+
+	start: function(x, y){
+		if (!this.check(x, y)) return this;
+		var scroll = this.element.getScroll();
+		return this.parent([scroll.x, scroll.y], [x, y]);
+	},
+
+	calculateScroll: function(x, y){
+		var element = this.element,
+			scrollSize = element.getScrollSize(),
+			scroll = element.getScroll(),
+			size = element.getSize(),
+			offset = this.options.offset,
+			values = {x: x, y: y};
+
+		for (var z in values){
+			if (!values[z] && values[z] !== 0) values[z] = scroll[z];
+			if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
+			values[z] += offset[z];
+		}
+
+		return [values.x, values.y];
+	},
+
+	toTop: function(){
+		return this.start.apply(this, this.calculateScroll(false, 0));
+	},
+
+	toLeft: function(){
+		return this.start.apply(this, this.calculateScroll(0, false));
+	},
+
+	toRight: function(){
+		return this.start.apply(this, this.calculateScroll('right', false));
+	},
+
+	toBottom: function(){
+		return this.start.apply(this, this.calculateScroll(false, 'bottom'));
+	},
+
+	toElement: function(el, axes){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
+		var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
+			return axes.contains(axis) ? value + scroll[axis] : false;
+		});
+		return this.start.apply(this, this.calculateScroll(position.x, position.y));
+	},
+
+	toElementEdge: function(el, axes, offset){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		el = document.id(el);
+		var to = {},
+			position = el.getPosition(this.element),
+			size = el.getSize(),
+			scroll = this.element.getScroll(),
+			containerSize = this.element.getSize(),
+			edge = {
+				x: position.x + size.x,
+				y: position.y + size.y
+			};
+
+		['x', 'y'].each(function(axis){
+			if (axes.contains(axis)){
+				if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
+				if (position[axis] < scroll[axis]) to[axis] = position[axis];
+			}
+			if (to[axis] == null) to[axis] = scroll[axis];
+			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+		}, this);
+
+		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+		return this;
+	},
+
+	toElementCenter: function(el, axes, offset){
+		axes = axes ? Array.from(axes) : ['x', 'y'];
+		el = document.id(el);
+		var to = {},
+			position = el.getPosition(this.element),
+			size = el.getSize(),
+			scroll = this.element.getScroll(),
+			containerSize = this.element.getSize();
+
+		['x', 'y'].each(function(axis){
+			if (axes.contains(axis)){
+				to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
+			}
+			if (to[axis] == null) to[axis] = scroll[axis];
+			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+		}, this);
+
+		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+		return this;
+	}
+
+});
+
+
+
+function isBody(element){
+	return (/^(?:body|html)$/i).test(element.tagName);
+}
+
+})();
 
 /*
 ---
@@ -6074,7 +6286,7 @@ authors:
 requires:
   - Core/Fx
   - Core/Element.Style
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Fx.Slide]
 
@@ -6228,180 +6440,6 @@ Element.implement({
 
 });
 
-
-/*
----
-
-script: Fx.Scroll.js
-
-name: Fx.Scroll
-
-description: Effect to smoothly scroll any element, including the window.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Fx
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - /MooTools.More
-
-provides: [Fx.Scroll]
-
-...
-*/
-
-(function(){
-
-Fx.Scroll = new Class({
-
-	Extends: Fx,
-
-	options: {
-		offset: {x: 0, y: 0},
-		wheelStops: true
-	},
-
-	initialize: function(element, options){
-		this.element = this.subject = document.id(element);
-		this.parent(options);
-
-		if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
-
-		if (this.options.wheelStops){
-			var stopper = this.element,
-				cancel = this.cancel.pass(false, this);
-			this.addEvent('start', function(){
-				stopper.addEvent('mousewheel', cancel);
-			}, true);
-			this.addEvent('complete', function(){
-				stopper.removeEvent('mousewheel', cancel);
-			}, true);
-		}
-	},
-
-	set: function(){
-		var now = Array.flatten(arguments);
-		if (Browser.firefox) now = [Math.round(now[0]), Math.round(now[1])]; // not needed anymore in newer firefox versions
-		this.element.scrollTo(now[0], now[1]);
-		return this;
-	},
-
-	compute: function(from, to, delta){
-		return [0, 1].map(function(i){
-			return Fx.compute(from[i], to[i], delta);
-		});
-	},
-
-	start: function(x, y){
-		if (!this.check(x, y)) return this;
-		var scroll = this.element.getScroll();
-		return this.parent([scroll.x, scroll.y], [x, y]);
-	},
-
-	calculateScroll: function(x, y){
-		var element = this.element,
-			scrollSize = element.getScrollSize(),
-			scroll = element.getScroll(),
-			size = element.getSize(),
-			offset = this.options.offset,
-			values = {x: x, y: y};
-
-		for (var z in values){
-			if (!values[z] && values[z] !== 0) values[z] = scroll[z];
-			if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
-			values[z] += offset[z];
-		}
-
-		return [values.x, values.y];
-	},
-
-	toTop: function(){
-		return this.start.apply(this, this.calculateScroll(false, 0));
-	},
-
-	toLeft: function(){
-		return this.start.apply(this, this.calculateScroll(0, false));
-	},
-
-	toRight: function(){
-		return this.start.apply(this, this.calculateScroll('right', false));
-	},
-
-	toBottom: function(){
-		return this.start.apply(this, this.calculateScroll(false, 'bottom'));
-	},
-
-	toElement: function(el, axes){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
-		var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
-		var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
-			return axes.contains(axis) ? value + scroll[axis] : false;
-		});
-		return this.start.apply(this, this.calculateScroll(position.x, position.y));
-	},
-
-	toElementEdge: function(el, axes, offset){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
-		el = document.id(el);
-		var to = {},
-			position = el.getPosition(this.element),
-			size = el.getSize(),
-			scroll = this.element.getScroll(),
-			containerSize = this.element.getSize(),
-			edge = {
-				x: position.x + size.x,
-				y: position.y + size.y
-			};
-
-		['x', 'y'].each(function(axis){
-			if (axes.contains(axis)){
-				if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
-				if (position[axis] < scroll[axis]) to[axis] = position[axis];
-			}
-			if (to[axis] == null) to[axis] = scroll[axis];
-			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
-		}, this);
-
-		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
-		return this;
-	},
-
-	toElementCenter: function(el, axes, offset){
-		axes = axes ? Array.from(axes) : ['x', 'y'];
-		el = document.id(el);
-		var to = {},
-			position = el.getPosition(this.element),
-			size = el.getSize(),
-			scroll = this.element.getScroll(),
-			containerSize = this.element.getSize();
-
-		['x', 'y'].each(function(axis){
-			if (axes.contains(axis)){
-				to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
-			}
-			if (to[axis] == null) to[axis] = scroll[axis];
-			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
-		}, this);
-
-		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
-		return this;
-	}
-
-});
-
-
-
-function isBody(element){
-	return (/^(?:body|html)$/i).test(element.tagName);
-}
-
-})();
-
-
 /*
 ---
 
@@ -6418,7 +6456,7 @@ authors:
 
 requires:
   - Core/Slick.Finder
-  - /Fx.Scroll
+  - Fx.Scroll
 
 provides: [Fx.SmoothScroll]
 
@@ -6473,7 +6511,6 @@ Fx.SmoothScroll = new Class({
 	}
 });
 
-
 /*
 ---
 
@@ -6490,8 +6527,8 @@ authors:
 
 requires:
   - Core/Element.Dimensions
-  - /Fx.Elements
-  - /Element.Measure
+  - Fx.Elements
+  - Element.Measure
 
 provides: [Fx.Sort]
 
@@ -6647,895 +6684,5928 @@ Fx.Sort = new Class({
 
 });
 
-
 /*
 ---
 
-script: Drag.js
+script: Keyboard.js
 
-name: Drag
+name: Keyboard
 
-description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
+description: KeyboardEvents used to intercept events on a class for keyboard and format modifiers in a specific order so as to make alt+shift+c the same as shift+alt+c.
 
 license: MIT-style license
 
 authors:
-  - Valerio Proietti
-  - Tom Occhinno
-  - Jan Kassens
+  - Perrin Westrich
+  - Aaron Newton
+  - Scott Kyle
 
 requires:
   - Core/Events
   - Core/Options
   - Core/Element.Event
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - /MooTools.More
+  - Element.Event.Pseudos.Keys
+
+provides: [Keyboard]
 
-provides: [Drag]
 ...
-
 */
 
-var Drag = new Class({
+(function(){
+
+	var Keyboard = this.Keyboard = new Class({
+
+		Extends: Events,
+
+		Implements: [Options],
+
+		options: {/*
+			onActivate: function(){},
+			onDeactivate: function(){},*/
+			defaultEventType: 'keydown',
+			active: false,
+			manager: null,
+			events: {},
+			nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
+		},
+
+		initialize: function(options){
+			if (options && options.manager){
+				this._manager = options.manager;
+				delete options.manager;
+			}
+			this.setOptions(options);
+			this._setup();
+		},
+
+		addEvent: function(type, fn, internal){
+			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
+		},
+
+		removeEvent: function(type, fn){
+			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
+		},
+
+		toggleActive: function(){
+			return this[this.isActive() ? 'deactivate' : 'activate']();
+		},
+
+		activate: function(instance){
+			if (instance){
+				if (instance.isActive()) return this;
+				//if we're stealing focus, store the last keyboard to have it so the relinquish command works
+				if (this._activeKB && instance != this._activeKB){
+					this.previous = this._activeKB;
+					this.previous.fireEvent('deactivate');
+				}
+				//if we're enabling a child, assign it so that events are now passed to it
+				this._activeKB = instance.fireEvent('activate');
+				Keyboard.manager.fireEvent('changed');
+			} else if (this._manager){
+				//else we're enabling ourselves, we must ask our parent to do it for us
+				this._manager.activate(this);
+			}
+			return this;
+		},
+
+		isActive: function(){
+			return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
+		},
+
+		deactivate: function(instance){
+			if (instance){
+				if (instance === this._activeKB){
+					this._activeKB = null;
+					instance.fireEvent('deactivate');
+					Keyboard.manager.fireEvent('changed');
+				}
+			} else if (this._manager){
+				this._manager.deactivate(this);
+			}
+			return this;
+		},
+
+		relinquish: function(){
+			if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
+			else this.deactivate();
+			return this;
+		},
+
+		//management logic
+		manage: function(instance){
+			if (instance._manager) instance._manager.drop(instance);
+			this._instances.push(instance);
+			instance._manager = this;
+			if (!this._activeKB) this.activate(instance);
+			return this;
+		},
+
+		drop: function(instance){
+			instance.relinquish();
+			this._instances.erase(instance);
+			if (this._activeKB == instance){
+				if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
+				else this._activeKB = this._instances[0];
+			}
+			return this;
+		},
+
+		trace: function(){
+			Keyboard.trace(this);
+		},
+
+		each: function(fn){
+			Keyboard.each(this, fn);
+		},
+
+		/*
+			PRIVATE METHODS
+		*/
+
+		_instances: [],
+
+		_disable: function(instance){
+			if (this._activeKB == instance) this._activeKB = null;
+		},
+
+		_setup: function(){
+			this.addEvents(this.options.events);
+			//if this is the root manager, nothing manages it
+			if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
+			if (this.options.active) this.activate();
+			else this.relinquish();
+		},
+
+		_handle: function(event, type){
+			//Keyboard.stop(event) prevents key propagation
+			if (event.preventKeyboardPropagation) return;
+
+			var bubbles = !!this._manager;
+			if (bubbles && this._activeKB){
+				this._activeKB._handle(event, type);
+				if (event.preventKeyboardPropagation) return;
+			}
+			this.fireEvent(type, event);
+
+			if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
+		}
+
+	});
+
+	var parsed = {};
+	var modifiers = ['shift', 'control', 'alt', 'meta'];
+	var regex = /^(?:shift|control|ctrl|alt|meta)$/;
+
+	Keyboard.parse = function(type, eventType, ignore){
+		if (ignore && ignore.contains(type.toLowerCase())) return type;
+
+		type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
+			eventType = $1;
+			return '';
+		});
+
+		if (!parsed[type]){
+		    if (type != '+'){
+				var key, mods = {};
+				type.split('+').each(function(part){
+					if (regex.test(part)) mods[part] = true;
+					else key = part;
+				});
+
+				mods.control = mods.control || mods.ctrl; // allow both control and ctrl
+
+				var keys = [];
+				modifiers.each(function(mod){
+					if (mods[mod]) keys.push(mod);
+				});
+
+				if (key) keys.push(key);
+				parsed[type] = keys.join('+');
+			} else {
+			    parsed[type] = type;
+			}
+		}
+
+		return eventType + ':keys(' + parsed[type] + ')';
+	};
+
+	Keyboard.each = function(keyboard, fn){
+		var current = keyboard || Keyboard.manager;
+		while (current){
+			fn(current);
+			current = current._activeKB;
+		}
+	};
+
+	Keyboard.stop = function(event){
+		event.preventKeyboardPropagation = true;
+	};
+
+	Keyboard.manager = new Keyboard({
+		active: true
+	});
+
+	Keyboard.trace = function(keyboard){
+		keyboard = keyboard || Keyboard.manager;
+		var hasConsole = window.console && console.log;
+		if (hasConsole) console.log('the following items have focus: ');
+		Keyboard.each(keyboard, function(current){
+			if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
+		});
+	};
+
+	var handler = function(event){
+		var keys = [];
+		modifiers.each(function(mod){
+			if (event[mod]) keys.push(mod);
+		});
+
+		if (!regex.test(event.key)) keys.push(event.key);
+		Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
+	};
+
+	document.addEvents({
+		'keyup': handler,
+		'keydown': handler
+	});
+
+})();
+
+/*
+---
+
+script: Keyboard.Extras.js
+
+name: Keyboard.Extras
+
+description: Enhances Keyboard by adding the ability to name and describe keyboard shortcuts, and the ability to grab shortcuts by name and bind the shortcut to different keys.
+
+license: MIT-style license
+
+authors:
+  - Perrin Westrich
+
+requires:
+  - Keyboard
+  - MooTools.More
+
+provides: [Keyboard.Extras]
+
+...
+*/
+Keyboard.prototype.options.nonParsedEvents.combine(['rebound', 'onrebound']);
+
+Keyboard.implement({
+
+	/*
+		shortcut should be in the format of:
+		{
+			'keys': 'shift+s', // the default to add as an event.
+			'description': 'blah blah blah', // a brief description of the functionality.
+			'handler': function(){} // the event handler to run when keys are pressed.
+		}
+	*/
+	addShortcut: function(name, shortcut){
+		this._shortcuts = this._shortcuts || [];
+		this._shortcutIndex = this._shortcutIndex || {};
+
+		shortcut.getKeyboard = Function.from(this);
+		shortcut.name = name;
+		this._shortcutIndex[name] = shortcut;
+		this._shortcuts.push(shortcut);
+		if (shortcut.keys) this.addEvent(shortcut.keys, shortcut.handler);
+		return this;
+	},
+
+	addShortcuts: function(obj){
+		for (var name in obj) this.addShortcut(name, obj[name]);
+		return this;
+	},
+
+	removeShortcut: function(name){
+		var shortcut = this.getShortcut(name);
+		if (shortcut && shortcut.keys){
+			this.removeEvent(shortcut.keys, shortcut.handler);
+			delete this._shortcutIndex[name];
+			this._shortcuts.erase(shortcut);
+		}
+		return this;
+	},
+
+	removeShortcuts: function(names){
+		names.each(this.removeShortcut, this);
+		return this;
+	},
+
+	getShortcuts: function(){
+		return this._shortcuts || [];
+	},
+
+	getShortcut: function(name){
+		return (this._shortcutIndex || {})[name];
+	}
+
+});
+
+Keyboard.rebind = function(newKeys, shortcuts){
+	Array.from(shortcuts).each(function(shortcut){
+		shortcut.getKeyboard().removeEvent(shortcut.keys, shortcut.handler);
+		shortcut.getKeyboard().addEvent(newKeys, shortcut.handler);
+		shortcut.keys = newKeys;
+		shortcut.getKeyboard().fireEvent('rebound');
+	});
+};
+
+
+Keyboard.getActiveShortcuts = function(keyboard){
+	var activeKBS = [], activeSCS = [];
+	Keyboard.each(keyboard, [].push.bind(activeKBS));
+	activeKBS.each(function(kb){ activeSCS.extend(kb.getShortcuts()); });
+	return activeSCS;
+};
+
+Keyboard.getShortcut = function(name, keyboard, opts){
+	opts = opts || {};
+	var shortcuts = opts.many ? [] : null,
+		set = opts.many ? function(kb){
+				var shortcut = kb.getShortcut(name);
+				if (shortcut) shortcuts.push(shortcut);
+			} : function(kb){
+				if (!shortcuts) shortcuts = kb.getShortcut(name);
+			};
+	Keyboard.each(keyboard, set);
+	return shortcuts;
+};
+
+Keyboard.getShortcuts = function(name, keyboard){
+	return Keyboard.getShortcut(name, keyboard, { many: true });
+};
+
+/*
+---
+
+script: HtmlTable.js
+
+name: HtmlTable
+
+description: Builds table elements with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Class.Occlude
+
+provides: [HtmlTable]
+
+...
+*/
+
+var HtmlTable = new Class({
+
+	Implements: [Options, Events, Class.Occlude],
+
+	options: {
+		properties: {
+			cellpadding: 0,
+			cellspacing: 0,
+			border: 0
+		},
+		rows: [],
+		headers: [],
+		footers: []
+	},
+
+	property: 'HtmlTable',
+
+	initialize: function(){
+		var params = Array.link(arguments, {options: Type.isObject, table: Type.isElement, id: Type.isString});
+		this.setOptions(params.options);
+		if (!params.table && params.id) params.table = document.id(params.id);
+		this.element = params.table || new Element('table', this.options.properties);
+		if (this.occlude()) return this.occluded;
+		this.build();
+	},
+
+	build: function(){
+		this.element.store('HtmlTable', this);
+
+		this.body = document.id(this.element.tBodies[0]) || new Element('tbody').inject(this.element);
+		$$(this.body.rows);
+
+		if (this.options.headers.length) this.setHeaders(this.options.headers);
+		else this.thead = document.id(this.element.tHead);
+
+		if (this.thead) this.head = this.getHead();
+		if (this.options.footers.length) this.setFooters(this.options.footers);
+
+		this.tfoot = document.id(this.element.tFoot);
+		if (this.tfoot) this.foot = document.id(this.tfoot.rows[0]);
+
+		this.options.rows.each(function(row){
+			this.push(row);
+		}, this);
+	},
+
+	toElement: function(){
+		return this.element;
+	},
+
+	empty: function(){
+		this.body.empty();
+		return this;
+	},
+
+	set: function(what, items){
+		var target = (what == 'headers') ? 'tHead' : 'tFoot',
+			lower = target.toLowerCase();
+
+		this[lower] = (document.id(this.element[target]) || new Element(lower).inject(this.element, 'top')).empty();
+		var data = this.push(items, {}, this[lower], what == 'headers' ? 'th' : 'td');
+
+		if (what == 'headers') this.head = this.getHead();
+		else this.foot = this.getHead();
+
+		return data;
+	},
+
+	getHead: function(){
+		var rows = this.thead.rows;
+		return rows.length > 1 ? $$(rows) : rows.length ? document.id(rows[0]) : false;
+	},
+
+	setHeaders: function(headers){
+		this.set('headers', headers);
+		return this;
+	},
+
+	setFooters: function(footers){
+		this.set('footers', footers);
+		return this;
+	},
+
+	update: function(tr, row, tag){
+		var tds = tr.getChildren(tag || 'td'), last = tds.length - 1;
+
+		row.each(function(data, index){
+			var td = tds[index] || new Element(tag || 'td').inject(tr),
+				content = ((data && Object.prototype.hasOwnProperty.call(data, 'content')) ? data.content : '') || data,
+				type = typeOf(content);
+
+			if (data && Object.prototype.hasOwnProperty.call(data, 'properties')) td.set(data.properties);
+			if (/(element(s?)|array|collection)/.test(type)) td.empty().adopt(content);
+			else td.set('html', content);
+
+			if (index > last) tds.push(td);
+			else tds[index] = td;
+		});
+
+		return {
+			tr: tr,
+			tds: tds
+		};
+	},
+
+	push: function(row, rowProperties, target, tag, where){
+		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
+			row.inject(target || this.body, where);
+			return {
+				tr: row,
+				tds: row.getChildren('td')
+			};
+		}
+		return this.update(new Element('tr', rowProperties).inject(target || this.body, where), row, tag);
+	},
+
+	pushMany: function(rows, rowProperties, target, tag, where){
+		return rows.map(function(row){
+			return this.push(row, rowProperties, target, tag, where);
+		}, this);
+	}
+
+});
+
+
+['adopt', 'inject', 'wraps', 'grab', 'replaces', 'dispose'].each(function(method){
+	HtmlTable.implement(method, function(){
+		this.element[method].apply(this.element, arguments);
+		return this;
+	});
+});
+
+
+
+/*
+---
+
+script: HtmlTable.Select.js
+
+name: HtmlTable.Select
+
+description: Builds a stripy, sortable table with methods to add rows. Rows can be selected with the mouse or keyboard navigation.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+
+requires:
+  - Keyboard
+  - Keyboard.Extras
+  - HtmlTable
+  - Class.refactor
+  - Element.Delegation.Pseudo
+  - Element.Shortcuts
+
+provides: [HtmlTable.Select]
+
+...
+*/
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {
+		/*onRowFocus: function(){},
+		onRowUnfocus: function(){},*/
+		useKeyboard: true,
+		classRowSelected: 'table-tr-selected',
+		classRowHovered: 'table-tr-hovered',
+		classSelectable: 'table-selectable',
+		shiftForMultiSelect: true,
+		allowMultiSelect: true,
+		selectable: false,
+		selectHiddenRows: false
+	},
+
+	initialize: function(){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+
+		this.selectedRows = new Elements();
+
+		if (!this.bound) this.bound = {};
+		this.bound.mouseleave = this.mouseleave.bind(this);
+		this.bound.clickRow = this.clickRow.bind(this);
+		this.bound.activateKeyboard = function(){
+			if (this.keyboard && this.selectEnabled) this.keyboard.activate();
+		}.bind(this);
+
+		if (this.options.selectable) this.enableSelect();
+	},
+
+	empty: function(){
+		if (this.body.rows.length) this.selectNone();
+		return this.previous();
+	},
+
+	enableSelect: function(){
+		this.selectEnabled = true;
+		this.attachSelects();
+		this.element.addClass(this.options.classSelectable);
+		return this;
+	},
+
+	disableSelect: function(){
+		this.selectEnabled = false;
+		this.attachSelects(false);
+		this.element.removeClass(this.options.classSelectable);
+		return this;
+	},
+
+	push: function(){
+		var ret = this.previous.apply(this, arguments);
+		this.updateSelects();
+		return ret;
+	},
+
+	toggleRow: function(row){
+		return this[(this.isSelected(row) ? 'de' : '') + 'selectRow'](row);
+	},
+
+	selectRow: function(row, _nocheck){
+		//private variable _nocheck: boolean whether or not to confirm the row is in the table body
+		//added here for optimization when selecting ranges
+		if (this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
+		if (!this.options.allowMultiSelect) this.selectNone();
+
+		if (!this.isSelected(row)){
+			this.selectedRows.push(row);
+			row.addClass(this.options.classRowSelected);
+			this.fireEvent('rowFocus', [row, this.selectedRows]);
+			this.fireEvent('stateChanged');
+		}
+
+		this.focused = row;
+		document.clearSelection();
+
+		return this;
+	},
+
+	isSelected: function(row){
+		return this.selectedRows.contains(row);
+	},
+
+	getSelected: function(){
+		return this.selectedRows;
+	},
+
+	serialize: function(){
+		var previousSerialization = this.previous.apply(this, arguments) || {};
+		if (this.options.selectable){
+			previousSerialization.selectedRows = this.selectedRows.map(function(row){
+				return Array.indexOf(this.body.rows, row);
+			}.bind(this));
+		}
+		return previousSerialization;
+	},
+
+	restore: function(tableState){
+		if(this.options.selectable && tableState.selectedRows){
+			tableState.selectedRows.each(function(index){
+				this.selectRow(this.body.rows[index]);
+			}.bind(this));
+		}
+		this.previous.apply(this, arguments);
+	},
+
+	deselectRow: function(row, _nocheck){
+		if (!this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
+
+		this.selectedRows = new Elements(Array.from(this.selectedRows).erase(row));
+		row.removeClass(this.options.classRowSelected);
+		this.fireEvent('rowUnfocus', [row, this.selectedRows]);
+		this.fireEvent('stateChanged');
+		return this;
+	},
+
+	selectAll: function(selectNone){
+		if (!selectNone && !this.options.allowMultiSelect) return;
+		this.selectRange(0, this.body.rows.length, selectNone);
+		return this;
+	},
+
+	selectNone: function(){
+		return this.selectAll(true);
+	},
+
+	selectRange: function(startRow, endRow, _deselect){
+		if (!this.options.allowMultiSelect && !_deselect) return;
+		var method = _deselect ? 'deselectRow' : 'selectRow',
+			rows = Array.clone(this.body.rows);
+
+		if (typeOf(startRow) == 'element') startRow = rows.indexOf(startRow);
+		if (typeOf(endRow) == 'element') endRow = rows.indexOf(endRow);
+		endRow = endRow < rows.length - 1 ? endRow : rows.length - 1;
+
+		if (endRow < startRow){
+			var tmp = startRow;
+			startRow = endRow;
+			endRow = tmp;
+		}
+
+		for (var i = startRow; i <= endRow; i++){
+			if (this.options.selectHiddenRows || rows[i].isDisplayed()) this[method](rows[i], true);
+		}
+
+		return this;
+	},
+
+	deselectRange: function(startRow, endRow){
+		this.selectRange(startRow, endRow, true);
+	},
+
+/*
+	Private methods:
+*/
+
+	enterRow: function(row){
+		if (this.hovered) this.hovered = this.leaveRow(this.hovered);
+		this.hovered = row.addClass(this.options.classRowHovered);
+	},
+
+	leaveRow: function(row){
+		row.removeClass(this.options.classRowHovered);
+	},
+
+	updateSelects: function(){
+		Array.each(this.body.rows, function(row){
+			var binders = row.retrieve('binders');
+			if (!binders && !this.selectEnabled) return;
+			if (!binders){
+				binders = {
+					mouseenter: this.enterRow.pass([row], this),
+					mouseleave: this.leaveRow.pass([row], this)
+				};
+				row.store('binders', binders);
+			}
+			if (this.selectEnabled) row.addEvents(binders);
+			else row.removeEvents(binders);
+		}, this);
+	},
+
+	shiftFocus: function(offset, event){
+		if (!this.focused) return this.selectRow(this.body.rows[0], event);
+		var to = this.getRowByOffset(offset, this.options.selectHiddenRows);
+		if (to === null || this.focused == this.body.rows[to]) return this;
+		this.toggleRow(this.body.rows[to], event);
+	},
+
+	clickRow: function(event, row){
+		var selecting = (event.shift || event.meta || event.control) && this.options.shiftForMultiSelect;
+		if (!selecting && !(event.rightClick && this.isSelected(row) && this.options.allowMultiSelect)) this.selectNone();
+
+		if (event.rightClick) this.selectRow(row);
+		else this.toggleRow(row);
+
+		if (event.shift){
+			this.selectRange(this.rangeStart || this.body.rows[0], row, this.rangeStart ? !this.isSelected(row) : true);
+			this.focused = row;
+		}
+		this.rangeStart = row;
+	},
+
+	getRowByOffset: function(offset, includeHiddenRows){
+		if (!this.focused) return 0;
+		var index = Array.indexOf(this.body.rows, this.focused);
+		if ((index == 0 && offset < 0) || (index == this.body.rows.length -1 && offset > 0)) return null;
+		if (includeHiddenRows){
+			index += offset;
+		} else {
+			var limit = 0,
+			    count = 0;
+			if (offset > 0){
+				while (count < offset && index < this.body.rows.length -1){
+					if (this.body.rows[++index].isDisplayed()) count++;
+				}
+			} else {
+				while (count > offset && index > 0){
+					if (this.body.rows[--index].isDisplayed()) count--;
+				}
+			}
+		}
+		return index;
+	},
+
+	attachSelects: function(attach){
+		attach = attach != null ? attach : true;
+
+		var method = attach ? 'addEvents' : 'removeEvents';
+		this.element[method]({
+			mouseleave: this.bound.mouseleave,
+			click: this.bound.activateKeyboard
+		});
+
+		this.body[method]({
+			'click:relay(tr)': this.bound.clickRow,
+			'contextmenu:relay(tr)': this.bound.clickRow
+		});
+
+		if (this.options.useKeyboard || this.keyboard){
+			if (!this.keyboard) this.keyboard = new Keyboard();
+			if (!this.selectKeysDefined){
+				this.selectKeysDefined = true;
+				var timer, held;
+
+				var move = function(offset){
+					var mover = function(e){
+						clearTimeout(timer);
+						e.preventDefault();
+						var to = this.body.rows[this.getRowByOffset(offset, this.options.selectHiddenRows)];
+						if (e.shift && to && this.isSelected(to)){
+							this.deselectRow(this.focused);
+							this.focused = to;
+						} else {
+							if (to && (!this.options.allowMultiSelect || !e.shift)){
+								this.selectNone();
+							}
+							this.shiftFocus(offset, e);
+						}
+
+						if (held){
+							timer = mover.delay(100, this, e);
+						} else {
+							timer = (function(){
+								held = true;
+								mover(e);
+							}).delay(400);
+						}
+					}.bind(this);
+					return mover;
+				}.bind(this);
+
+				var clear = function(){
+					clearTimeout(timer);
+					held = false;
+				};
+
+				this.keyboard.addEvents({
+					'keydown:shift+up': move(-1),
+					'keydown:shift+down': move(1),
+					'keyup:shift+up': clear,
+					'keyup:shift+down': clear,
+					'keyup:up': clear,
+					'keyup:down': clear
+				});
+
+				var shiftHint = '';
+				if (this.options.allowMultiSelect && this.options.shiftForMultiSelect && this.options.useKeyboard){
+					shiftHint = " (Shift multi-selects).";
+				}
+
+				this.keyboard.addShortcuts({
+					'Select Previous Row': {
+						keys: 'up',
+						shortcut: 'up arrow',
+						handler: move(-1),
+						description: 'Select the previous row in the table.' + shiftHint
+					},
+					'Select Next Row': {
+						keys: 'down',
+						shortcut: 'down arrow',
+						handler: move(1),
+						description: 'Select the next row in the table.' + shiftHint
+					}
+				});
+
+			}
+			this.keyboard[attach ? 'activate' : 'deactivate']();
+		}
+		this.updateSelects();
+	},
+
+	mouseleave: function(){
+		if (this.hovered) this.leaveRow(this.hovered);
+	}
+
+});
+
+/*
+---
+
+script: HtmlTable.Sort.js
+
+name: HtmlTable.Sort
+
+description: Builds a stripy, sortable table with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+  - Jacob Thornton
+
+requires:
+  - Core/Hash
+  - HtmlTable
+  - Class.refactor
+  - Element.Delegation.Pseudo
+  - String.Extras
+  - Date
+
+provides: [HtmlTable.Sort]
+
+...
+*/
+(function(){
+
+var readOnlyNess = document.createElement('table');
+try {
+	readOnlyNess.innerHTML = '<tr><td></td></tr>';
+	readOnlyNess = readOnlyNess.childNodes.length === 0;
+} catch (e){
+	readOnlyNess = true;
+}
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {/*
+		onSort: function(){}, */
+		sortIndex: 0,
+		sortReverse: false,
+		parsers: [],
+		defaultParser: 'string',
+		classSortable: 'table-sortable',
+		classHeadSort: 'table-th-sort',
+		classHeadSortRev: 'table-th-sort-rev',
+		classNoSort: 'table-th-nosort',
+		classGroupHead: 'table-tr-group-head',
+		classGroup: 'table-tr-group',
+		classCellSort: 'table-td-sort',
+		classSortSpan: 'table-th-sort-span',
+		sortable: false,
+		thSelector: 'th'
+	},
+
+	initialize: function (){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+		this.sorted = {index: null, dir: 1};
+		if (!this.bound) this.bound = {};
+		this.bound.headClick = this.headClick.bind(this);
+		this.sortSpans = new Elements();
+		if (this.options.sortable){
+			this.enableSort();
+			if (this.options.sortIndex != null) this.sort(this.options.sortIndex, this.options.sortReverse);
+		}
+	},
+
+	attachSorts: function(attach){
+		this.detachSorts();
+		if (attach !== false) this.element.addEvent('click:relay(' + this.options.thSelector + ')', this.bound.headClick);
+	},
+
+	detachSorts: function(){
+		this.element.removeEvents('click:relay(' + this.options.thSelector + ')');
+	},
+
+	setHeaders: function(){
+		this.previous.apply(this, arguments);
+		if (this.sortable) this.setParsers();
+	},
+
+	setParsers: function(){
+		this.parsers = this.detectParsers();
+	},
+
+	detectParsers: function(){
+		return this.head && this.head.getElements(this.options.thSelector).flatten().map(this.detectParser, this);
+	},
+
+	detectParser: function(cell, index){
+		if (cell.hasClass(this.options.classNoSort) || cell.retrieve('htmltable-parser')) return cell.retrieve('htmltable-parser');
+		var thDiv = new Element('div');
+		thDiv.adopt(cell.childNodes).inject(cell);
+		var sortSpan = new Element('span', {'class': this.options.classSortSpan}).inject(thDiv, 'top');
+		this.sortSpans.push(sortSpan);
+		var parser = this.options.parsers[index],
+			rows = this.body.rows,
+			cancel;
+		switch (typeOf(parser)){
+			case 'function': parser = {convert: parser}; cancel = true; break;
+			case 'string': parser = parser; cancel = true; break;
+		}
+		if (!cancel){
+			HtmlTable.ParserPriority.some(function(parserName){
+				var current = HtmlTable.Parsers[parserName],
+					match = current.match;
+				if (!match) return false;
+				for (var i = 0, j = rows.length; i < j; i++){
+					var cell = document.id(rows[i].cells[index]),
+						text = cell ? cell.get('html').clean() : '';
+					if (text && match.test(text)){
+						parser = current;
+						return true;
+					}
+				}
+			});
+		}
+		if (!parser) parser = this.options.defaultParser;
+		cell.store('htmltable-parser', parser);
+		return parser;
+	},
+
+	headClick: function(event, el){
+		if (!this.head || el.hasClass(this.options.classNoSort)) return;
+		return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(), el) % this.body.rows[0].cells.length);
+	},
+
+	serialize: function(){
+		var previousSerialization = this.previous.apply(this, arguments) || {};
+		if (this.options.sortable){
+			previousSerialization.sortIndex = this.sorted.index;
+			previousSerialization.sortReverse = this.sorted.reverse;
+		}
+		return previousSerialization;
+	},
+
+	restore: function(tableState){
+		if(this.options.sortable && tableState.sortIndex){
+			this.sort(tableState.sortIndex, tableState.sortReverse);
+		}
+		this.previous.apply(this, arguments);
+	},
+
+	setSortedState: function(index, reverse){
+		if (reverse != null) this.sorted.reverse = reverse;
+		else if (this.sorted.index == index) this.sorted.reverse = !this.sorted.reverse;
+		else this.sorted.reverse = this.sorted.index == null;
+
+		if (index != null) this.sorted.index = index;
+	},
+
+	setHeadSort: function(sorted){
+		var head = $$(!this.head.length ? this.head.cells[this.sorted.index] : this.head.map(function(row){
+			return row.getElements(this.options.thSelector)[this.sorted.index];
+		}, this).clean());
+		if (!head.length) return;
+		if (sorted){
+			head.addClass(this.options.classHeadSort);
+			if (this.sorted.reverse) head.addClass(this.options.classHeadSortRev);
+			else head.removeClass(this.options.classHeadSortRev);
+		} else {
+			head.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);
+		}
+	},
+
+	setRowSort: function(data, pre){
+		var count = data.length,
+			body = this.body,
+			group,
+			rowIndex;
+
+		while (count){
+			var item = data[--count],
+				position = item.position,
+				row = body.rows[position];
+
+			if (row.disabled) continue;
+			if (!pre){
+				group = this.setGroupSort(group, row, item);
+				this.setRowStyle(row, count);
+			}
+			body.appendChild(row);
+
+			for (rowIndex = 0; rowIndex < count; rowIndex++){
+				if (data[rowIndex].position > position) data[rowIndex].position--;
+			}
+		}
+	},
+
+	setRowStyle: function(row, i){
+		this.previous(row, i);
+		row.cells[this.sorted.index].addClass(this.options.classCellSort);
+	},
+
+	setGroupSort: function(group, row, item){
+		if (group == item.value) row.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);
+		else row.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
+		return item.value;
+	},
+
+	getParser: function(){
+		var parser = this.parsers[this.sorted.index];
+		return typeOf(parser) == 'string' ? HtmlTable.Parsers[parser] : parser;
+	},
+
+	sort: function(index, reverse, pre, sortFunction){
+		if (!this.head) return;
+
+		if (!pre){
+			this.clearSort();
+			this.setSortedState(index, reverse);
+			this.setHeadSort(true);
+		}
+
+		var parser = this.getParser();
+		if (!parser) return;
+
+		var rel;
+		if (!readOnlyNess){
+			rel = this.body.getParent();
+			this.body.dispose();
+		}
+
+		var data = this.parseData(parser).sort(sortFunction ? sortFunction : function(a, b){
+			if (a.value === b.value) return 0;
+			return a.value > b.value ? 1 : -1;
+		});
+
+		if (this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked'])) data.reverse(true);
+		this.setRowSort(data, pre);
+
+		if (rel) rel.grab(this.body);
+		this.fireEvent('stateChanged');
+		return this.fireEvent('sort', [this.body, this.sorted.index]);
+	},
+
+	parseData: function(parser){
+		return Array.map(this.body.rows, function(row, i){
+			var value = parser.convert.call(document.id(row.cells[this.sorted.index]));
+			return {
+				position: i,
+				value: value
+			};
+		}, this);
+	},
+
+	clearSort: function(){
+		this.setHeadSort(false);
+		this.body.getElements('td').removeClass(this.options.classCellSort);
+	},
+
+	reSort: function(){
+		if (this.sortable) this.sort.call(this, this.sorted.index, this.sorted.reverse);
+		return this;
+	},
+
+	enableSort: function(){
+		this.element.addClass(this.options.classSortable);
+		this.attachSorts(true);
+		this.setParsers();
+		this.sortable = true;
+		return this;
+	},
+
+	disableSort: function(){
+		this.element.removeClass(this.options.classSortable);
+		this.attachSorts(false);
+		this.sortSpans.each(function(span){
+			span.destroy();
+		});
+		this.sortSpans.empty();
+		this.sortable = false;
+		return this;
+	}
+
+});
+
+HtmlTable.ParserPriority = ['date', 'input-checked', 'input-value', 'float', 'number'];
+
+HtmlTable.Parsers = {
+
+	'date': {
+		match: /^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,
+		convert: function(){
+			var d = Date.parse(this.get('text').stripTags());
+			return (typeOf(d) == 'date') ? d.format('db') : '';
+		},
+		type: 'date'
+	},
+	'input-checked': {
+		match: / type="(radio|checkbox)"/,
+		convert: function(){
+			return this.getElement('input').checked;
+		}
+	},
+	'input-value': {
+		match: /<input/,
+		convert: function(){
+			return this.getElement('input').value;
+		}
+	},
+	'number': {
+		match: /^\d+[^\d.,]*$/,
+		convert: function(){
+			return this.get('text').stripTags().toInt();
+		},
+		number: true
+	},
+	'numberLax': {
+		match: /^[^\d]+\d+$/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^0-9]/, '').stripTags().toInt();
+		},
+		number: true
+	},
+	'float': {
+		match: /^[\d]+\.[\d]+/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^\d.e]/, '').stripTags().toFloat();
+		},
+		number: true
+	},
+	'floatLax': {
+		match: /^[^\d]+[\d]+\.[\d]+$/,
+		convert: function(){
+			return this.get('text').replace(/[^-?^\d.]/, '').stripTags().toFloat();
+		},
+		number: true
+	},
+	'string': {
+		match: null,
+		convert: function(){
+			return this.get('text').stripTags().toLowerCase();
+		}
+	},
+	'title': {
+		match: null,
+		convert: function(){
+			return this.title;
+		}
+	}
+
+};
+
+
+
+HtmlTable.defineParsers = function(parsers){
+	HtmlTable.Parsers = Object.append(HtmlTable.Parsers, parsers);
+	for (var parser in parsers){
+		HtmlTable.ParserPriority.unshift(parser);
+	}
+};
+
+})();
+
+
+/*
+---
+
+script: HtmlTable.Zebra.js
+
+name: HtmlTable.Zebra
+
+description: Builds a stripy table with methods to add rows.
+
+license: MIT-style license
+
+authors:
+  - Harald Kirschner
+  - Aaron Newton
+
+requires:
+  - HtmlTable
+  - Element.Shortcuts
+  - Class.refactor
+
+provides: [HtmlTable.Zebra]
+
+...
+*/
+
+HtmlTable = Class.refactor(HtmlTable, {
+
+	options: {
+		classZebra: 'table-tr-odd',
+		zebra: true,
+		zebraOnlyVisibleRows: true
+	},
+
+	initialize: function(){
+		this.previous.apply(this, arguments);
+		if (this.occluded) return this.occluded;
+		if (this.options.zebra) this.updateZebras();
+	},
+
+	updateZebras: function(){
+		var index = 0;
+		Array.each(this.body.rows, function(row){
+			if (!this.options.zebraOnlyVisibleRows || row.isDisplayed()){
+				this.zebra(row, index++);
+			}
+		}, this);
+	},
+
+	setRowStyle: function(row, i){
+		if (this.previous) this.previous(row, i);
+		this.zebra(row, i);
+	},
+
+	zebra: function(row, i){
+		return row[((i % 2) ? 'remove' : 'add')+'Class'](this.options.classZebra);
+	},
+
+	push: function(){
+		var pushed = this.previous.apply(this, arguments);
+		if (this.options.zebra) this.updateZebras();
+		return pushed;
+	}
+
+});
+
+/*
+---
+
+script: Scroller.js
+
+name: Scroller
+
+description: Class which scrolls the contents of any Element (including the window) when the mouse reaches the Element's boundaries.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+
+requires:
+  - Core/Events
+  - Core/Options
+  - Core/Element.Event
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Scroller]
+
+...
+*/
+
+var Scroller = new Class({
+
+	Implements: [Events, Options],
+
+	options: {
+		area: 20,
+		velocity: 1,
+		onChange: function(x, y){
+			this.element.scrollTo(x, y);
+		},
+		fps: 50
+	},
+
+	initialize: function(element, options){
+		this.setOptions(options);
+		this.element = document.id(element);
+		this.docBody = document.id(this.element.getDocument().body);
+		this.listener = (typeOf(this.element) != 'element') ? this.docBody : this.element;
+		this.timer = null;
+		this.bound = {
+			attach: this.attach.bind(this),
+			detach: this.detach.bind(this),
+			getCoords: this.getCoords.bind(this)
+		};
+	},
+
+	start: function(){
+		this.listener.addEvents({
+			mouseover: this.bound.attach,
+			mouseleave: this.bound.detach
+		});
+		return this;
+	},
+
+	stop: function(){
+		this.listener.removeEvents({
+			mouseover: this.bound.attach,
+			mouseleave: this.bound.detach
+		});
+		this.detach();
+		this.timer = clearInterval(this.timer);
+		return this;
+	},
+
+	attach: function(){
+		this.listener.addEvent('mousemove', this.bound.getCoords);
+	},
+
+	detach: function(){
+		this.listener.removeEvent('mousemove', this.bound.getCoords);
+		this.timer = clearInterval(this.timer);
+	},
+
+	getCoords: function(event){
+		this.page = (this.listener.get('tag') == 'body') ? event.client : event.page;
+		if (!this.timer) this.timer = this.scroll.periodical(Math.round(1000 / this.options.fps), this);
+	},
+
+	scroll: function(){
+		var size = this.element.getSize(),
+			scroll = this.element.getScroll(),
+			pos = ((this.element != this.docBody) && (this.element != window)) ? element.getOffsets() : {x: 0, y: 0},
+			scrollSize = this.element.getScrollSize(),
+			change = {x: 0, y: 0},
+			top = this.options.area.top || this.options.area,
+			bottom = this.options.area.bottom || this.options.area;
+		for (var z in this.page){
+			if (this.page[z] < (top + pos[z]) && scroll[z] != 0){
+				change[z] = (this.page[z] - top - pos[z]) * this.options.velocity;
+			} else if (this.page[z] + bottom > (size[z] + pos[z]) && scroll[z] + size[z] != scrollSize[z]){
+				change[z] = (this.page[z] - size[z] + bottom - pos[z]) * this.options.velocity;
+			}
+			change[z] = change[z].round();
+		}
+		if (change.y || change.x) this.fireEvent('change', [scroll.x + change.x, scroll.y + change.y]);
+	}
+
+});
+
+/*
+---
+
+script: Tips.js
+
+name: Tips
+
+description: Class for creating nice tips that follow the mouse cursor when hovering an element.
+
+license: MIT-style license
+
+authors:
+  - Valerio Proietti
+  - Christoph Pojer
+  - Luis Merino
+
+requires:
+  - Core/Options
+  - Core/Events
+  - Core/Element.Event
+  - Core/Element.Style
+  - Core/Element.Dimensions
+  - MooTools.More
+
+provides: [Tips]
+
+...
+*/
+
+(function(){
+
+var read = function(option, element){
+	return (option) ? (typeOf(option) == 'function' ? option(element) : element.get(option)) : '';
+};
+
+this.Tips = new Class({
 
 	Implements: [Events, Options],
 
 	options: {/*
-		onBeforeStart: function(thisElement){},
-		onStart: function(thisElement, event){},
-		onSnap: function(thisElement){},
-		onDrag: function(thisElement, event){},
-		onCancel: function(thisElement){},
-		onComplete: function(thisElement, event){},*/
-		snap: 6,
-		unit: 'px',
-		grid: false,
-		style: true,
-		limit: false,
-		handle: false,
-		invert: false,
-		preventDefault: false,
-		stopPropagation: false,
-		modifiers: {x: 'left', y: 'top'}
+		id: null,
+		onAttach: function(element){},
+		onDetach: function(element){},
+		onBound: function(coords){},*/
+		onShow: function(){
+			this.tip.setStyle('display', 'block');
+		},
+		onHide: function(){
+			this.tip.setStyle('display', 'none');
+		},
+		title: 'title',
+		text: function(element){
+			return element.get('rel') || element.get('href');
+		},
+		showDelay: 100,
+		hideDelay: 100,
+		className: 'tip-wrap',
+		offset: {x: 16, y: 16},
+		windowPadding: {x:0, y:0},
+		fixed: false,
+		waiAria: true
 	},
 
 	initialize: function(){
 		var params = Array.link(arguments, {
-			'options': Type.isObject,
-			'element': function(obj){
+			options: Type.isObject,
+			elements: function(obj){
 				return obj != null;
 			}
 		});
+		this.setOptions(params.options);
+		if (params.elements) this.attach(params.elements);
+		this.container = new Element('div', {'class': 'tip'});
 
-		this.element = document.id(params.element);
-		this.document = this.element.getDocument();
-		this.setOptions(params.options || {});
-		var htype = typeOf(this.options.handle);
-		this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
-		this.mouse = {'now': {}, 'pos': {}};
-		this.value = {'start': {}, 'now': {}};
-
-		this.selection = (Browser.ie) ? 'selectstart' : 'mousedown';
-
-
-		if (Browser.ie && !Drag.ondragstartFixed){
-			document.ondragstart = Function.from(false);
-			Drag.ondragstartFixed = true;
+		if (this.options.id){
+			this.container.set('id', this.options.id);
+			if (this.options.waiAria) this.attachWaiAria();
 		}
-
-		this.bound = {
-			start: this.start.bind(this),
-			check: this.check.bind(this),
-			drag: this.drag.bind(this),
-			stop: this.stop.bind(this),
-			cancel: this.cancel.bind(this),
-			eventStop: Function.from(false)
-		};
-		this.attach();
 	},
 
-	attach: function(){
-		this.handles.addEvent('mousedown', this.bound.start);
-		return this;
-	},
+	toElement: function(){
+		if (this.tip) return this.tip;
 
-	detach: function(){
-		this.handles.removeEvent('mousedown', this.bound.start);
-		return this;
-	},
-
-	start: function(event){
-		var options = this.options;
-
-		if (event.rightClick) return;
-
-		if (options.preventDefault) event.preventDefault();
-		if (options.stopPropagation) event.stopPropagation();
-		this.mouse.start = event.page;
-
-		this.fireEvent('beforeStart', this.element);
-
-		var limit = options.limit;
-		this.limit = {x: [], y: []};
-
-		var z, coordinates;
-		for (z in options.modifiers){
-			if (!options.modifiers[z]) continue;
-
-			var style = this.element.getStyle(options.modifiers[z]);
-
-			// Some browsers (IE and Opera) don't always return pixels.
-			if (style && !style.match(/px$/)){
-				if (!coordinates) coordinates = this.element.getCoordinates(this.element.getOffsetParent());
-				style = coordinates[options.modifiers[z]];
+		this.tip = new Element('div', {
+			'class': this.options.className,
+			styles: {
+				position: 'absolute',
+				top: 0,
+				left: 0
 			}
+		}).adopt(
+			new Element('div', {'class': 'tip-top'}),
+			this.container,
+			new Element('div', {'class': 'tip-bottom'})
+		);
 
-			if (options.style) this.value.now[z] = (style || 0).toInt();
-			else this.value.now[z] = this.element[options.modifiers[z]];
+		return this.tip;
+	},
 
-			if (options.invert) this.value.now[z] *= -1;
+	attachWaiAria: function(){
+		var id = this.options.id;
+		this.container.set('role', 'tooltip');
 
-			this.mouse.pos[z] = event.page[z] - this.value.now[z];
-
-			if (limit && limit[z]){
-				var i = 2;
-				while (i--){
-					var limitZI = limit[z][i];
-					if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
+		if (!this.waiAria){
+			this.waiAria = {
+				show: function(element){
+					if (id) element.set('aria-describedby', id);
+					this.container.set('aria-hidden', 'false');
+				},
+				hide: function(element){
+					if (id) element.erase('aria-describedby');
+					this.container.set('aria-hidden', 'true');
 				}
-			}
-		}
-
-		if (typeOf(this.options.grid) == 'number') this.options.grid = {
-			x: this.options.grid,
-			y: this.options.grid
-		};
-
-		var events = {
-			mousemove: this.bound.check,
-			mouseup: this.bound.cancel
-		};
-		events[this.selection] = this.bound.eventStop;
-		this.document.addEvents(events);
-	},
-
-	check: function(event){
-		if (this.options.preventDefault) event.preventDefault();
-		var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
-		if (distance > this.options.snap){
-			this.cancel();
-			this.document.addEvents({
-				mousemove: this.bound.drag,
-				mouseup: this.bound.stop
-			});
-			this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
-		}
-	},
-
-	drag: function(event){
-		var options = this.options;
-
-		if (options.preventDefault) event.preventDefault();
-		this.mouse.now = event.page;
-
-		for (var z in options.modifiers){
-			if (!options.modifiers[z]) continue;
-			this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
-
-			if (options.invert) this.value.now[z] *= -1;
-
-			if (options.limit && this.limit[z]){
-				if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
-					this.value.now[z] = this.limit[z][1];
-				} else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
-					this.value.now[z] = this.limit[z][0];
-				}
-			}
-
-			if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
-
-			if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
-			else this.element[options.modifiers[z]] = this.value.now[z];
-		}
-
-		this.fireEvent('drag', [this.element, event]);
-	},
-
-	cancel: function(event){
-		this.document.removeEvents({
-			mousemove: this.bound.check,
-			mouseup: this.bound.cancel
-		});
-		if (event){
-			this.document.removeEvent(this.selection, this.bound.eventStop);
-			this.fireEvent('cancel', this.element);
-		}
-	},
-
-	stop: function(event){
-		var events = {
-			mousemove: this.bound.drag,
-			mouseup: this.bound.stop
-		};
-		events[this.selection] = this.bound.eventStop;
-		this.document.removeEvents(events);
-		if (event) this.fireEvent('complete', [this.element, event]);
-	}
-
-});
-
-Element.implement({
-
-	makeResizable: function(options){
-		var drag = new Drag(this, Object.merge({
-			modifiers: {
-				x: 'width',
-				y: 'height'
-			}
-		}, options));
-
-		this.store('resizer', drag);
-		return drag.addEvent('drag', function(){
-			this.fireEvent('resize', drag);
-		}.bind(this));
-	}
-
-});
-
-
-/*
----
-
-script: Drag.Move.js
-
-name: Drag.Move
-
-description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Tom Occhinno
-  - Jan Kassens
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - Core/Element.Dimensions
-  - /Drag
-
-provides: [Drag.Move]
-
-...
-*/
-
-Drag.Move = new Class({
-
-	Extends: Drag,
-
-	options: {/*
-		onEnter: function(thisElement, overed){},
-		onLeave: function(thisElement, overed){},
-		onDrop: function(thisElement, overed, event){},*/
-		droppables: [],
-		container: false,
-		precalculate: false,
-		includeMargins: true,
-		checkDroppables: true
-	},
-
-	initialize: function(element, options){
-		this.parent(element, options);
-		element = this.element;
-
-		this.droppables = $$(this.options.droppables);
-		this.container = document.id(this.options.container);
-
-		if (this.container && typeOf(this.container) != 'element')
-			this.container = document.id(this.container.getDocument().body);
-
-		if (this.options.style){
-			if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
-				var parent = element.getOffsetParent(),
-					styles = element.getStyles('left', 'top');
-				if (parent && (styles.left == 'auto' || styles.top == 'auto')){
-					element.setPosition(element.getPosition(parent));
-				}
-			}
-
-			if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
-		}
-
-		this.addEvent('start', this.checkDroppables, true);
-		this.overed = null;
-	},
-
-	start: function(event){
-		if (this.container) this.options.limit = this.calculateLimit();
-
-		if (this.options.precalculate){
-			this.positions = this.droppables.map(function(el){
-				return el.getCoordinates();
-			});
-		}
-
-		this.parent(event);
-	},
-
-	calculateLimit: function(){
-		var element = this.element,
-			container = this.container,
-
-			offsetParent = document.id(element.getOffsetParent()) || document.body,
-			containerCoordinates = container.getCoordinates(offsetParent),
-			elementMargin = {},
-			elementBorder = {},
-			containerMargin = {},
-			containerBorder = {},
-			offsetParentPadding = {};
-
-		['top', 'right', 'bottom', 'left'].each(function(pad){
-			elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
-			elementBorder[pad] = element.getStyle('border-' + pad).toInt();
-			containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
-			containerBorder[pad] = container.getStyle('border-' + pad).toInt();
-			offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
-		}, this);
-
-		var width = element.offsetWidth + elementMargin.left + elementMargin.right,
-			height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
-			left = 0,
-			top = 0,
-			right = containerCoordinates.right - containerBorder.right - width,
-			bottom = containerCoordinates.bottom - containerBorder.bottom - height;
-
-		if (this.options.includeMargins){
-			left += elementMargin.left;
-			top += elementMargin.top;
-		} else {
-			right += elementMargin.right;
-			bottom += elementMargin.bottom;
-		}
-
-		if (element.getStyle('position') == 'relative'){
-			var coords = element.getCoordinates(offsetParent);
-			coords.left -= element.getStyle('left').toInt();
-			coords.top -= element.getStyle('top').toInt();
-
-			left -= coords.left;
-			top -= coords.top;
-			if (container.getStyle('position') != 'relative'){
-				left += containerBorder.left;
-				top += containerBorder.top;
-			}
-			right += elementMargin.left - coords.left;
-			bottom += elementMargin.top - coords.top;
-
-			if (container != offsetParent){
-				left += containerMargin.left + offsetParentPadding.left;
-				top += ((Browser.ie6 || Browser.ie7) ? 0 : containerMargin.top) + offsetParentPadding.top;
-			}
-		} else {
-			left -= elementMargin.left;
-			top -= elementMargin.top;
-			if (container != offsetParent){
-				left += containerCoordinates.left + containerBorder.left;
-				top += containerCoordinates.top + containerBorder.top;
-			}
-		}
-
-		return {
-			x: [left, right],
-			y: [top, bottom]
-		};
-	},
-
-	getDroppableCoordinates: function(element){
-		var position = element.getCoordinates();
-		if (element.getStyle('position') == 'fixed'){
-			var scroll = window.getScroll();
-			position.left += scroll.x;
-			position.right += scroll.x;
-			position.top += scroll.y;
-			position.bottom += scroll.y;
-		}
-		return position;
-	},
-
-	checkDroppables: function(){
-		var overed = this.droppables.filter(function(el, i){
-			el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
-			var now = this.mouse.now;
-			return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
-		}, this).getLast();
-
-		if (this.overed != overed){
-			if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
-			if (overed) this.fireEvent('enter', [this.element, overed]);
-			this.overed = overed;
-		}
-	},
-
-	drag: function(event){
-		this.parent(event);
-		if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
-	},
-
-	stop: function(event){
-		this.checkDroppables();
-		this.fireEvent('drop', [this.element, this.overed, event]);
-		this.overed = null;
-		return this.parent(event);
-	}
-
-});
-
-Element.implement({
-
-	makeDraggable: function(options){
-		var drag = new Drag.Move(this, options);
-		this.store('dragger', drag);
-		return drag;
-	}
-
-});
-
-
-/*
----
-
-script: Slider.js
-
-name: Slider
-
-description: Class for creating horizontal and vertical slider controls.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Element.Dimensions
-  - /Class.Binds
-  - /Drag
-  - /Element.Measure
-
-provides: [Slider]
-
-...
-*/
-
-var Slider = new Class({
-
-	Implements: [Events, Options],
-
-	Binds: ['clickedElement', 'draggedKnob', 'scrolledElement'],
-
-	options: {/*
-		onTick: function(intPosition){},
-		onChange: function(intStep){},
-		onComplete: function(strStep){},*/
-		onTick: function(position){
-			this.setKnobPosition(position);
-		},
-		initialStep: 0,
-		snap: false,
-		offset: 0,
-		range: false,
-		wheel: false,
-		steps: 100,
-		mode: 'horizontal'
-	},
-
-	initialize: function(element, knob, options){
-		this.setOptions(options);
-		options = this.options;
-		this.element = document.id(element);
-		knob = this.knob = document.id(knob);
-		this.previousChange = this.previousEnd = this.step = -1;
-
-		var limit = {},
-			modifiers = {x: false, y: false};
-
-		switch (options.mode){
-			case 'vertical':
-				this.axis = 'y';
-				this.property = 'top';
-				this.offset = 'offsetHeight';
-				break;
-			case 'horizontal':
-				this.axis = 'x';
-				this.property = 'left';
-				this.offset = 'offsetWidth';
-		}
-
-		this.setSliderDimensions();
-		this.setRange(options.range);
-
-		if (knob.getStyle('position') == 'static') knob.setStyle('position', 'relative');
-		knob.setStyle(this.property, -options.offset);
-		modifiers[this.axis] = this.property;
-		limit[this.axis] = [-options.offset, this.full - options.offset];
-
-		var dragOptions = {
-			snap: 0,
-			limit: limit,
-			modifiers: modifiers,
-			onDrag: this.draggedKnob,
-			onStart: this.draggedKnob,
-			onBeforeStart: (function(){
-				this.isDragging = true;
-			}).bind(this),
-			onCancel: function(){
-				this.isDragging = false;
-			}.bind(this),
-			onComplete: function(){
-				this.isDragging = false;
-				this.draggedKnob();
-				this.end();
-			}.bind(this)
-		};
-		if (options.snap) this.setSnap(dragOptions);
-
-		this.drag = new Drag(knob, dragOptions);
-		this.attach();
-		if (options.initialStep != null) this.set(options.initialStep);
-	},
-
-	attach: function(){
-		this.element.addEvent('mousedown', this.clickedElement);
-		if (this.options.wheel) this.element.addEvent('mousewheel', this.scrolledElement);
-		this.drag.attach();
-		return this;
-	},
-
-	detach: function(){
-		this.element.removeEvent('mousedown', this.clickedElement)
-			.removeEvent('mousewheel', this.scrolledElement);
-		this.drag.detach();
-		return this;
-	},
-
-	autosize: function(){
-		this.setSliderDimensions()
-			.setKnobPosition(this.toPosition(this.step));
-		this.drag.options.limit[this.axis] = [-this.options.offset, this.full - this.options.offset];
-		if (this.options.snap) this.setSnap();
-		return this;
-	},
-
-	setSnap: function(options){
-		if (!options) options = this.drag.options;
-		options.grid = Math.ceil(this.stepWidth);
-		options.limit[this.axis][1] = this.full;
-		return this;
-	},
-
-	setKnobPosition: function(position){
-		if (this.options.snap) position = this.toPosition(this.step);
-		this.knob.setStyle(this.property, position);
-		return this;
-	},
-
-	setSliderDimensions: function(){
-		this.full = this.element.measure(function(){
-			this.half = this.knob[this.offset] / 2;
-			return this.element[this.offset] - this.knob[this.offset] + (this.options.offset * 2);
-		}.bind(this));
-		return this;
-	},
-
-	set: function(step){
-		if (!((this.range > 0) ^ (step < this.min))) step = this.min;
-		if (!((this.range > 0) ^ (step > this.max))) step = this.max;
-
-		this.step = Math.round(step);
-		return this.checkStep()
-			.fireEvent('tick', this.toPosition(this.step))
-			.end();
-	},
-
-	setRange: function(range, pos){
-		this.min = Array.pick([range[0], 0]);
-		this.max = Array.pick([range[1], this.options.steps]);
-		this.range = this.max - this.min;
-		this.steps = this.options.steps || this.full;
-		this.stepSize = Math.abs(this.range) / this.steps;
-		this.stepWidth = this.stepSize * this.full / Math.abs(this.range);
-		if (range) this.set(Array.pick([pos, this.step]).floor(this.min).max(this.max));
-		return this;
-	},
-
-	clickedElement: function(event){
-		if (this.isDragging || event.target == this.knob) return;
-
-		var dir = this.range < 0 ? -1 : 1,
-			position = event.page[this.axis] - this.element.getPosition()[this.axis] - this.half;
-
-		position = position.limit(-this.options.offset, this.full - this.options.offset);
-
-		this.step = Math.round(this.min + dir * this.toStep(position));
-
-		this.checkStep()
-			.fireEvent('tick', position)
-			.end();
-	},
-
-	scrolledElement: function(event){
-		var mode = (this.options.mode == 'horizontal') ? (event.wheel < 0) : (event.wheel > 0);
-		this.set(this.step + (mode ? -1 : 1) * this.stepSize);
-		event.stop();
-	},
-
-	draggedKnob: function(){
-		var dir = this.range < 0 ? -1 : 1,
-			position = this.drag.value.now[this.axis];
-
-		position = position.limit(-this.options.offset, this.full -this.options.offset);
-
-		this.step = Math.round(this.min + dir * this.toStep(position));
-		this.checkStep();
-	},
-
-	checkStep: function(){
-		var step = this.step;
-		if (this.previousChange != step){
-			this.previousChange = step;
-			this.fireEvent('change', step);
-		}
-		return this;
-	},
-
-	end: function(){
-		var step = this.step;
-		if (this.previousEnd !== step){
-			this.previousEnd = step;
-			this.fireEvent('complete', step + '');
-		}
-		return this;
-	},
-
-	toStep: function(position){
-		var step = (position + this.options.offset) * this.stepSize / this.full * this.steps;
-		return this.options.steps ? Math.round(step -= step % this.stepSize) : step;
-	},
-
-	toPosition: function(step){
-		return (this.full * Math.abs(this.min - step)) / (this.steps * this.stepSize) - this.options.offset;
-	}
-
-});
-
-
-/*
----
-
-script: Sortables.js
-
-name: Sortables
-
-description: Class for creating a drag and drop sorting interface for lists of items.
-
-license: MIT-style license
-
-authors:
-  - Tom Occhino
-
-requires:
-  - Core/Fx.Morph
-  - /Drag.Move
-
-provides: [Sortables]
-
-...
-*/
-
-var Sortables = new Class({
-
-	Implements: [Events, Options],
-
-	options: {/*
-		onSort: function(element, clone){},
-		onStart: function(element, clone){},
-		onComplete: function(element){},*/
-		opacity: 1,
-		clone: false,
-		revert: false,
-		handle: false,
-		dragOptions: {}
-	},
-
-	initialize: function(lists, options){
-		this.setOptions(options);
-
-		this.elements = [];
-		this.lists = [];
-		this.idle = true;
-
-		this.addLists($$(document.id(lists) || lists));
-
-		if (!this.options.clone) this.options.revert = false;
-		if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
-			duration: 250,
-			link: 'cancel'
-		}, this.options.revert));
-	},
-
-	attach: function(){
-		this.addLists(this.lists);
-		return this;
-	},
-
-	detach: function(){
-		this.lists = this.removeLists(this.lists);
-		return this;
-	},
-
-	addItems: function(){
-		Array.flatten(arguments).each(function(element){
-			this.elements.push(element);
-			var start = element.retrieve('sortables:start', function(event){
-				this.start.call(this, event, element);
-			}.bind(this));
-			(this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
-		}, this);
-		return this;
-	},
-
-	addLists: function(){
-		Array.flatten(arguments).each(function(list){
-			this.lists.include(list);
-			this.addItems(list.getChildren());
-		}, this);
-		return this;
-	},
-
-	removeItems: function(){
-		return $$(Array.flatten(arguments).map(function(element){
-			this.elements.erase(element);
-			var start = element.retrieve('sortables:start');
-			(this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
-
-			return element;
-		}, this));
-	},
-
-	removeLists: function(){
-		return $$(Array.flatten(arguments).map(function(list){
-			this.lists.erase(list);
-			this.removeItems(list.getChildren());
-
-			return list;
-		}, this));
-	},
-
-	getClone: function(event, element){
-		if (!this.options.clone) return new Element(element.tagName).inject(document.body);
-		if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
-		var clone = element.clone(true).setStyles({
-			margin: 0,
-			position: 'absolute',
-			visibility: 'hidden',
-			width: element.getStyle('width')
-		}).addEvent('mousedown', function(event){
-			element.fireEvent('mousedown', event);
-		});
-		//prevent the duplicated radio inputs from unchecking the real one
-		if (clone.get('html').test('radio')){
-			clone.getElements('input[type=radio]').each(function(input, i){
-				input.set('name', 'clone_' + i);
-				if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
-			});
-		}
-
-		return clone.inject(this.list).setPosition(element.getPosition(element.getOffsetParent()));
-	},
-
-	getDroppables: function(){
-		var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
-		if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
-		return droppables;
-	},
-
-	insert: function(dragging, element){
-		var where = 'inside';
-		if (this.lists.contains(element)){
-			this.list = element;
-			this.drag.droppables = this.getDroppables();
-		} else {
-			where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
-		}
-		this.element.inject(element, where);
-		this.fireEvent('sort', [this.element, this.clone]);
-	},
-
-	start: function(event, element){
-		if (
-			!this.idle ||
-			event.rightClick ||
-			['button', 'input', 'a'].contains(event.target.get('tag'))
-		) return;
-
-		this.idle = false;
-		this.element = element;
-		this.opacity = element.get('opacity');
-		this.list = element.getParent();
-		this.clone = this.getClone(event, element);
-
-		this.drag = new Drag.Move(this.clone, Object.merge({
-			
-			droppables: this.getDroppables()
-		}, this.options.dragOptions)).addEvents({
-			onSnap: function(){
-				event.stop();
-				this.clone.setStyle('visibility', 'visible');
-				this.element.set('opacity', this.options.opacity || 0);
-				this.fireEvent('start', [this.element, this.clone]);
-			}.bind(this),
-			onEnter: this.insert.bind(this),
-			onCancel: this.end.bind(this),
-			onComplete: this.end.bind(this)
-		});
-
-		this.clone.inject(this.element, 'before');
-		this.drag.start(event);
-	},
-
-	end: function(){
-		this.drag.detach();
-		this.element.set('opacity', this.opacity);
-		if (this.effect){
-			var dim = this.element.getStyles('width', 'height'),
-				clone = this.clone,
-				pos = clone.computePosition(this.element.getPosition(this.clone.getOffsetParent()));
-
-			var destroy = function(){
-				this.removeEvent('cancel', destroy);
-				clone.destroy();
 			};
-
-			this.effect.element = clone;
-			this.effect.start({
-				top: pos.top,
-				left: pos.left,
-				width: dim.width,
-				height: dim.height,
-				opacity: 0.25
-			}).addEvent('cancel', destroy).chain(destroy);
-		} else {
-			this.clone.destroy();
 		}
-		this.reset();
+		this.addEvents(this.waiAria);
 	},
 
-	reset: function(){
-		this.idle = true;
-		this.fireEvent('complete', this.element);
+	detachWaiAria: function(){
+		if (this.waiAria){
+			this.container.erase('role');
+			this.container.erase('aria-hidden');
+			this.removeEvents(this.waiAria);
+		}
 	},
 
-	serialize: function(){
-		var params = Array.link(arguments, {
-			modifier: Type.isFunction,
-			index: function(obj){
-				return obj != null;
-			}
-		});
-		var serial = this.lists.map(function(list){
-			return list.getChildren().map(params.modifier || function(element){
-				return element.get('id');
+	attach: function(elements){
+		$$(elements).each(function(element){
+			var title = read(this.options.title, element),
+				text = read(this.options.text, element);
+
+			element.set('title', '').store('tip:native', title).retrieve('tip:title', title);
+			element.retrieve('tip:text', text);
+			this.fireEvent('attach', [element]);
+
+			var events = ['enter', 'leave'];
+			if (!this.options.fixed) events.push('move');
+
+			events.each(function(value){
+				var event = element.retrieve('tip:' + value);
+				if (!event) event = function(event){
+					this['element' + value.capitalize()].apply(this, [event, element]);
+				}.bind(this);
+
+				element.store('tip:' + value, event).addEvent('mouse' + value, event);
 			}, this);
 		}, this);
 
-		var index = params.index;
-		if (this.lists.length == 1) index = 0;
-		return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
+		return this;
+	},
+
+	detach: function(elements){
+		$$(elements).each(function(element){
+			['enter', 'leave', 'move'].each(function(value){
+				element.removeEvent('mouse' + value, element.retrieve('tip:' + value)).eliminate('tip:' + value);
+			});
+
+			this.fireEvent('detach', [element]);
+
+			if (this.options.title == 'title'){ // This is necessary to check if we can revert the title
+				var original = element.retrieve('tip:native');
+				if (original) element.set('title', original);
+			}
+		}, this);
+
+		return this;
+	},
+
+	elementEnter: function(event, element){
+		clearTimeout(this.timer);
+		this.timer = (function(){
+			this.container.empty();
+
+			['title', 'text'].each(function(value){
+				var content = element.retrieve('tip:' + value);
+				var div = this['_' + value + 'Element'] = new Element('div', {
+						'class': 'tip-' + value
+					}).inject(this.container);
+				if (content) this.fill(div, content);
+			}, this);
+			this.show(element);
+			this.position((this.options.fixed) ? {page: element.getPosition()} : event);
+		}).delay(this.options.showDelay, this);
+	},
+
+	elementLeave: function(event, element){
+		clearTimeout(this.timer);
+		this.timer = this.hide.delay(this.options.hideDelay, this, element);
+		this.fireForParent(event, element);
+	},
+
+	setTitle: function(title){
+		if (this._titleElement){
+			this._titleElement.empty();
+			this.fill(this._titleElement, title);
+		}
+		return this;
+	},
+
+	setText: function(text){
+		if (this._textElement){
+			this._textElement.empty();
+			this.fill(this._textElement, text);
+		}
+		return this;
+	},
+
+	fireForParent: function(event, element){
+		element = element.getParent();
+		if (!element || element == document.body) return;
+		if (element.retrieve('tip:enter')) element.fireEvent('mouseenter', event);
+		else this.fireForParent(event, element);
+	},
+
+	elementMove: function(event, element){
+		this.position(event);
+	},
+
+	position: function(event){
+		if (!this.tip) document.id(this);
+
+		var size = window.getSize(), scroll = window.getScroll(),
+			tip = {x: this.tip.offsetWidth, y: this.tip.offsetHeight},
+			props = {x: 'left', y: 'top'},
+			bounds = {y: false, x2: false, y2: false, x: false},
+			obj = {};
+
+		for (var z in props){
+			obj[props[z]] = event.page[z] + this.options.offset[z];
+			if (obj[props[z]] < 0) bounds[z] = true;
+			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]){
+				obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z];
+				bounds[z+'2'] = true;
+			}
+		}
+
+		this.fireEvent('bound', bounds);
+		this.tip.setStyles(obj);
+	},
+
+	fill: function(element, contents){
+		if (typeof contents == 'string') element.set('html', contents);
+		else element.adopt(contents);
+	},
+
+	show: function(element){
+		if (!this.tip) document.id(this);
+		if (!this.tip.getParent()) this.tip.inject(document.body);
+		this.fireEvent('show', [this.tip, element]);
+	},
+
+	hide: function(element){
+		if (!this.tip) document.id(this);
+		this.fireEvent('hide', [this.tip, element]);
 	}
 
 });
 
+})();
+
+/*
+---
+
+name: Locale.EU.Number
+
+description: Number messages for Europe.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - Locale
+
+provides: [Locale.EU.Number]
+
+...
+*/
+
+Locale.define('EU', 'Number', {
+
+	decimal: ',',
+	group: '.',
+
+	currency: {
+		prefix: '€ '
+	}
+
+});
+
+/*
+---
+
+script: Locale.Set.From.js
+
+name: Locale.Set.From
+
+description: Provides an alternative way to create Locale.Set objects.
+
+license: MIT-style license
+
+authors:
+  - Tim Wienk
+
+requires:
+  - Core/JSON
+  - Locale
+
+provides: Locale.Set.From
+
+...
+*/
+
+(function(){
+
+var parsers = {
+	'json': JSON.decode
+};
+
+Locale.Set.defineParser = function(name, fn){
+	parsers[name] = fn;
+};
+
+Locale.Set.from = function(set, type){
+	if (instanceOf(set, Locale.Set)) return set;
+
+	if (!type && typeOf(set) == 'string') type = 'json';
+	if (parsers[type]) set = parsers[type](set);
+
+	var locale = new Locale.Set;
+
+	locale.sets = set.sets || {};
+
+	if (set.inherits){
+		locale.inherits.locales = Array.from(set.inherits.locales);
+		locale.inherits.sets = set.inherits.sets || {};
+	}
+
+	return locale;
+};
+
+})();
+
+/*
+---
+
+name: Locale.ZA.Number
+
+description: Number messages for ZA.
+
+license: MIT-style license
+
+authors:
+  - Werner Mollentze
+
+requires:
+  - Locale
+
+provides: [Locale.ZA.Number]
+
+...
+*/
+
+Locale.define('ZA', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+	currency: {
+		prefix: 'R '
+	}
+
+});
+
+
+
+/*
+---
+
+name: Locale.af-ZA.Date
+
+description: Date messages for ZA Afrikaans.
+
+license: MIT-style license
+
+authors:
+  - Werner Mollentze
+
+requires:
+  - Locale
+
+provides: [Locale.af-ZA.Date]
+
+...
+*/
+
+Locale.define('af-ZA', 'Date', {
+
+	months: ['Januarie', 'Februarie', 'Maart', 'April', 'Mei', 'Junie', 'Julie', 'Augustus', 'September', 'Oktober', 'November', 'Desember'],
+	months_abbr: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
+	days: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
+	days_abbr: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'VM',
+	PM: 'NM',
+	firstDayOfWeek: 1,
+   
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		return ((dayOfMonth > 1 && dayOfMonth < 20 && dayOfMonth != 8) || (dayOfMonth > 100 && dayOfMonth.toString().substr(-2, 1) == '1')) ? 'de' : 'ste';
+	},
+
+	lessThanMinuteAgo: 'minder as \'n minuut gelede',
+	minuteAgo: 'ongeveer \'n minuut gelede',
+	minutesAgo: '{delta} minute gelede',
+	hourAgo: 'omtret \'n uur gelede',
+	hoursAgo: 'ongeveer {delta} ure gelede',
+	dayAgo: '1 dag gelede',
+	daysAgo: '{delta} dae gelede',
+	weekAgo: '1 week gelede',
+	weeksAgo: '{delta} weke gelede',
+	monthAgo: '1 maand gelede',
+	monthsAgo: '{delta} maande gelede',
+	yearAgo: '1 jaar gelede',
+	yearsAgo: '{delta} jare gelede',
+
+	lessThanMinuteUntil: 'oor minder as \'n minuut',
+	minuteUntil: 'oor ongeveer \'n minuut',
+	minutesUntil: 'oor {delta} minute',
+	hourUntil: 'oor ongeveer \'n uur',
+	hoursUntil: 'oor {delta} uur',
+	dayUntil: 'oor ongeveer \'n dag',
+	daysUntil: 'oor {delta} dae',
+	weekUntil: 'oor \'n week',
+	weeksUntil: 'oor {delta} weke',
+	monthUntil: 'oor \'n maand',
+	monthsUntil: 'oor {delta} maande',
+	yearUntil: 'oor \'n jaar',
+	yearsUntil: 'oor {delta} jaar'
+
+});
+
+/*
+---
+
+name: Locale.af-ZA.Form.Validator
+
+description: Form Validator messages for Afrikaans.
+
+license: MIT-style license
+
+authors:
+  - Werner Mollentze
+
+requires:
+  - Locale
+
+provides: [Locale.af-ZA.Form.Validator]
+
+...
+*/
+
+Locale.define('af-ZA', 'FormValidator', {
+
+	required: 'Hierdie veld word vereis.',
+	length: 'Voer asseblief {length} karakters in (u het {elLength} karakters ingevoer)',
+	minLength: 'Voer asseblief ten minste {minLength} karakters in (u het {length} karakters ingevoer).',
+	maxLength: 'Moet asseblief nie meer as {maxLength} karakters invoer nie (u het {length} karakters ingevoer).',
+	integer: 'Voer asseblief \'n heelgetal in hierdie veld in. Getalle met desimale (bv. 1.25) word nie toegelaat nie.',
+	numeric: 'Voer asseblief slegs numeriese waardes in hierdie veld in (bv. "1" of "1.1" of "-1" of "-1.1").',
+	digits: 'Gebruik asseblief slegs nommers en punktuasie in hierdie veld. (by voorbeeld, \'n telefoon nommer wat koppeltekens en punte bevat is toelaatbaar).',
+	alpha: 'Gebruik asseblief slegs letters (a-z) binne-in hierdie veld. Geen spasies of ander karakters word toegelaat nie.',
+	alphanum: 'Gebruik asseblief slegs letters (a-z) en nommers (0-9) binne-in hierdie veld. Geen spasies of ander karakters word toegelaat nie.',
+	dateSuchAs: 'Voer asseblief \'n geldige datum soos {date} in',
+	dateInFormatMDY: 'Voer asseblief \'n geldige datum soos MM/DD/YYYY in (bv. "12/31/1999")',
+	email: 'Voer asseblief \'n geldige e-pos adres in. Byvoorbeeld "fred@domain.com".',
+	url: 'Voer asseblief \'n geldige bronadres (URL) soos http://www.example.com in.',
+	currencyDollar: 'Voer asseblief \'n geldige $ bedrag in. Byvoorbeeld $100.00 .',
+	oneRequired: 'Voer asseblief iets in vir ten minste een van hierdie velde.',
+	errorPrefix: 'Fout: ',
+	warningPrefix: 'Waarskuwing: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Daar mag geen spasies in hierdie toevoer wees nie.',
+	reqChkByNode: 'Geen items is gekies nie.',
+	requiredChk: 'Hierdie veld word vereis.',
+	reqChkByName: 'Kies asseblief \'n {label}.',
+	match: 'Hierdie veld moet by die {matchName} veld pas',
+	startDate: 'die begin datum',
+	endDate: 'die eind datum',
+	currentDate: 'die huidige datum',
+	afterDate: 'Die datum moet dieselfde of na {label} wees.',
+	beforeDate: 'Die datum moet dieselfde of voor {label} wees.',
+	startMonth: 'Kies asseblief \'n begin maand',
+	sameMonth: 'Hierdie twee datums moet in dieselfde maand wees - u moet een of beide verander.',
+	creditcard: 'Die ingevoerde kredietkaart nommer is ongeldig. Bevestig asseblief die nommer en probeer weer. {length} syfers is ingevoer.'
+
+});
+
+/*
+---
+
+name: Locale.af-ZA.Number
+
+description: Number messages for ZA Afrikaans.
+
+license: MIT-style license
+
+authors:
+  - Werner Mollentze
+
+requires:
+  - Locale
+  - Locale.ZA.Number
+
+provides: [Locale.af-ZA.Number]
+
+...
+*/
+
+Locale.define('af-ZA').inherit('ZA', 'Number');
+
+/*
+---
+
+name: Locale.ar.Date
+
+description: Date messages for Arabic.
+
+license: MIT-style license
+
+authors:
+  - Chafik Barbar
+
+requires:
+  - Locale
+
+provides: [Locale.ar.Date]
+
+...
+*/
+
+Locale.define('ar', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M'
+
+});
+
+/*
+---
+
+name: Locale.ar.Form.Validator
+
+description: Form Validator messages for Arabic.
+
+license: MIT-style license
+
+authors:
+  - Chafik Barbar
+
+requires:
+  - Locale
+
+provides: [Locale.ar.Form.Validator]
+
+...
+*/
+
+Locale.define('ar', 'FormValidator', {
+
+	required: 'هذا الحقل مطلوب.',
+	minLength: 'رجاءً إدخال {minLength} أحرف على الأقل (تم إدخال {length} أحرف).',
+	maxLength: 'الرجاء عدم إدخال أكثر من {maxLength} أحرف (تم إدخال {length} أحرف).',
+	integer: 'الرجاء إدخال عدد صحيح في هذا الحقل. أي رقم ذو كسر عشري أو مئوي (مثال 1.25 ) غير مسموح.',
+	numeric: 'الرجاء إدخال قيم رقمية في هذا الحقل (مثال "1" أو "1.1" أو "-1" أو "-1.1").',
+	digits: 'الرجاء أستخدام قيم رقمية وعلامات ترقيمية فقط في هذا الحقل (مثال, رقم هاتف مع نقطة أو شحطة)',
+	alpha: 'الرجاء أستخدام أحرف فقط (ا-ي) في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
+	alphanum: 'الرجاء أستخدام أحرف فقط (ا-ي) أو أرقام (0-9) فقط في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
+	dateSuchAs: 'الرجاء إدخال تاريخ صحيح كالتالي {date}',
+	dateInFormatMDY: 'الرجاء إدخال تاريخ صحيح (مثال, 31-12-1999)',
+	email: 'الرجاء إدخال بريد إلكتروني صحيح.',
+	url: 'الرجاء إدخال عنوان إلكتروني صحيح مثل http://www.example.com',
+	currencyDollar: 'الرجاء إدخال قيمة $ صحيحة. مثال, 100.00$',
+	oneRequired: 'الرجاء إدخال قيمة في أحد هذه الحقول على الأقل.',
+	errorPrefix: 'خطأ: ',
+	warningPrefix: 'تحذير: '
+
+});
+
+/*
+---
+
+name: Locale.ca-CA.Date
+
+description: Date messages for Catalan.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - Locale
+
+provides: [Locale.ca-CA.Date]
+
+...
+*/
+
+Locale.define('ca-CA', 'Date', {
+
+	months: ['Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juli', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre'],
+	months_abbr: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.', 'set.', 'oct.', 'nov.', 'des.'],
+	days: ['Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte'],
+	days_abbr: ['dg', 'dl', 'dt', 'dc', 'dj', 'dv', 'ds'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'fa menys d`un minut',
+	minuteAgo: 'fa un minut',
+	minutesAgo: 'fa {delta} minuts',
+	hourAgo: 'fa un hora',
+	hoursAgo: 'fa unes {delta} hores',
+	dayAgo: 'fa un dia',
+	daysAgo: 'fa {delta} dies',
+
+	lessThanMinuteUntil: 'menys d`un minut des d`ara',
+	minuteUntil: 'un minut des d`ara',
+	minutesUntil: '{delta} minuts des d`ara',
+	hourUntil: 'un hora des d`ara',
+	hoursUntil: 'unes {delta} hores des d`ara',
+	dayUntil: '1 dia des d`ara',
+	daysUntil: '{delta} dies des d`ara'
+
+});
+
+/*
+---
+
+name: Locale.ca-CA.Form.Validator
+
+description: Form Validator messages for Catalan.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+  - Ãlfons Sanchez
+
+requires:
+  - Locale
+
+provides: [Locale.ca-CA.Form.Validator]
+
+...
+*/
+
+Locale.define('ca-CA', 'FormValidator', {
+
+	required: 'Aquest camp es obligatori.',
+	minLength: 'Per favor introdueix al menys {minLength} caracters (has introduit {length} caracters).',
+	maxLength: 'Per favor introdueix no mes de {maxLength} caracters (has introduit {length} caracters).',
+	integer: 'Per favor introdueix un nombre enter en aquest camp. Nombres amb decimals (p.e. 1,25) no estan permesos.',
+	numeric: 'Per favor introdueix sols valors numerics en aquest camp (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Per favor usa sols numeros i puntuacio en aquest camp (per exemple, un nombre de telefon amb guions i punts no esta permes).',
+	alpha: 'Per favor utilitza lletres nomes (a-z) en aquest camp. No s´admiteixen espais ni altres caracters.',
+	alphanum: 'Per favor, utilitza nomes lletres (a-z) o numeros (0-9) en aquest camp. No s´admiteixen espais ni altres caracters.',
+	dateSuchAs: 'Per favor introdueix una data valida com {date}',
+	dateInFormatMDY: 'Per favor introdueix una data valida com DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Per favor, introdueix una adreça de correu electronic valida. Per exemple, "fred@domain.com".',
+	url: 'Per favor introdueix una URL valida com http://www.example.com.',
+	currencyDollar: 'Per favor introdueix una quantitat valida de €. Per exemple €100,00 .',
+	oneRequired: 'Per favor introdueix alguna cosa per al menys una d´aquestes entrades.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Avis: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No poden haver espais en aquesta entrada.',
+	reqChkByNode: 'No hi han elements seleccionats.',
+	requiredChk: 'Aquest camp es obligatori.',
+	reqChkByName: 'Per favor selecciona una {label}.',
+	match: 'Aquest camp necessita coincidir amb el camp {matchName}',
+	startDate: 'la data de inici',
+	endDate: 'la data de fi',
+	currentDate: 'la data actual',
+	afterDate: 'La data deu ser igual o posterior a {label}.',
+	beforeDate: 'La data deu ser igual o anterior a {label}.',
+	startMonth: 'Per favor selecciona un mes d´orige',
+	sameMonth: 'Aquestes dos dates deuen estar dins del mateix mes - deus canviar una o altra.'
+
+});
+
+/*
+---
+
+name: Locale.cs-CZ.Date
+
+description: Date messages for Czech.
+
+license: MIT-style license
+
+authors:
+  - Jan Černý chemiX
+  - Christopher Zukowski
+
+requires:
+  - Locale
+
+provides: [Locale.cs-CZ.Date]
+
+...
+*/
+(function(){
+
+// Czech language pluralization rules, see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+// one -> n is 1;            1
+// few -> n in 2..4;         2-4
+// other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
+var pluralize = function (n, one, few, other){
+	if (n == 1) return one;
+	else if (n == 2 || n == 3 || n == 4) return few;
+	else return other;
+};
+
+Locale.define('cs-CZ', 'Date', {
+
+	months: ['Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec'],
+	months_abbr: ['ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince'],
+	days: ['Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'],
+	days_abbr: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'dop.',
+	PM: 'odp.',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'před chvílí',
+	minuteAgo: 'přibližně před minutou',
+	minutesAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'minutou', 'minutami', 'minutami'); },
+	hourAgo: 'přibližně před hodinou',
+	hoursAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'hodinou', 'hodinami', 'hodinami'); },
+	dayAgo: 'před dnem',
+	daysAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'dnem', 'dny', 'dny'); },
+	weekAgo: 'před týdnem',
+	weeksAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'týdnem', 'týdny', 'týdny'); },
+	monthAgo: 'před měsícem',
+	monthsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'měsícem', 'měsíci', 'měsíci'); },
+	yearAgo: 'před rokem',
+	yearsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'rokem', 'lety', 'lety'); },
+
+	lessThanMinuteUntil: 'za chvíli',
+	minuteUntil: 'přibližně za minutu',
+	minutesUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'minutu', 'minuty', 'minut'); },
+	hourUntil: 'přibližně za hodinu',
+	hoursUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'hodinu', 'hodiny', 'hodin'); },
+	dayUntil: 'za den',
+	daysUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'den', 'dny', 'dnů'); },
+	weekUntil: 'za týden',
+	weeksUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'týden', 'týdny', 'týdnů'); },
+	monthUntil: 'za měsíc',
+	monthsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'měsíc', 'měsíce', 'měsíců'); },
+	yearUntil: 'za rok',
+	yearsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'rok', 'roky', 'let'); }
+});
+
+})();
+
+/*
+---
+
+name: Locale.cs-CZ.Form.Validator
+
+description: Form Validator messages for Czech.
+
+license: MIT-style license
+
+authors:
+  - Jan Černý chemiX
+
+requires:
+  - Locale
+
+provides: [Locale.cs-CZ.Form.Validator]
+
+...
+*/
+
+Locale.define('cs-CZ', 'FormValidator', {
+
+	required: 'Tato položka je povinná.',
+	minLength: 'Zadejte prosím alespoň {minLength} znaků (napsáno {length} znaků).',
+	maxLength: 'Zadejte prosím méně než {maxLength} znaků (nápsáno {length} znaků).',
+	integer: 'Zadejte prosím celé číslo. Desetinná čísla (např. 1.25) nejsou povolena.',
+	numeric: 'Zadejte jen číselné hodnoty (tj. "1" nebo "1.1" nebo "-1" nebo "-1.1").',
+	digits: 'Zadejte prosím pouze čísla a interpunkční znaménka(například telefonní číslo s pomlčkami nebo tečkami je povoleno).',
+	alpha: 'Zadejte prosím pouze písmena (a-z). Mezery nebo jiné znaky nejsou povoleny.',
+	alphanum: 'Zadejte prosím pouze písmena (a-z) nebo číslice (0-9). Mezery nebo jiné znaky nejsou povoleny.',
+	dateSuchAs: 'Zadejte prosím platné datum jako {date}',
+	dateInFormatMDY: 'Zadejte prosím platné datum jako MM / DD / RRRR (tj. "12/31/1999")',
+	email: 'Zadejte prosím platnou e-mailovou adresu. Například "fred@domain.com".',
+	url: 'Zadejte prosím platnou URL adresu jako http://www.example.com.',
+	currencyDollar: 'Zadejte prosím platnou částku. Například $100.00.',
+	oneRequired: 'Zadejte prosím alespoň jednu hodnotu pro tyto položky.',
+	errorPrefix: 'Chyba: ',
+	warningPrefix: 'Upozornění: ',
+
+	// Form.Validator.Extras
+	noSpace: 'V této položce nejsou povoleny mezery',
+	reqChkByNode: 'Nejsou vybrány žádné položky.',
+	requiredChk: 'Tato položka je vyžadována.',
+	reqChkByName: 'Prosím vyberte {label}.',
+	match: 'Tato položka se musí shodovat s položkou {matchName}',
+	startDate: 'datum zahájení',
+	endDate: 'datum ukončení',
+	currentDate: 'aktuální datum',
+	afterDate: 'Datum by mělo být stejné nebo větší než {label}.',
+	beforeDate: 'Datum by mělo být stejné nebo menší než {label}.',
+	startMonth: 'Vyberte počáteční měsíc.',
+	sameMonth: 'Tyto dva datumy musí být ve stejném měsíci - změňte jeden z nich.',
+	creditcard: 'Zadané číslo kreditní karty je neplatné. Prosím opravte ho. Bylo zadáno {length} čísel.'
+
+});
+
+/*
+---
+
+name: Locale.da-DK.Date
+
+description: Date messages for Danish.
+
+license: MIT-style license
+
+authors:
+  - Martin Overgaard
+  - Henrik Hansen
+
+requires:
+  - Locale
+
+provides: [Locale.da-DK.Date]
+
+...
+*/
+
+Locale.define('da-DK', 'Date', {
+
+	months: ['Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December'],
+	months_abbr: ['jan.', 'feb.', 'mar.', 'apr.', 'maj.', 'jun.', 'jul.', 'aug.', 'sep.', 'okt.', 'nov.', 'dec.'],
+	days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
+	days_abbr: ['søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'mindre end et minut siden',
+	minuteAgo: 'omkring et minut siden',
+	minutesAgo: '{delta} minutter siden',
+	hourAgo: 'omkring en time siden',
+	hoursAgo: 'omkring {delta} timer siden',
+	dayAgo: '1 dag siden',
+	daysAgo: '{delta} dage siden',
+	weekAgo: '1 uge siden',
+	weeksAgo: '{delta} uger siden',
+	monthAgo: '1 måned siden',
+	monthsAgo: '{delta} måneder siden',
+	yearAgo: '1 år siden',
+	yearsAgo: '{delta} år siden',
+
+	lessThanMinuteUntil: 'mindre end et minut fra nu',
+	minuteUntil: 'omkring et minut fra nu',
+	minutesUntil: '{delta} minutter fra nu',
+	hourUntil: 'omkring en time fra nu',
+	hoursUntil: 'omkring {delta} timer fra nu',
+	dayUntil: '1 dag fra nu',
+	daysUntil: '{delta} dage fra nu',
+	weekUntil: '1 uge fra nu',
+	weeksUntil: '{delta} uger fra nu',
+	monthUntil: '1 måned fra nu',
+	monthsUntil: '{delta} måneder fra nu',
+	yearUntil: '1 år fra nu',
+	yearsUntil: '{delta} år fra nu'
+
+});
+
+/*
+---
+
+name: Locale.da-DK.Form.Validator
+
+description: Form Validator messages for Danish.
+
+license: MIT-style license
+
+authors:
+  - Martin Overgaard
+
+requires:
+  - Locale
+
+provides: [Locale.da-DK.Form.Validator]
+
+...
+*/
+
+Locale.define('da-DK', 'FormValidator', {
+
+	required: 'Feltet skal udfyldes.',
+	minLength: 'Skriv mindst {minLength} tegn (du skrev {length} tegn).',
+	maxLength: 'Skriv maksimalt {maxLength} tegn (du skrev {length} tegn).',
+	integer: 'Skriv et tal i dette felt. Decimal tal (f.eks. 1.25) er ikke tilladt.',
+	numeric: 'Skriv kun tal i dette felt (i.e. "1" eller "1.1" eller "-1" eller "-1.1").',
+	digits: 'Skriv kun tal og tegnsætning i dette felt (eksempel, et telefon nummer med bindestreg eller punktum er tilladt).',
+	alpha: 'Skriv kun bogstaver (a-z) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
+	alphanum: 'Skriv kun bogstaver (a-z) eller tal (0-9) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
+	dateSuchAs: 'Skriv en gyldig dato som {date}',
+	dateInFormatMDY: 'Skriv dato i formatet DD-MM-YYYY (f.eks. "31-12-1999")',
+	email: 'Skriv en gyldig e-mail adresse. F.eks "fred@domain.com".',
+	url: 'Skriv en gyldig URL adresse. F.eks "http://www.example.com".',
+	currencyDollar: 'Skriv et gldigt beløb. F.eks Kr.100.00 .',
+	oneRequired: 'Et eller flere af felterne i denne formular skal udfyldes.',
+	errorPrefix: 'Fejl: ',
+	warningPrefix: 'Advarsel: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Der må ikke benyttes mellemrum i dette felt.',
+	reqChkByNode: 'Foretag et valg.',
+	requiredChk: 'Dette felt skal udfyldes.',
+	reqChkByName: 'Vælg en {label}.',
+	match: 'Dette felt skal matche {matchName} feltet',
+	startDate: 'start dato',
+	endDate: 'slut dato',
+	currentDate: 'dags dato',
+	afterDate: 'Datoen skal være større end eller lig med {label}.',
+	beforeDate: 'Datoen skal være mindre end eller lig med {label}.',
+	startMonth: 'Vælg en start måned',
+	sameMonth: 'De valgte datoer skal være i samme måned - skift en af dem.'
+
+});
+
+/*
+---
+
+name: Locale.de-DE.Date
+
+description: Date messages for German.
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+  - Frank Rossi
+  - Ulrich Petri
+  - Fabian Beiner
+
+requires:
+  - Locale
+
+provides: [Locale.de-DE.Date]
+
+...
+*/
+
+Locale.define('de-DE', 'Date', {
+
+	months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+	months_abbr: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+	days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+	days_abbr: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'vormittags',
+	PM: 'nachmittags',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'vor weniger als einer Minute',
+	minuteAgo: 'vor einer Minute',
+	minutesAgo: 'vor {delta} Minuten',
+	hourAgo: 'vor einer Stunde',
+	hoursAgo: 'vor {delta} Stunden',
+	dayAgo: 'vor einem Tag',
+	daysAgo: 'vor {delta} Tagen',
+	weekAgo: 'vor einer Woche',
+	weeksAgo: 'vor {delta} Wochen',
+	monthAgo: 'vor einem Monat',
+	monthsAgo: 'vor {delta} Monaten',
+	yearAgo: 'vor einem Jahr',
+	yearsAgo: 'vor {delta} Jahren',
+
+	lessThanMinuteUntil: 'in weniger als einer Minute',
+	minuteUntil: 'in einer Minute',
+	minutesUntil: 'in {delta} Minuten',
+	hourUntil: 'in ca. einer Stunde',
+	hoursUntil: 'in ca. {delta} Stunden',
+	dayUntil: 'in einem Tag',
+	daysUntil: 'in {delta} Tagen',
+	weekUntil: 'in einer Woche',
+	weeksUntil: 'in {delta} Wochen',
+	monthUntil: 'in einem Monat',
+	monthsUntil: 'in {delta} Monaten',
+	yearUntil: 'in einem Jahr',
+	yearsUntil: 'in {delta} Jahren'
+
+});
+
+/*
+---
+
+name: Locale.de-CH.Date
+
+description: Date messages for German (Switzerland).
+
+license: MIT-style license
+
+authors:
+  - Michael van der Weg
+
+requires:
+  - Locale
+  - Locale.de-DE.Date
+
+provides: [Locale.de-CH.Date]
+
+...
+*/
+
+Locale.define('de-CH').inherit('de-DE', 'Date');
+
+/*
+---
+
+name: Locale.de-CH.Form.Validator
+
+description: Form Validator messages for German (Switzerland).
+
+license: MIT-style license
+
+authors:
+  - Michael van der Weg
+
+requires:
+  - Locale
+
+provides: [Locale.de-CH.Form.Validator]
+
+...
+*/
+
+Locale.define('de-CH', 'FormValidator', {
+
+	required: 'Dieses Feld ist obligatorisch.',
+	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	maxLength: 'Bitte geben Sie nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	integer: 'Geben Sie bitte eine ganze Zahl ein. Dezimalzahlen (z.B. 1.25) sind nicht erlaubt.',
+	numeric: 'Geben Sie bitte nur Zahlenwerte in dieses Eingabefeld ein (z.B. &quot;1&quot;, &quot;1.1&quot;, &quot;-1&quot; oder &quot;-1.1&quot;).',
+	digits: 'Benutzen Sie bitte nur Zahlen und Satzzeichen in diesem Eingabefeld (erlaubt ist z.B. eine Telefonnummer mit Bindestrichen und Punkten).',
+	alpha: 'Benutzen Sie bitte nur Buchstaben (a-z) in diesem Feld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	alphanum: 'Benutzen Sie bitte nur Buchstaben (a-z) und Zahlen (0-9) in diesem Eingabefeld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	dateSuchAs: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel {date}',
+	dateInFormatMDY: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel TT.MM.JJJJ (z.B. &quot;31.12.1999&quot;)',
+	email: 'Geben Sie bitte eine g&uuml;ltige E-Mail Adresse ein. Wie zum Beispiel &quot;maria@bernasconi.ch&quot;.',
+	url: 'Geben Sie bitte eine g&uuml;ltige URL ein. Wie zum Beispiel http://www.example.com.',
+	currencyDollar: 'Geben Sie bitte einen g&uuml;ltigen Betrag in Schweizer Franken ein. Wie zum Beispiel 100.00 CHF .',
+	oneRequired: 'Machen Sie f&uuml;r mindestens eines der Eingabefelder einen Eintrag.',
+	errorPrefix: 'Fehler: ',
+	warningPrefix: 'Warnung: ',
+
+	// Form.Validator.Extras
+	noSpace: 'In diesem Eingabefeld darf kein Leerzeichen sein.',
+	reqChkByNode: 'Es wurden keine Elemente gew&auml;hlt.',
+	requiredChk: 'Dieses Feld ist obligatorisch.',
+	reqChkByName: 'Bitte w&auml;hlen Sie ein {label}.',
+	match: 'Dieses Eingabefeld muss mit dem Feld {matchName} &uuml;bereinstimmen.',
+	startDate: 'Das Anfangsdatum',
+	endDate: 'Das Enddatum',
+	currentDate: 'Das aktuelle Datum',
+	afterDate: 'Das Datum sollte zur gleichen Zeit oder sp&auml;ter sein {label}.',
+	beforeDate: 'Das Datum sollte zur gleichen Zeit oder fr&uuml;her sein {label}.',
+	startMonth: 'W&auml;hlen Sie bitte einen Anfangsmonat',
+	sameMonth: 'Diese zwei Datumsangaben m&uuml;ssen im selben Monat sein - Sie m&uuml;ssen eine von beiden ver&auml;ndern.',
+	creditcard: 'Die eingegebene Kreditkartennummer ist ung&uuml;ltig. Bitte &uuml;berpr&uuml;fen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
+
+});
+
+/*
+---
+
+name: Locale.de-DE.Form.Validator
+
+description: Form Validator messages for German.
+
+license: MIT-style license
+
+authors:
+  - Frank Rossi
+  - Ulrich Petri
+  - Fabian Beiner
+
+requires:
+  - Locale
+
+provides: [Locale.de-DE.Form.Validator]
+
+...
+*/
+
+Locale.define('de-DE', 'FormValidator', {
+
+	required: 'Dieses Eingabefeld muss ausgefüllt werden.',
+	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben nur {length} Zeichen eingegeben).',
+	maxLength: 'Geben Sie bitte nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
+	integer: 'Geben Sie in diesem Eingabefeld bitte eine ganze Zahl ein. Dezimalzahlen (z.B. "1.25") sind nicht erlaubt.',
+	numeric: 'Geben Sie in diesem Eingabefeld bitte nur Zahlenwerte (z.B. "1", "1.1", "-1" oder "-1.1") ein.',
+	digits: 'Geben Sie in diesem Eingabefeld bitte nur Zahlen und Satzzeichen ein (z.B. eine Telefonnummer mit Bindestrichen und Punkten ist erlaubt).',
+	alpha: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) ein. Leerzeichen und andere Zeichen sind nicht erlaubt.',
+	alphanum: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) und Zahlen (0-9) ein. Leerzeichen oder andere Zeichen sind nicht erlaubt.',
+	dateSuchAs: 'Geben Sie bitte ein gültiges Datum ein (z.B. "{date}").',
+	dateInFormatMDY: 'Geben Sie bitte ein gültiges Datum im Format TT.MM.JJJJ ein (z.B. "31.12.1999").',
+	email: 'Geben Sie bitte eine gültige E-Mail-Adresse ein (z.B. "max@mustermann.de").',
+	url: 'Geben Sie bitte eine gültige URL ein (z.B. "http://www.example.com").',
+	currencyDollar: 'Geben Sie bitte einen gültigen Betrag in EURO ein (z.B. 100.00€).',
+	oneRequired: 'Bitte füllen Sie mindestens ein Eingabefeld aus.',
+	errorPrefix: 'Fehler: ',
+	warningPrefix: 'Warnung: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Es darf kein Leerzeichen in diesem Eingabefeld sein.',
+	reqChkByNode: 'Es wurden keine Elemente gewählt.',
+	requiredChk: 'Dieses Feld muss ausgefüllt werden.',
+	reqChkByName: 'Bitte wählen Sie ein {label}.',
+	match: 'Dieses Eingabefeld muss mit dem {matchName} Eingabefeld übereinstimmen.',
+	startDate: 'Das Anfangsdatum',
+	endDate: 'Das Enddatum',
+	currentDate: 'Das aktuelle Datum',
+	afterDate: 'Das Datum sollte zur gleichen Zeit oder später sein als {label}.',
+	beforeDate: 'Das Datum sollte zur gleichen Zeit oder früher sein als {label}.',
+	startMonth: 'Wählen Sie bitte einen Anfangsmonat',
+	sameMonth: 'Diese zwei Datumsangaben müssen im selben Monat sein - Sie müssen eines von beiden verändern.',
+	creditcard: 'Die eingegebene Kreditkartennummer ist ungültig. Bitte überprüfen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
+
+});
+
+/*
+---
+
+name: Locale.de-DE.Number
+
+description: Number messages for German.
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.de-DE.Number]
+
+...
+*/
+
+Locale.define('de-DE').inherit('EU', 'Number');
+
+/*
+---
+
+name: Locale.el-GR.Date
+
+description: Date messages for Greek language.
+
+license: MIT-style license
+
+authors:
+  - Periklis Argiriadis
+
+requires:
+  - Locale
+
+provides: [Locale.el-GR.Date]
+
+...
+*/
+
+Locale.define('el-GR', 'Date', {
+
+	months: ['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
+	months_abbr: ['Ιαν', 'Φεβ', 'Μαρ', 'Απρ', 'Μάι', 'Ιουν', 'Ιουλ', 'Αυγ', 'Σεπ', 'Οκτ', 'Νοε', 'Δεκ'],
+	days: ['Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο'],
+	days_abbr: ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%I:%M%p',
+	AM: 'πμ',
+	PM: 'μμ',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		// 1st, 2nd, 3rd, etc.
+		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'ος' : ['ος'][Math.min(dayOfMonth % 10, 4)];
+	},
+
+	lessThanMinuteAgo: 'λιγότερο από ένα λεπτό πριν',
+	minuteAgo: 'περίπου ένα λεπτό πριν',
+	minutesAgo: '{delta} λεπτά πριν',
+	hourAgo: 'περίπου μια ώρα πριν',
+	hoursAgo: 'περίπου {delta} ώρες πριν',
+	dayAgo: '1 ημέρα πριν',
+	daysAgo: '{delta} ημέρες πριν',
+	weekAgo: '1 εβδομάδα πριν',
+	weeksAgo: '{delta} εβδομάδες πριν',
+	monthAgo: '1 μήνα πριν',
+	monthsAgo: '{delta} μήνες πριν',
+	yearAgo: '1 χρόνο πριν',
+	yearsAgo: '{delta} χρόνια πριν',
+
+	lessThanMinuteUntil: 'λιγότερο από λεπτό από τώρα',
+	minuteUntil: 'περίπου ένα λεπτό από τώρα',
+	minutesUntil: '{delta} λεπτά από τώρα',
+	hourUntil: 'περίπου μια ώρα από τώρα',
+	hoursUntil: 'περίπου {delta} ώρες από τώρα',
+	dayUntil: '1 ημέρα από τώρα',
+	daysUntil: '{delta} ημέρες από τώρα',
+	weekUntil: '1 εβδομάδα από τώρα',
+	weeksUntil: '{delta} εβδομάδες από τώρα',
+	monthUntil: '1 μήνας από τώρα',
+	monthsUntil: '{delta} μήνες από τώρα',
+	yearUntil: '1 χρόνος από τώρα',
+	yearsUntil: '{delta} χρόνια από τώρα'
+
+});
+
+/*
+---
+
+name: Locale.el-GR.Form.Validator
+
+description: Form Validator messages for Greek language.
+
+license: MIT-style license
+
+authors:
+  - Dimitris Tsironis
+
+requires:
+  - Locale
+
+provides: [Locale.el-GR.Form.Validator]
+
+...
+*/
+
+Locale.define('el-GR', 'FormValidator', {
+
+    required: 'Αυτό το πεδίο είναι απαραίτητο.',
+    length: 'Παρακαλούμε, εισάγετε {length} χαρακτήρες (έχετε ήδη εισάγει {elLength} χαρακτήρες).',
+    minLength: 'Παρακαλούμε, εισάγετε τουλάχιστον {minLength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
+    maxlength: 'Παρακαλούμε, εισάγετε εώς {maxlength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
+    integer: 'Παρακαλούμε, εισάγετε έναν ακέραιο αριθμό σε αυτό το πεδίο. Οι αριθμοί με δεκαδικά ψηφία (π.χ. 1.25) δεν επιτρέπονται.',
+    numeric: 'Παρακαλούμε, εισάγετε μόνο αριθμητικές τιμές σε αυτό το πεδίο (π.χ." 1 " ή " 1.1 " ή " -1 " ή " -1.1 " ).',
+    digits: 'Παρακαλούμε, χρησιμοποιήστε μόνο αριθμούς και σημεία στίξης σε αυτόν τον τομέα (π.χ. επιτρέπεται αριθμός τηλεφώνου με παύλες ή τελείες).',
+    alpha: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) σε αυτό το πεδίο. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
+    alphanum: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) ή αριθμούς (0-9) σε αυτόν τον τομέα. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
+    dateSuchAs: 'Παρακαλούμε, εισάγετε μια έγκυρη ημερομηνία, όπως {date}',
+    dateInFormatMDY: 'Παρακαλώ εισάγετε μια έγκυρη ημερομηνία, όπως ΜΜ/ΗΗ/ΕΕΕΕ (π.χ. "12/31/1999").',
+    email: 'Παρακαλούμε, εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (π.χ. "fred@domain.com").',
+    url: 'Παρακαλούμε, εισάγετε μια έγκυρη URL διεύθυνση, όπως http://www.example.com',
+    currencyDollar: 'Παρακαλούμε, εισάγετε ένα έγκυρο ποσό σε δολλάρια (π.χ. $100.00).',
+    oneRequired: 'Παρακαλούμε, εισάγετε κάτι για τουλάχιστον ένα από αυτά τα πεδία.',
+    errorPrefix: 'Σφάλμα: ',
+    warningPrefix: 'Προσοχή: ',
+
+    // Form.Validator.Extras
+    noSpace: 'Δεν επιτρέπονται τα κενά σε αυτό το πεδίο.',
+    reqChkByNode: 'Δεν έχει επιλεγεί κάποιο αντικείμενο',
+    requiredChk: 'Αυτό το πεδίο είναι απαραίτητο.',
+    reqChkByName: 'Παρακαλούμε, επιλέξτε μια ετικέτα {label}.',
+    match: 'Αυτό το πεδίο πρέπει να ταιριάζει με το πεδίο {matchName}.',
+    startDate: 'η ημερομηνία έναρξης',
+    endDate: 'η ημερομηνία λήξης',
+    currentDate: 'η τρέχουσα ημερομηνία',
+    afterDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή μετά από την {label}.',
+    beforeDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή πριν από την {label}.',
+    startMonth: 'Παρακαλώ επιλέξτε ένα μήνα αρχής.',
+    sameMonth: 'Αυτές οι δύο ημερομηνίες πρέπει να έχουν τον ίδιο μήνα - θα πρέπει να αλλάξετε ή το ένα ή το άλλο',
+    creditcard: 'Ο αριθμός της πιστωτικής κάρτας δεν είναι έγκυρος. Παρακαλούμε ελέγξτε τον αριθμό και δοκιμάστε ξανά. {length} μήκος ψηφίων.'
+
+});
+
+/*
+---
+
+name: Locale.en-GB.Date
+
+description: Date messages for British English.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Locale
+  - Locale.en-US.Date
+
+provides: [Locale.en-GB.Date]
+
+...
+*/
+
+Locale.define('en-GB', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M'
+
+}).inherit('en-US', 'Date');
+
+/*
+---
+
+name: Locale.en-US.Number
+
+description: Number messages for US English.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - Locale
+
+provides: [Locale.en-US.Number]
+
+...
+*/
+
+Locale.define('en-US', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+/* 	Commented properties are the defaults for Number.format
+	decimals: 0,
+	precision: 0,
+	scientific: null,
+
+	prefix: null,
+	suffic: null,
+
+	// Negative/Currency/percentage will mixin Number
+	negative: {
+		prefix: '-'
+	},*/
+
+	currency: {
+//		decimals: 2,
+		prefix: '$ '
+	}/*,
+
+	percentage: {
+		decimals: 2,
+		suffix: '%'
+	}*/
+
+});
+
+
+
+/*
+---
+
+name: Locale.es-ES.Date
+
+description: Date messages for Spanish.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - Locale
+
+provides: [Locale.es-ES.Date]
+
+...
+*/
+
+Locale.define('es-ES', 'Date', {
+
+	months: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+	months_abbr: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic'],
+	days: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'],
+	days_abbr: ['dom', 'lun', 'mar', 'mié', 'juv', 'vie', 'sáb'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'hace menos de un minuto',
+	minuteAgo: 'hace un minuto',
+	minutesAgo: 'hace {delta} minutos',
+	hourAgo: 'hace una hora',
+	hoursAgo: 'hace unas {delta} horas',
+	dayAgo: 'hace un día',
+	daysAgo: 'hace {delta} días',
+	weekAgo: 'hace una semana',
+	weeksAgo: 'hace unas {delta} semanas',
+	monthAgo: 'hace un mes',
+	monthsAgo: 'hace {delta} meses',
+	yearAgo: 'hace un año',
+	yearsAgo: 'hace {delta} años',
+
+	lessThanMinuteUntil: 'menos de un minuto desde ahora',
+	minuteUntil: 'un minuto desde ahora',
+	minutesUntil: '{delta} minutos desde ahora',
+	hourUntil: 'una hora desde ahora',
+	hoursUntil: 'unas {delta} horas desde ahora',
+	dayUntil: 'un día desde ahora',
+	daysUntil: '{delta} días desde ahora',
+	weekUntil: 'una semana desde ahora',
+	weeksUntil: 'unas {delta} semanas desde ahora',
+	monthUntil: 'un mes desde ahora',
+	monthsUntil: '{delta} meses desde ahora',
+	yearUntil: 'un año desde ahora',
+	yearsUntil: '{delta} años desde ahora'
+
+});
+
+/*
+---
+
+name: Locale.es-AR.Date
+
+description: Date messages for Spanish (Argentina).
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+  - Diego Massanti
+
+requires:
+  - Locale
+  - Locale.es-ES.Date
+
+provides: [Locale.es-AR.Date]
+
+...
+*/
+
+Locale.define('es-AR').inherit('es-ES', 'Date');
+
+/*
+---
+
+name: Locale.es-AR.Form.Validator
+
+description: Form Validator messages for Spanish (Argentina).
+
+license: MIT-style license
+
+authors:
+  - Diego Massanti
+
+requires:
+  - Locale
+
+provides: [Locale.es-AR.Form.Validator]
+
+...
+*/
+
+Locale.define('es-AR', 'FormValidator', {
+
+	required: 'Este campo es obligatorio.',
+	minLength: 'Por favor ingrese al menos {minLength} caracteres (ha ingresado {length} caracteres).',
+	maxLength: 'Por favor no ingrese más de {maxLength} caracteres (ha ingresado {length} caracteres).',
+	integer: 'Por favor ingrese un número entero en este campo. Números con decimales (p.e. 1,25) no se permiten.',
+	numeric: 'Por favor ingrese solo valores numéricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Por favor use sólo números y puntuación en este campo (por ejemplo, un número de teléfono con guiones y/o puntos no está permitido).',
+	alpha: 'Por favor use sólo letras (a-z) en este campo. No se permiten espacios ni otros caracteres.',
+	alphanum: 'Por favor, usa sólo letras (a-z) o números (0-9) en este campo. No se permiten espacios u otros caracteres.',
+	dateSuchAs: 'Por favor ingrese una fecha válida como {date}',
+	dateInFormatMDY: 'Por favor ingrese una fecha válida, utulizando el formato DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Por favor, ingrese una dirección de e-mail válida. Por ejemplo, "fred@dominio.com".',
+	url: 'Por favor ingrese una URL válida como http://www.example.com.',
+	currencyDollar: 'Por favor ingrese una cantidad válida de pesos. Por ejemplo $100,00 .',
+	oneRequired: 'Por favor ingrese algo para por lo menos una de estas entradas.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Advertencia: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No se permiten espacios en este campo.',
+	reqChkByNode: 'No hay elementos seleccionados.',
+	requiredChk: 'Este campo es obligatorio.',
+	reqChkByName: 'Por favor selecciona una {label}.',
+	match: 'Este campo necesita coincidir con el campo {matchName}',
+	startDate: 'la fecha de inicio',
+	endDate: 'la fecha de fin',
+	currentDate: 'la fecha actual',
+	afterDate: 'La fecha debe ser igual o posterior a {label}.',
+	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
+	startMonth: 'Por favor selecciona un mes de origen',
+	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
+
+});
+
+/*
+---
+
+name: Locale.es-ES.Form.Validator
+
+description: Form Validator messages for Spanish.
+
+license: MIT-style license
+
+authors:
+  - Ãlfons Sanchez
+
+requires:
+  - Locale
+
+provides: [Locale.es-ES.Form.Validator]
+
+...
+*/
+
+Locale.define('es-ES', 'FormValidator', {
+
+	required: 'Este campo es obligatorio.',
+	minLength: 'Por favor introduce al menos {minLength} caracteres (has introducido {length} caracteres).',
+	maxLength: 'Por favor introduce no m&aacute;s de {maxLength} caracteres (has introducido {length} caracteres).',
+	integer: 'Por favor introduce un n&uacute;mero entero en este campo. N&uacute;meros con decimales (p.e. 1,25) no se permiten.',
+	numeric: 'Por favor introduce solo valores num&eacute;ricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
+	digits: 'Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo (por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido).',
+	alpha: 'Por favor usa letras solo (a-z) en este campo. No se admiten espacios ni otros caracteres.',
+	alphanum: 'Por favor, usa solo letras (a-z) o n&uacute;meros (0-9) en este campo. No se admiten espacios ni otros caracteres.',
+	dateSuchAs: 'Por favor introduce una fecha v&aacute;lida como {date}',
+	dateInFormatMDY: 'Por favor introduce una fecha v&aacute;lida como DD/MM/YYYY (p.e. "31/12/1999")',
+	email: 'Por favor, introduce una direcci&oacute;n de email v&aacute;lida. Por ejemplo, "fred@domain.com".',
+	url: 'Por favor introduce una URL v&aacute;lida como http://www.example.com.',
+	currencyDollar: 'Por favor introduce una cantidad v&aacute;lida de €. Por ejemplo €100,00 .',
+	oneRequired: 'Por favor introduce algo para por lo menos una de estas entradas.',
+	errorPrefix: 'Error: ',
+	warningPrefix: 'Aviso: ',
+
+	// Form.Validator.Extras
+	noSpace: 'No pueden haber espacios en esta entrada.',
+	reqChkByNode: 'No hay elementos seleccionados.',
+	requiredChk: 'Este campo es obligatorio.',
+	reqChkByName: 'Por favor selecciona una {label}.',
+	match: 'Este campo necesita coincidir con el campo {matchName}',
+	startDate: 'la fecha de inicio',
+	endDate: 'la fecha de fin',
+	currentDate: 'la fecha actual',
+	afterDate: 'La fecha debe ser igual o posterior a {label}.',
+	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
+	startMonth: 'Por favor selecciona un mes de origen',
+	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
+
+});
+
+/*
+---
+
+name: Locale.es-VE.Date
+
+description: Date messages for Spanish (Venezuela).
+
+license: MIT-style license
+
+authors:
+  - Daniel Barreto
+
+requires:
+  - Locale
+  - Locale.es-ES.Date
+
+provides: [Locale.es-VE.Date]
+
+...
+*/
+
+Locale.define('es-VE').inherit('es-ES', 'Date');
+
+/*
+---
+
+name: Locale.es-VE.Form.Validator
+
+description: Form Validator messages for Spanish (Venezuela).
+
+license: MIT-style license
+
+authors:
+  - Daniel Barreto
+
+requires:
+  - Locale
+  - Locale.es-ES.Form.Validator
+
+provides: [Locale.es-VE.Form.Validator]
+
+...
+*/
+
+Locale.define('es-VE', 'FormValidator', {
+
+	digits: 'Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo. Por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido.',
+	alpha: 'Por favor usa solo letras (a-z) en este campo. No se admiten espacios ni otros caracteres.',
+	currencyDollar: 'Por favor introduce una cantidad v&aacute;lida de Bs. Por ejemplo Bs. 100,00 .',
+	oneRequired: 'Por favor introduce un valor para por lo menos una de estas entradas.',
+
+	// Form.Validator.Extras
+	startDate: 'La fecha de inicio',
+	endDate: 'La fecha de fin',
+	currentDate: 'La fecha actual'
+
+}).inherit('es-ES', 'FormValidator');
+
+/*
+---
+
+name: Locale.es-VE.Number
+
+description: Number messages for Spanish (Venezuela).
+
+license: MIT-style license
+
+authors:
+  - Daniel Barreto
+
+requires:
+  - Locale
+
+provides: [Locale.es-VE.Number]
+
+...
+*/
+
+Locale.define('es-VE', 'Number', {
+
+	decimal: ',',
+	group: '.',
+/*
+	decimals: 0,
+	precision: 0,
+*/
+	// Negative/Currency/percentage will mixin Number
+	negative: {
+		prefix: '-'
+	},
+
+	currency: {
+		decimals: 2,
+		prefix: 'Bs. '
+	},
+
+	percentage: {
+		decimals: 2,
+		suffix: '%'
+	}
+
+});
+
+/*
+---
+
+name: Locale.et-EE.Date
+
+description: Date messages for Estonian.
+
+license: MIT-style license
+
+authors:
+  - Kevin Valdek
+
+requires:
+  - Locale
+
+provides: [Locale.et-EE.Date]
+
+...
+*/
+
+Locale.define('et-EE', 'Date', {
+
+	months: ['jaanuar', 'veebruar', 'märts', 'aprill', 'mai', 'juuni', 'juuli', 'august', 'september', 'oktoober', 'november', 'detsember'],
+	months_abbr: ['jaan', 'veebr', 'märts', 'apr', 'mai', 'juuni', 'juuli', 'aug', 'sept', 'okt', 'nov', 'dets'],
+	days: ['pühapäev', 'esmaspäev', 'teisipäev', 'kolmapäev', 'neljapäev', 'reede', 'laupäev'],
+	days_abbr: ['pühap', 'esmasp', 'teisip', 'kolmap', 'neljap', 'reede', 'laup'],
+
+	// Culture's date order: MM.DD.YYYY
+	dateOrder: ['month', 'date', 'year'],
+	shortDate: '%m.%d.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'vähem kui minut aega tagasi',
+	minuteAgo: 'umbes minut aega tagasi',
+	minutesAgo: '{delta} minutit tagasi',
+	hourAgo: 'umbes tund aega tagasi',
+	hoursAgo: 'umbes {delta} tundi tagasi',
+	dayAgo: '1 päev tagasi',
+	daysAgo: '{delta} päeva tagasi',
+	weekAgo: '1 nädal tagasi',
+	weeksAgo: '{delta} nädalat tagasi',
+	monthAgo: '1 kuu tagasi',
+	monthsAgo: '{delta} kuud tagasi',
+	yearAgo: '1 aasta tagasi',
+	yearsAgo: '{delta} aastat tagasi',
+
+	lessThanMinuteUntil: 'vähem kui minuti aja pärast',
+	minuteUntil: 'umbes minuti aja pärast',
+	minutesUntil: '{delta} minuti pärast',
+	hourUntil: 'umbes tunni aja pärast',
+	hoursUntil: 'umbes {delta} tunni pärast',
+	dayUntil: '1 päeva pärast',
+	daysUntil: '{delta} päeva pärast',
+	weekUntil: '1 nädala pärast',
+	weeksUntil: '{delta} nädala pärast',
+	monthUntil: '1 kuu pärast',
+	monthsUntil: '{delta} kuu pärast',
+	yearUntil: '1 aasta pärast',
+	yearsUntil: '{delta} aasta pärast'
+
+});
+
+/*
+---
+
+name: Locale.et-EE.Form.Validator
+
+description: Form Validator messages for Estonian.
+
+license: MIT-style license
+
+authors:
+  - Kevin Valdek
+
+requires:
+  - Locale
+
+provides: [Locale.et-EE.Form.Validator]
+
+...
+*/
+
+Locale.define('et-EE', 'FormValidator', {
+
+	required: 'Väli peab olema täidetud.',
+	minLength: 'Palun sisestage vähemalt {minLength} tähte (te sisestasite {length} tähte).',
+	maxLength: 'Palun ärge sisestage rohkem kui {maxLength} tähte (te sisestasite {length} tähte).',
+	integer: 'Palun sisestage väljale täisarv. Kümnendarvud (näiteks 1.25) ei ole lubatud.',
+	numeric: 'Palun sisestage ainult numbreid väljale (näiteks "1", "1.1", "-1" või "-1.1").',
+	digits: 'Palun kasutage ainult numbreid ja kirjavahemärke (telefoninumbri sisestamisel on lubatud kasutada kriipse ja punkte).',
+	alpha: 'Palun kasutage ainult tähti (a-z). Tühikud ja teised sümbolid on keelatud.',
+	alphanum: 'Palun kasutage ainult tähti (a-z) või numbreid (0-9). Tühikud ja teised sümbolid on keelatud.',
+	dateSuchAs: 'Palun sisestage kehtiv kuupäev kujul {date}',
+	dateInFormatMDY: 'Palun sisestage kehtiv kuupäev kujul MM.DD.YYYY (näiteks: "12.31.1999").',
+	email: 'Palun sisestage kehtiv e-maili aadress (näiteks: "fred@domain.com").',
+	url: 'Palun sisestage kehtiv URL (näiteks: http://www.example.com).',
+	currencyDollar: 'Palun sisestage kehtiv $ summa (näiteks: $100.00).',
+	oneRequired: 'Palun sisestage midagi vähemalt ühele antud väljadest.',
+	errorPrefix: 'Viga: ',
+	warningPrefix: 'Hoiatus: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Väli ei tohi sisaldada tühikuid.',
+	reqChkByNode: 'Ükski väljadest pole valitud.',
+	requiredChk: 'Välja täitmine on vajalik.',
+	reqChkByName: 'Palun valige üks {label}.',
+	match: 'Väli peab sobima {matchName} väljaga',
+	startDate: 'algkuupäev',
+	endDate: 'lõppkuupäev',
+	currentDate: 'praegune kuupäev',
+	afterDate: 'Kuupäev peab olema võrdne või pärast {label}.',
+	beforeDate: 'Kuupäev peab olema võrdne või enne {label}.',
+	startMonth: 'Palun valige algkuupäev.',
+	sameMonth: 'Antud kaks kuupäeva peavad olema samas kuus - peate muutma ühte kuupäeva.'
+
+});
+
+/*
+---
+
+name: Locale.fa.Date
+
+description: Date messages for Persian.
+
+license: MIT-style license
+
+authors:
+  - Amir Hossein Hodjaty Pour
+
+requires:
+  - Locale
+
+provides: [Locale.fa.Date]
+
+...
+*/
+
+Locale.define('fa', 'Date', {
+
+	months: ['ژانویه', 'فوریه', 'مارس', 'آپریل', 'مه', 'ژوئن', 'ژوئیه', 'آگوست', 'سپتامبر', 'اکتبر', 'نوامبر', 'دسامبر'],
+	months_abbr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
+	days: ['یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنجشنبه', 'جمعه', 'شنبه'],
+	days_abbr: ['ي', 'د', 'س', 'چ', 'پ', 'ج', 'ش'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['month', 'date', 'year'],
+	shortDate: '%m/%d/%Y',
+	shortTime: '%I:%M%p',
+	AM: 'ق.ظ',
+	PM: 'ب.ظ',
+
+	// Date.Extras
+	ordinal: 'ام',
+
+	lessThanMinuteAgo: 'کمتر از یک دقیقه پیش',
+	minuteAgo: 'حدود یک دقیقه پیش',
+	minutesAgo: '{delta} دقیقه پیش',
+	hourAgo: 'حدود یک ساعت پیش',
+	hoursAgo: 'حدود {delta} ساعت پیش',
+	dayAgo: '1 روز پیش',
+	daysAgo: '{delta} روز پیش',
+	weekAgo: '1 هفته پیش',
+	weeksAgo: '{delta} هفته پیش',
+	monthAgo: '1 ماه پیش',
+	monthsAgo: '{delta} ماه پیش',
+	yearAgo: '1 سال پیش',
+	yearsAgo: '{delta} سال پیش',
+
+	lessThanMinuteUntil: 'کمتر از یک دقیقه از حالا',
+	minuteUntil: 'حدود یک دقیقه از حالا',
+	minutesUntil: '{delta} دقیقه از حالا',
+	hourUntil: 'حدود یک ساعت از حالا',
+	hoursUntil: 'حدود {delta} ساعت از حالا',
+	dayUntil: '1 روز از حالا',
+	daysUntil: '{delta} روز از حالا',
+	weekUntil: '1 هفته از حالا',
+	weeksUntil: '{delta} هفته از حالا',
+	monthUntil: '1 ماه از حالا',
+	monthsUntil: '{delta} ماه از حالا',
+	yearUntil: '1 سال از حالا',
+	yearsUntil: '{delta} سال از حالا'
+
+});
+
+/*
+---
+
+name: Locale.fa.Form.Validator
+
+description: Form Validator messages for Persian.
+
+license: MIT-style license
+
+authors:
+  - Amir Hossein Hodjaty Pour
+
+requires:
+  - Locale
+
+provides: [Locale.fa.Form.Validator]
+
+...
+*/
+
+Locale.define('fa', 'FormValidator', {
+
+	required: 'این فیلد الزامی است.',
+	minLength: 'شما باید حداقل {minLength} حرف وارد کنید ({length} حرف وارد کرده اید).',
+	maxLength: 'لطفا حداکثر {maxLength} حرف وارد کنید (شما {length} حرف وارد کرده اید).',
+	integer: 'لطفا از عدد صحیح استفاده کنید. اعداد اعشاری (مانند 1.25) مجاز نیستند.',
+	numeric: 'لطفا فقط داده عددی وارد کنید (مانند "1" یا "1.1" یا "1-" یا "1.1-").',
+	digits: 'لطفا فقط از اعداد و علامتها در این فیلد استفاده کنید (برای مثال شماره تلفن با خط تیره و نقطه قابل قبول است).',
+	alpha: 'لطفا فقط از حروف الفباء برای این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
+	alphanum: 'لطفا فقط از حروف الفباء و اعداد در این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
+	dateSuchAs: 'لطفا یک تاریخ معتبر مانند {date} وارد کنید.',
+	dateInFormatMDY: 'لطفا یک تاریخ معتبر به شکل MM/DD/YYYY وارد کنید (مانند "12/31/1999").',
+	email: 'لطفا یک آدرس ایمیل معتبر وارد کنید. برای مثال "fred@domain.com".',
+	url: 'لطفا یک URL معتبر مانند http://www.example.com وارد کنید.',
+	currencyDollar: 'لطفا یک محدوده معتبر برای این بخش وارد کنید مانند 100.00$ .',
+	oneRequired: 'لطفا حداقل یکی از فیلدها را پر کنید.',
+	errorPrefix: 'خطا: ',
+	warningPrefix: 'هشدار: ',
+
+	// Form.Validator.Extras
+	noSpace: 'استفاده از فاصله در این بخش مجاز نیست.',
+	reqChkByNode: 'موردی انتخاب نشده است.',
+	requiredChk: 'این فیلد الزامی است.',
+	reqChkByName: 'لطفا یک {label} را انتخاب کنید.',
+	match: 'این فیلد باید با فیلد {matchName} مطابقت داشته باشد.',
+	startDate: 'تاریخ شروع',
+	endDate: 'تاریخ پایان',
+	currentDate: 'تاریخ کنونی',
+	afterDate: 'تاریخ میبایست برابر یا بعد از {label} باشد',
+	beforeDate: 'تاریخ میبایست برابر یا قبل از {label} باشد',
+	startMonth: 'لطفا ماه شروع را انتخاب کنید',
+	sameMonth: 'این دو تاریخ باید در یک ماه باشند - شما باید یکی یا هر دو را تغییر دهید.',
+	creditcard: 'شماره کارت اعتباری که وارد کرده اید معتبر نیست. لطفا شماره را بررسی کنید و مجددا تلاش کنید. {length} رقم وارد شده است.'
+
+});
+
+/*
+---
+
+name: Locale.fi-FI.Date
+
+description: Date messages for Finnish.
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - Locale
+
+provides: [Locale.fi-FI.Date]
+
+...
+*/
+
+Locale.define('fi-FI', 'Date', {
+
+	// NOTE: months and days are not capitalized in finnish
+	months: ['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
+
+	// these abbreviations are really not much used in finnish because they obviously won't abbreviate very much. ;)
+	// NOTE: sometimes one can see forms such as "tammi", "helmi", etc. but that is not proper finnish.
+	months_abbr: ['tammik.', 'helmik.', 'maalisk.', 'huhtik.', 'toukok.', 'kesäk.', 'heinäk.', 'elok.', 'syysk.', 'lokak.', 'marrask.', 'jouluk.'],
+
+	days: ['sunnuntai', 'maanantai', 'tiistai', 'keskiviikko', 'torstai', 'perjantai', 'lauantai'],
+	days_abbr: ['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'vajaa minuutti sitten',
+	minuteAgo: 'noin minuutti sitten',
+	minutesAgo: '{delta} minuuttia sitten',
+	hourAgo: 'noin tunti sitten',
+	hoursAgo: 'noin {delta} tuntia sitten',
+	dayAgo: 'päivä sitten',
+	daysAgo: '{delta} päivää sitten',
+	weekAgo: 'viikko sitten',
+	weeksAgo: '{delta} viikkoa sitten',
+	monthAgo: 'kuukausi sitten',
+	monthsAgo: '{delta} kuukautta sitten',
+	yearAgo: 'vuosi sitten',
+	yearsAgo: '{delta} vuotta sitten',
+
+	lessThanMinuteUntil: 'vajaan minuutin kuluttua',
+	minuteUntil: 'noin minuutin kuluttua',
+	minutesUntil: '{delta} minuutin kuluttua',
+	hourUntil: 'noin tunnin kuluttua',
+	hoursUntil: 'noin {delta} tunnin kuluttua',
+	dayUntil: 'päivän kuluttua',
+	daysUntil: '{delta} päivän kuluttua',
+	weekUntil: 'viikon kuluttua',
+	weeksUntil: '{delta} viikon kuluttua',
+	monthUntil: 'kuukauden kuluttua',
+	monthsUntil: '{delta} kuukauden kuluttua',
+	yearUntil: 'vuoden kuluttua',
+	yearsUntil: '{delta} vuoden kuluttua'
+
+});
+
+/*
+---
+
+name: Locale.fi-FI.Form.Validator
+
+description: Form Validator messages for Finnish.
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - Locale
+
+provides: [Locale.fi-FI.Form.Validator]
+
+...
+*/
+
+Locale.define('fi-FI', 'FormValidator', {
+
+	required: 'Tämä kenttä on pakollinen.',
+	minLength: 'Ole hyvä ja anna vähintään {minLength} merkkiä (annoit {length} merkkiä).',
+	maxLength: 'Älä anna enempää kuin {maxLength} merkkiä (annoit {length} merkkiä).',
+	integer: 'Ole hyvä ja anna kokonaisluku. Luvut, joissa on desimaaleja (esim. 1.25) eivät ole sallittuja.',
+	numeric: 'Anna tähän kenttään lukuarvo (kuten "1" tai "1.1" tai "-1" tai "-1.1").',
+	digits: 'Käytä pelkästään numeroita ja välimerkkejä tässä kentässä (syötteet, kuten esim. puhelinnumero, jossa on väliviivoja, pilkkuja tai pisteitä, kelpaa).',
+	alpha: 'Anna tähän kenttään vain kirjaimia (a-z). Välilyönnit tai muut merkit eivät ole sallittuja.',
+	alphanum: 'Anna tähän kenttään vain kirjaimia (a-z) tai numeroita (0-9). Välilyönnit tai muut merkit eivät ole sallittuja.',
+	dateSuchAs: 'Ole hyvä ja anna kelvollinen päivmäärä, kuten esimerkiksi {date}',
+	dateInFormatMDY: 'Ole hyvä ja anna kelvollinen päivämäärä muodossa pp/kk/vvvv (kuten "12/31/1999")',
+	email: 'Ole hyvä ja anna kelvollinen sähköpostiosoite (kuten esimerkiksi "matti@meikalainen.com").',
+	url: 'Ole hyvä ja anna kelvollinen URL, kuten esimerkiksi http://www.example.com.',
+	currencyDollar: 'Ole hyvä ja anna kelvollinen eurosumma (kuten esimerkiksi 100,00 EUR) .',
+	oneRequired: 'Ole hyvä ja syötä jotakin ainakin johonkin näistä kentistä.',
+	errorPrefix: 'Virhe: ',
+	warningPrefix: 'Varoitus: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Tässä syötteessä ei voi olla välilyöntejä',
+	reqChkByNode: 'Ei valintoja.',
+	requiredChk: 'Tämä kenttä on pakollinen.',
+	reqChkByName: 'Ole hyvä ja valitse {label}.',
+	match: 'Tämän kentän tulee vastata kenttää {matchName}',
+	startDate: 'alkupäivämäärä',
+	endDate: 'loppupäivämäärä',
+	currentDate: 'nykyinen päivämäärä',
+	afterDate: 'Päivämäärän tulisi olla sama tai myöhäisempi ajankohta kuin {label}.',
+	beforeDate: 'Päivämäärän tulisi olla sama tai aikaisempi ajankohta kuin {label}.',
+	startMonth: 'Ole hyvä ja valitse aloituskuukausi',
+	sameMonth: 'Näiden kahden päivämäärän tulee olla saman kuun sisällä -- sinun pitää muuttaa jompaa kumpaa.',
+	creditcard: 'Annettu luottokortin numero ei kelpaa. Ole hyvä ja tarkista numero sekä yritä uudelleen. {length} numeroa syötetty.'
+
+});
+
+/*
+---
+
+name: Locale.fi-FI.Number
+
+description: Finnish number messages
+
+license: MIT-style license
+
+authors:
+  - ksel
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.fi-FI.Number]
+
+...
+*/
+
+Locale.define('fi-FI', 'Number', {
+
+	group: ' ' // grouped by space
+
+}).inherit('EU', 'Number');
+
+/*
+---
+
+name: Locale.fr-FR.Date
+
+description: Date messages for French.
+
+license: MIT-style license
+
+authors:
+  - Nicolas Sorosac
+  - Antoine Abt
+
+requires:
+  - Locale
+
+provides: [Locale.fr-FR.Date]
+
+...
+*/
+
+Locale.define('fr-FR', 'Date', {
+
+	months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
+	months_abbr: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
+	days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
+	days_abbr: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		return (dayOfMonth > 1) ? '' : 'er';
+	},
+
+	lessThanMinuteAgo: "il y a moins d'une minute",
+	minuteAgo: 'il y a une minute',
+	minutesAgo: 'il y a {delta} minutes',
+	hourAgo: 'il y a une heure',
+	hoursAgo: 'il y a {delta} heures',
+	dayAgo: 'il y a un jour',
+	daysAgo: 'il y a {delta} jours',
+	weekAgo: 'il y a une semaine',
+	weeksAgo: 'il y a {delta} semaines',
+	monthAgo: 'il y a 1 mois',
+	monthsAgo: 'il y a {delta} mois',
+	yearthAgo: 'il y a 1 an',
+	yearsAgo: 'il y a {delta} ans',
+
+	lessThanMinuteUntil: "dans moins d'une minute",
+	minuteUntil: 'dans une minute',
+	minutesUntil: 'dans {delta} minutes',
+	hourUntil: 'dans une heure',
+	hoursUntil: 'dans {delta} heures',
+	dayUntil: 'dans un jour',
+	daysUntil: 'dans {delta} jours',
+	weekUntil: 'dans 1 semaine',
+	weeksUntil: 'dans {delta} semaines',
+	monthUntil: 'dans 1 mois',
+	monthsUntil: 'dans {delta} mois',
+	yearUntil: 'dans 1 an',
+	yearsUntil: 'dans {delta} ans'
+
+});
+
+/*
+---
+
+name: Locale.fr-FR.Form.Validator
+
+description: Form Validator messages for French.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+  - Nicolas Sorosac
+
+requires:
+  - Locale
+
+provides: [Locale.fr-FR.Form.Validator]
+
+...
+*/
+
+Locale.define('fr-FR', 'FormValidator', {
+
+	required: 'Ce champ est obligatoire.',
+	length: 'Veuillez saisir {length} caract&egrave;re(s) (vous avez saisi {elLength} caract&egrave;re(s)',
+	minLength: 'Veuillez saisir un minimum de {minLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
+	maxLength: 'Veuillez saisir un maximum de {maxLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
+	integer: 'Veuillez saisir un nombre entier dans ce champ. Les nombres d&eacute;cimaux (ex : "1,25") ne sont pas autoris&eacute;s.',
+	numeric: 'Veuillez saisir uniquement des chiffres dans ce champ (ex : "1" ou "1,1" ou "-1" ou "-1,1").',
+	digits: "Veuillez saisir uniquement des chiffres et des signes de ponctuation dans ce champ (ex : un num&eacute;ro de t&eacute;l&eacute;phone avec des traits d'union est autoris&eacute;).",
+	alpha: 'Veuillez saisir uniquement des lettres (a-z) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
+	alphanum: 'Veuillez saisir uniquement des lettres (a-z) ou des chiffres (0-9) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
+	dateSuchAs: 'Veuillez saisir une date correcte comme {date}',
+	dateInFormatMDY: 'Veuillez saisir une date correcte, au format JJ/MM/AAAA (ex : "31/11/1999").',
+	email: 'Veuillez saisir une adresse de courrier &eacute;lectronique. Par exemple "fred@domaine.com".',
+	url: 'Veuillez saisir une URL, comme http://www.exemple.com.',
+	currencyDollar: 'Veuillez saisir une quantit&eacute; correcte. Par exemple 100,00&euro;.',
+	oneRequired: 'Veuillez s&eacute;lectionner au moins une de ces options.',
+	errorPrefix: 'Erreur : ',
+	warningPrefix: 'Attention : ',
+
+	// Form.Validator.Extras
+	noSpace: "Ce champ n'accepte pas les espaces.",
+	reqChkByNode: "Aucun &eacute;l&eacute;ment n'est s&eacute;lectionn&eacute;.",
+	requiredChk: 'Ce champ est obligatoire.',
+	reqChkByName: 'Veuillez s&eacute;lectionner un(e) {label}.',
+	match: 'Ce champ doit correspondre avec le champ {matchName}.',
+	startDate: 'date de d&eacute;but',
+	endDate: 'date de fin',
+	currentDate: 'date actuelle',
+	afterDate: 'La date doit &ecirc;tre identique ou post&eacute;rieure &agrave; {label}.',
+	beforeDate: 'La date doit &ecirc;tre identique ou ant&eacute;rieure &agrave; {label}.',
+	startMonth: 'Veuillez s&eacute;lectionner un mois de d&eacute;but.',
+	sameMonth: 'Ces deux dates doivent &ecirc;tre dans le m&ecirc;me mois - vous devez en modifier une.',
+	creditcard: 'Le num&eacute;ro de carte de cr&eacute;dit est invalide. Merci de v&eacute;rifier le num&eacute;ro et de r&eacute;essayer. Vous avez entr&eacute; {length} chiffre(s).'
+
+});
+
+/*
+---
+
+name: Locale.fr-FR.Number
+
+description: Number messages for French.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+  - sv1l
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.fr-FR.Number]
+
+...
+*/
+
+Locale.define('fr-FR', 'Number', {
+
+	group: ' ' // In fr-FR localization, group character is a blank space
+
+}).inherit('EU', 'Number');
+
+/*
+---
+
+name: Locale.he-IL.Date
+
+description: Date messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - Locale
+
+provides: [Locale.he-IL.Date]
+
+...
+*/
+
+Locale.define('he-IL', 'Date', {
+
+	months: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
+	months_abbr: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
+	days: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
+	days_abbr: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'לפני פחות מדקה',
+	minuteAgo: 'לפני כדקה',
+	minutesAgo: 'לפני {delta} דקות',
+	hourAgo: 'לפני כשעה',
+	hoursAgo: 'לפני {delta} שעות',
+	dayAgo: 'לפני יום',
+	daysAgo: 'לפני {delta} ימים',
+	weekAgo: 'לפני שבוע',
+	weeksAgo: 'לפני {delta} שבועות',
+	monthAgo: 'לפני חודש',
+	monthsAgo: 'לפני {delta} חודשים',
+	yearAgo: 'לפני שנה',
+	yearsAgo: 'לפני {delta} שנים',
+
+	lessThanMinuteUntil: 'בעוד פחות מדקה',
+	minuteUntil: 'בעוד כדקה',
+	minutesUntil: 'בעוד {delta} דקות',
+	hourUntil: 'בעוד כשעה',
+	hoursUntil: 'בעוד {delta} שעות',
+	dayUntil: 'בעוד יום',
+	daysUntil: 'בעוד {delta} ימים',
+	weekUntil: 'בעוד שבוע',
+	weeksUntil: 'בעוד {delta} שבועות',
+	monthUntil: 'בעוד חודש',
+	monthsUntil: 'בעוד {delta} חודשים',
+	yearUntil: 'בעוד שנה',
+	yearsUntil: 'בעוד {delta} שנים'
+
+});
+
+/*
+---
+
+name: Locale.he-IL.Form.Validator
+
+description: Form Validator messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - Locale
+
+provides: [Locale.he-IL.Form.Validator]
+
+...
+*/
+
+Locale.define('he-IL', 'FormValidator', {
+
+	required: 'נא למלא שדה זה.',
+	minLength: 'נא להזין לפחות {minLength} תווים (הזנת {length} תווים).',
+	maxLength: 'נא להזין עד {maxLength} תווים (הזנת {length} תווים).',
+	integer: 'נא להזין מספר שלם לשדה זה. מספרים עשרוניים (כמו 1.25) אינם חוקיים.',
+	numeric: 'נא להזין ערך מספרי בלבד בשדה זה (כמו "1", "1.1", "-1" או "-1.1").',
+	digits: 'נא להזין רק ספרות וסימני הפרדה בשדה זה (למשל, מספר טלפון עם מקפים או נקודות הוא חוקי).',
+	alpha: 'נא להזין רק אותיות באנגלית (a-z) בשדה זה. רווחים או תווים אחרים אינם חוקיים.',
+	alphanum: 'נא להזין רק אותריות באנגלית (a-z) או ספרות (0-9) בשדה זה. אווחרים או תווים אחרים אינם חוקיים.',
+	dateSuchAs: 'נא להזין תאריך חוקי, כמו {date}',
+	dateInFormatMDY: 'נא להזין תאריך חוקי בפורמט MM/DD/YYYY (כמו "12/31/1999")',
+	email: 'נא להזין כתובת אימייל חוקית. לדוגמה: "fred@domain.com".',
+	url: 'נא להזין כתובת אתר חוקית, כמו http://www.example.com.',
+	currencyDollar: 'נא להזין סכום דולרי חוקי. לדוגמה $100.00.',
+	oneRequired: 'נא לבחור לפחות בשדה אחד.',
+	errorPrefix: 'שגיאה: ',
+	warningPrefix: 'אזהרה: ',
+
+	// Form.Validator.Extras
+	noSpace: 'אין להזין רווחים בשדה זה.',
+	reqChkByNode: 'נא לבחור אחת מהאפשרויות.',
+	requiredChk: 'שדה זה נדרש.',
+	reqChkByName: 'נא לבחור {label}.',
+	match: 'שדה זה צריך להתאים לשדה {matchName}',
+	startDate: 'תאריך ההתחלה',
+	endDate: 'תאריך הסיום',
+	currentDate: 'התאריך הנוכחי',
+	afterDate: 'התאריך צריך להיות זהה או אחרי {label}.',
+	beforeDate: 'התאריך צריך להיות זהה או לפני {label}.',
+	startMonth: 'נא לבחור חודש התחלה',
+	sameMonth: 'שני תאריכים אלה צריכים להיות באותו חודש - נא לשנות אחד התאריכים.',
+	creditcard: 'מספר כרטיס האשראי שהוזן אינו חוקי. נא לבדוק שנית. הוזנו {length} ספרות.'
+
+});
+
+/*
+---
+
+name: Locale.he-IL.Number
+
+description: Number messages for Hebrew.
+
+license: MIT-style license
+
+authors:
+  - Elad Ossadon
+
+requires:
+  - Locale
+
+provides: [Locale.he-IL.Number]
+
+...
+*/
+
+Locale.define('he-IL', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+	currency: {
+		suffix: ' ₪'
+	}
+
+});
+
+/*
+---
+
+name: Locale.hu-HU.Date
+
+description: Date messages for Hungarian.
+
+license: MIT-style license
+
+authors:
+  - Zsolt Szegheő
+
+requires:
+  - Locale
+
+provides: [Locale.hu-HU.Date]
+
+...
+*/
+
+Locale.define('hu-HU', 'Date', {
+
+	months: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június', 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
+	months_abbr: ['jan.', 'febr.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
+	days: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
+	days_abbr: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
+
+	// Culture's date order: YYYY.MM.DD.
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y.%m.%d.',
+	shortTime: '%I:%M',
+	AM: 'de.',
+	PM: 'du.',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'alig egy perce',
+	minuteAgo: 'egy perce',
+	minutesAgo: '{delta} perce',
+	hourAgo: 'egy órája',
+	hoursAgo: '{delta} órája',
+	dayAgo: '1 napja',
+	daysAgo: '{delta} napja',
+	weekAgo: '1 hete',
+	weeksAgo: '{delta} hete',
+	monthAgo: '1 hónapja',
+	monthsAgo: '{delta} hónapja',
+	yearAgo: '1 éve',
+	yearsAgo: '{delta} éve',
+
+	lessThanMinuteUntil: 'alig egy perc múlva',
+	minuteUntil: 'egy perc múlva',
+	minutesUntil: '{delta} perc múlva',
+	hourUntil: 'egy óra múlva',
+	hoursUntil: '{delta} óra múlva',
+	dayUntil: '1 nap múlva',
+	daysUntil: '{delta} nap múlva',
+	weekUntil: '1 hét múlva',
+	weeksUntil: '{delta} hét múlva',
+	monthUntil: '1 hónap múlva',
+	monthsUntil: '{delta} hónap múlva',
+	yearUntil: '1 év múlva',
+	yearsUntil: '{delta} év múlva'
+
+});
+
+/*
+---
+
+name: Locale.hu-HU.Form.Validator
+
+description: Form Validator messages for Hungarian.
+
+license: MIT-style license
+
+authors:
+  - Zsolt Szegheő
+
+requires:
+  - Locale
+
+provides: [Locale.hu-HU.Form.Validator]
+
+...
+*/
+
+Locale.define('hu-HU', 'FormValidator', {
+
+	required: 'A mező kitöltése kötelező.',
+	minLength: 'Legalább {minLength} karakter megadása szükséges (megadva {length} karakter).',
+	maxLength: 'Legfeljebb {maxLength} karakter megadása lehetséges (megadva {length} karakter).',
+	integer: 'Egész szám megadása szükséges. A tizedesjegyek (pl. 1.25) nem engedélyezettek.',
+	numeric: 'Szám megadása szükséges (pl. "1" vagy "1.1" vagy "-1" vagy "-1.1").',
+	digits: 'Csak számok és írásjelek megadása lehetséges (pl. telefonszám kötőjelek és/vagy perjelekkel).',
+	alpha: 'Csak betűk (a-z) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
+	alphanum: 'Csak betűk (a-z) vagy számok (0-9) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
+	dateSuchAs: 'Valós dátum megadása szükséges (pl. {date}).',
+	dateInFormatMDY: 'Valós dátum megadása szükséges ÉÉÉÉ.HH.NN. formában. (pl. "1999.12.31.")',
+	email: 'Valós e-mail cím megadása szükséges (pl. "fred@domain.hu").',
+	url: 'Valós URL megadása szükséges (pl. http://www.example.com).',
+	currencyDollar: 'Valós pénzösszeg megadása szükséges (pl. 100.00 Ft.).',
+	oneRequired: 'Az alábbi mezők legalább egyikének kitöltése kötelező.',
+	errorPrefix: 'Hiba: ',
+	warningPrefix: 'Figyelem: ',
+
+	// Form.Validator.Extras
+	noSpace: 'A mező nem tartalmazhat szóközöket.',
+	reqChkByNode: 'Nincs egyetlen kijelölt elem sem.',
+	requiredChk: 'A mező kitöltése kötelező.',
+	reqChkByName: 'Egy {label} kiválasztása szükséges.',
+	match: 'A mezőnek egyeznie kell a(z) {matchName} mezővel.',
+	startDate: 'a kezdet dátuma',
+	endDate: 'a vég dátuma',
+	currentDate: 'jelenlegi dátum',
+	afterDate: 'A dátum nem lehet kisebb, mint {label}.',
+	beforeDate: 'A dátum nem lehet nagyobb, mint {label}.',
+	startMonth: 'Kezdeti hónap megadása szükséges.',
+	sameMonth: 'A két dátumnak ugyanazon hónapban kell lennie.',
+	creditcard: 'A megadott bankkártyaszám nem valódi (megadva {length} számjegy).'
+
+});
+
+/*
+---
+
+name: Locale.it-IT.Date
+
+description: Date messages for Italian.
+
+license: MIT-style license.
+
+authors:
+  - Andrea Novero
+  - Valerio Proietti
+
+requires:
+  - Locale
+
+provides: [Locale.it-IT.Date]
+
+...
+*/
+
+Locale.define('it-IT', 'Date', {
+
+	months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
+	months_abbr: ['gen', 'feb', 'mar', 'apr', 'mag', 'giu', 'lug', 'ago', 'set', 'ott', 'nov', 'dic'],
+	days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
+	days_abbr: ['dom', 'lun', 'mar', 'mer', 'gio', 'ven', 'sab'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H.%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'º',
+
+	lessThanMinuteAgo: 'meno di un minuto fa',
+	minuteAgo: 'circa un minuto fa',
+	minutesAgo: 'circa {delta} minuti fa',
+	hourAgo: "circa un'ora fa",
+	hoursAgo: 'circa {delta} ore fa',
+	dayAgo: 'circa 1 giorno fa',
+	daysAgo: 'circa {delta} giorni fa',
+	weekAgo: 'una settimana fa',
+	weeksAgo: '{delta} settimane fa',
+	monthAgo: 'un mese fa',
+	monthsAgo: '{delta} mesi fa',
+	yearAgo: 'un anno fa',
+	yearsAgo: '{delta} anni fa',
+
+	lessThanMinuteUntil: 'tra meno di un minuto',
+	minuteUntil: 'tra circa un minuto',
+	minutesUntil: 'tra circa {delta} minuti',
+	hourUntil: "tra circa un'ora",
+	hoursUntil: 'tra circa {delta} ore',
+	dayUntil: 'tra circa un giorno',
+	daysUntil: 'tra circa {delta} giorni',
+	weekUntil: 'tra una settimana',
+	weeksUntil: 'tra {delta} settimane',
+	monthUntil: 'tra un mese',
+	monthsUntil: 'tra {delta} mesi',
+	yearUntil: 'tra un anno',
+	yearsUntil: 'tra {delta} anni'
+
+});
+
+/*
+---
+
+name: Locale.it-IT.Form.Validator
+
+description: Form Validator messages for Italian.
+
+license: MIT-style license
+
+authors:
+  - Leonardo Laureti
+  - Andrea Novero
+
+requires:
+  - Locale
+
+provides: [Locale.it-IT.Form.Validator]
+
+...
+*/
+
+Locale.define('it-IT', 'FormValidator', {
+
+	required: 'Il campo &egrave; obbligatorio.',
+	minLength: 'Inserire almeno {minLength} caratteri (ne sono stati inseriti {length}).',
+	maxLength: 'Inserire al massimo {maxLength} caratteri (ne sono stati inseriti {length}).',
+	integer: 'Inserire un numero intero. Non sono consentiti decimali (es.: 1.25).',
+	numeric: 'Inserire solo valori numerici (es.: "1" oppure "1.1" oppure "-1" oppure "-1.1").',
+	digits: 'Inserire solo numeri e caratteri di punteggiatura. Per esempio &egrave; consentito un numero telefonico con trattini o punti.',
+	alpha: 'Inserire solo lettere (a-z). Non sono consentiti spazi o altri caratteri.',
+	alphanum: 'Inserire solo lettere (a-z) o numeri (0-9). Non sono consentiti spazi o altri caratteri.',
+	dateSuchAs: 'Inserire una data valida del tipo {date}',
+	dateInFormatMDY: 'Inserire una data valida nel formato MM/GG/AAAA (es.: "12/31/1999")',
+	email: 'Inserire un indirizzo email valido. Per esempio "nome@dominio.com".',
+	url: 'Inserire un indirizzo valido. Per esempio "http://www.example.com".',
+	currencyDollar: 'Inserire un importo valido. Per esempio "$100.00".',
+	oneRequired: 'Completare almeno uno dei campi richiesti.',
+	errorPrefix: 'Errore: ',
+	warningPrefix: 'Attenzione: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Non sono consentiti spazi.',
+	reqChkByNode: 'Nessuna voce selezionata.',
+	requiredChk: 'Il campo &egrave; obbligatorio.',
+	reqChkByName: 'Selezionare un(a) {label}.',
+	match: 'Il valore deve corrispondere al campo {matchName}',
+	startDate: "data d'inizio",
+	endDate: 'data di fine',
+	currentDate: 'data attuale',
+	afterDate: 'La data deve corrispondere o essere successiva al {label}.',
+	beforeDate: 'La data deve corrispondere o essere precedente al {label}.',
+	startMonth: "Selezionare un mese d'inizio",
+	sameMonth: 'Le due date devono essere dello stesso mese - occorre modificarne una.'
+
+});
+
+/*
+---
+
+name: Locale.ja-JP.Date
+
+description: Date messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - Locale
+
+provides: [Locale.ja-JP.Date]
+
+...
+*/
+
+Locale.define('ja-JP', 'Date', {
+
+	months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+	months_abbr: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+	days: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'],
+	days_abbr: ['日', '月', '火', '水', '木', '金', '土'],
+
+	// Culture's date order: YYYY/MM/DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y/%m/%d',
+	shortTime: '%H:%M',
+	AM: '午前',
+	PM: '午後',
+	firstDayOfWeek: 0,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '1分以内前',
+	minuteAgo: '約1分前',
+	minutesAgo: '約{delta}分前',
+	hourAgo: '約1時間前',
+	hoursAgo: '約{delta}時間前',
+	dayAgo: '1日前',
+	daysAgo: '{delta}日前',
+	weekAgo: '1週間前',
+	weeksAgo: '{delta}週間前',
+	monthAgo: '1ヶ月前',
+	monthsAgo: '{delta}ヶ月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '今から約1分以内',
+	minuteUntil: '今から約1分',
+	minutesUntil: '今から約{delta}分',
+	hourUntil: '今から約1時間',
+	hoursUntil: '今から約{delta}時間',
+	dayUntil: '今から1日間',
+	daysUntil: '今から{delta}日間',
+	weekUntil: '今から1週間',
+	weeksUntil: '今から{delta}週間',
+	monthUntil: '今から1ヶ月',
+	monthsUntil: '今から{delta}ヶ月',
+	yearUntil: '今から1年',
+	yearsUntil: '今から{delta}年'
+
+});
+
+/*
+---
+
+name: Locale.ja-JP.Form.Validator
+
+description: Form Validator messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - Locale
+
+provides: [Locale.ja-JP.Form.Validator]
+
+...
+*/
+
+Locale.define("ja-JP", "FormValidator", {
+
+	required: '入力は必須です。',
+	minLength: '入力文字数は{minLength}以上にしてください。({length}文字)',
+	maxLength: '入力文字数は{maxLength}以下にしてください。({length}文字)',
+	integer: '整数を入力してください。',
+	numeric: '入力できるのは数値だけです。(例: "1", "1.1", "-1", "-1.1"....)',
+	digits: '入力できるのは数値と句読記号です。 (例: -や+を含む電話番号など).',
+	alpha: '入力できるのは半角英字だけです。それ以外の文字は入力できません。',
+	alphanum: '入力できるのは半角英数字だけです。それ以外の文字は入力できません。',
+	dateSuchAs: '有効な日付を入力してください。{date}',
+	dateInFormatMDY: '日付の書式に誤りがあります。YYYY/MM/DD (i.e. "1999/12/31")',
+	email: 'メールアドレスに誤りがあります。',
+	url: 'URLアドレスに誤りがあります。',
+	currencyDollar: '金額に誤りがあります。',
+	oneRequired: 'ひとつ以上入力してください。',
+	errorPrefix: 'エラー: ',
+	warningPrefix: '警告: ',
+
+	// FormValidator.Extras
+	noSpace: 'スペースは入力できません。',
+	reqChkByNode: '選択されていません。',
+	requiredChk: 'この項目は必須です。',
+	reqChkByName: '{label}を選択してください。',
+	match: '{matchName}が入力されている場合必須です。',
+	startDate: '開始日',
+	endDate: '終了日',
+	currentDate: '今日',
+	afterDate: '{label}以降の日付にしてください。',
+	beforeDate: '{label}以前の日付にしてください。',
+	startMonth: '開始月を選択してください。',
+	sameMonth: '日付が同一です。どちらかを変更してください。'
+
+});
+
+/*
+---
+
+name: Locale.ja-JP.Number
+
+description: Number messages for Japanese.
+
+license: MIT-style license
+
+authors:
+  - Noritaka Horio
+
+requires:
+  - Locale
+
+provides: [Locale.ja-JP.Number]
+
+...
+*/
+
+Locale.define('ja-JP', 'Number', {
+
+	decimal: '.',
+	group: ',',
+
+	currency: {
+		decimals: 0,
+		prefix: '\\'
+	}
+
+});
+
+/*
+---
+
+name: Locale.nl-NL.Date
+
+description: Date messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Lennart Pilon
+  - Tim Wienk
+
+requires:
+  - Locale
+
+provides: [Locale.nl-NL.Date]
+
+...
+*/
+
+Locale.define('nl-NL', 'Date', {
+
+	months: ['januari', 'februari', 'maart', 'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+	days: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
+	days_abbr: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'e',
+
+	lessThanMinuteAgo: 'minder dan een minuut geleden',
+	minuteAgo: 'ongeveer een minuut geleden',
+	minutesAgo: '{delta} minuten geleden',
+	hourAgo: 'ongeveer een uur geleden',
+	hoursAgo: 'ongeveer {delta} uur geleden',
+	dayAgo: 'een dag geleden',
+	daysAgo: '{delta} dagen geleden',
+	weekAgo: 'een week geleden',
+	weeksAgo: '{delta} weken geleden',
+	monthAgo: 'een maand geleden',
+	monthsAgo: '{delta} maanden geleden',
+	yearAgo: 'een jaar geleden',
+	yearsAgo: '{delta} jaar geleden',
+
+	lessThanMinuteUntil: 'over minder dan een minuut',
+	minuteUntil: 'over ongeveer een minuut',
+	minutesUntil: 'over {delta} minuten',
+	hourUntil: 'over ongeveer een uur',
+	hoursUntil: 'over {delta} uur',
+	dayUntil: 'over ongeveer een dag',
+	daysUntil: 'over {delta} dagen',
+	weekUntil: 'over een week',
+	weeksUntil: 'over {delta} weken',
+	monthUntil: 'over een maand',
+	monthsUntil: 'over {delta} maanden',
+	yearUntil: 'over een jaar',
+	yearsUntil: 'over {delta} jaar'
+
+});
+
+/*
+---
+
+name: Locale.nl-NL.Form.Validator
+
+description: Form Validator messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Lennart Pilon
+  - Arian Stolwijk
+  - Tim Wienk
+
+requires:
+  - Locale
+
+provides: [Locale.nl-NL.Form.Validator]
+
+...
+*/
+
+Locale.define('nl-NL', 'FormValidator', {
+
+	required: 'Dit veld is verplicht.',
+	length: 'Vul precies {length} karakters in (je hebt {elLength} karakters ingevoerd).',
+	minLength: 'Vul minimaal {minLength} karakters in (je hebt {length} karakters ingevoerd).',
+	maxLength: 'Vul niet meer dan {maxLength} karakters in (je hebt {length} karakters ingevoerd).',
+	integer: 'Vul een getal in. Getallen met decimalen (bijvoorbeeld 1.25) zijn niet toegestaan.',
+	numeric: 'Vul alleen numerieke waarden in (bijvoorbeeld "1" of "1.1" of "-1" of "-1.1").',
+	digits: 'Vul alleen nummers en leestekens in (bijvoorbeeld een telefoonnummer met streepjes is toegestaan).',
+	alpha: 'Vul alleen letters in (a-z). Spaties en andere karakters zijn niet toegestaan.',
+	alphanum: 'Vul alleen letters (a-z) of nummers (0-9) in. Spaties en andere karakters zijn niet toegestaan.',
+	dateSuchAs: 'Vul een geldige datum in, zoals {date}',
+	dateInFormatMDY: 'Vul een geldige datum, in het formaat MM/DD/YYYY (bijvoorbeeld "12/31/1999")',
+	email: 'Vul een geldig e-mailadres in. Bijvoorbeeld "fred@domein.nl".',
+	url: 'Vul een geldige URL in, zoals http://www.example.com.',
+	currencyDollar: 'Vul een geldig $ bedrag in. Bijvoorbeeld $100.00 .',
+	oneRequired: 'Vul iets in bij in ieder geval een van deze velden.',
+	warningPrefix: 'Waarschuwing: ',
+	errorPrefix: 'Fout: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Spaties zijn niet toegestaan in dit veld.',
+	reqChkByNode: 'Er zijn geen items geselecteerd.',
+	requiredChk: 'Dit veld is verplicht.',
+	reqChkByName: 'Selecteer een {label}.',
+	match: 'Dit veld moet overeen komen met het {matchName} veld',
+	startDate: 'de begin datum',
+	endDate: 'de eind datum',
+	currentDate: 'de huidige datum',
+	afterDate: 'De datum moet hetzelfde of na {label} zijn.',
+	beforeDate: 'De datum moet hetzelfde of voor {label} zijn.',
+	startMonth: 'Selecteer een begin maand',
+	sameMonth: 'Deze twee data moeten in dezelfde maand zijn - u moet een van beide aanpassen.',
+	creditcard: 'Het ingevulde creditcardnummer is niet geldig. Controleer het nummer en probeer opnieuw. {length} getallen ingevuld.'
+
+});
+
+/*
+---
+
+name: Locale.nl-NL.Number
+
+description: Number messages for Dutch.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.nl-NL.Number]
+
+...
+*/
+
+Locale.define('nl-NL').inherit('EU', 'Number');
+
+
+
+
+/*
+---
+
+name: Locale.no-NO.Date
+
+description: Date messages for Norwegian.
+
+license: MIT-style license
+
+authors:
+  - Espen 'Rexxars' Hovlandsdal
+  - Ole Tøsse Kolvik
+requires:
+  - Locale
+
+provides: [Locale.no-NO.Date]
+
+...
+*/
+
+Locale.define('no-NO', 'Date', {
+	months: ['Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember'],
+	months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
+	days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
+	days_abbr: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	lessThanMinuteAgo: 'mindre enn et minutt siden',
+	minuteAgo: 'omtrent et minutt siden',
+	minutesAgo: '{delta} minutter siden',
+	hourAgo: 'omtrent en time siden',
+	hoursAgo: 'omtrent {delta} timer siden',
+	dayAgo: '{delta} dag siden',
+	daysAgo: '{delta} dager siden',
+	weekAgo: 'en uke siden',
+	weeksAgo: '{delta} uker siden',
+	monthAgo: 'en måned siden',
+	monthsAgo: '{delta} måneder siden',
+	yearAgo: 'ett år siden',
+	yearsAgo: '{delta} år siden',
+
+	lessThanMinuteUntil: 'mindre enn et minutt til',
+	minuteUntil: 'omtrent et minutt til',
+	minutesUntil: '{delta} minutter til',
+	hourUntil: 'omtrent en time til',
+	hoursUntil: 'omtrent {delta} timer til',
+	dayUntil: 'en dag til',
+	daysUntil: '{delta} dager til',
+	weekUntil: 'en uke til',
+	weeksUntil: '{delta} uker til',
+	monthUntil: 'en måned til',
+	monthsUntil: '{delta} måneder til',
+	yearUntil: 'et år til',
+	yearsUntil: '{delta} år til'
+});
+
+/*
+---
+
+name: Locale.no-NO.Form.Validator
+
+description: Form Validator messages for Norwegian.
+
+license: MIT-style license
+
+authors:
+  - Espen 'Rexxars' Hovlandsdal
+
+requires:
+  - Locale
+
+provides: [Locale.no-NO.Form.Validator]
+
+...
+*/
+
+Locale.define('no-NO', 'FormValidator', {
+
+	required: 'Dette feltet er påkrevd.',
+	minLength: 'Vennligst skriv inn minst {minLength} tegn (du skrev {length} tegn).',
+	maxLength: 'Vennligst skriv inn maksimalt {maxLength} tegn (du skrev {length} tegn).',
+	integer: 'Vennligst skriv inn et tall i dette feltet. Tall med desimaler (for eksempel 1,25) er ikke tillat.',
+	numeric: 'Vennligst skriv inn kun numeriske verdier i dette feltet (for eksempel "1", "1.1", "-1" eller "-1.1").',
+	digits: 'Vennligst bruk kun nummer og skilletegn i dette feltet.',
+	alpha: 'Vennligst bruk kun bokstaver (a-z) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	alphanum: 'Vennligst bruk kun bokstaver (a-z) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
+	dateSuchAs: 'Vennligst skriv inn en gyldig dato, som {date}',
+	dateInFormatMDY: 'Vennligst skriv inn en gyldig dato, i formatet MM/DD/YYYY (for eksempel "12/31/1999")',
+	email: 'Vennligst skriv inn en gyldig epost-adresse. For eksempel "espen@domene.no".',
+	url: 'Vennligst skriv inn en gyldig URL, for eksempel http://www.example.com.',
+	currencyDollar: 'Vennligst fyll ut et gyldig $ beløp. For eksempel $100.00 .',
+	oneRequired: 'Vennligst fyll ut noe i minst ett av disse feltene.',
+	errorPrefix: 'Feil: ',
+	warningPrefix: 'Advarsel: '
+
+});
+
+/*
+---
+
+name: Locale.pl-PL.Date
+
+description: Date messages for Polish.
+
+license: MIT-style license
+
+authors:
+  - Oskar Krawczyk
+
+requires:
+  - Locale
+
+provides: [Locale.pl-PL.Date]
+
+...
+*/
+
+Locale.define('pl-PL', 'Date', {
+
+	months: ['Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'],
+	months_abbr: ['sty', 'lut', 'mar', 'kwi', 'maj', 'cze', 'lip', 'sie', 'wrz', 'paź', 'lis', 'gru'],
+	days: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'],
+	days_abbr: ['niedz.', 'pon.', 'wt.', 'śr.', 'czw.', 'pt.', 'sob.'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%H:%M',
+	AM: 'nad ranem',
+	PM: 'po południu',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: function(dayOfMonth){
+		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'ty' : ['ty', 'szy', 'gi', 'ci', 'ty'][Math.min(dayOfMonth % 10, 4)];
+	},
+
+	lessThanMinuteAgo: 'mniej niż minute temu',
+	minuteAgo: 'około minutę temu',
+	minutesAgo: '{delta} minut temu',
+	hourAgo: 'około godzinę temu',
+	hoursAgo: 'około {delta} godzin temu',
+	dayAgo: 'Wczoraj',
+	daysAgo: '{delta} dni temu',
+
+	lessThanMinuteUntil: 'za niecałą minutę',
+	minuteUntil: 'za około minutę',
+	minutesUntil: 'za {delta} minut',
+	hourUntil: 'za około godzinę',
+	hoursUntil: 'za około {delta} godzin',
+	dayUntil: 'za 1 dzień',
+	daysUntil: 'za {delta} dni'
+
+});
+
+/*
+---
+
+name: Locale.pl-PL.Form.Validator
+
+description: Form Validator messages for Polish.
+
+license: MIT-style license
+
+authors:
+  - Oskar Krawczyk
+
+requires:
+  - Locale
+
+provides: [Locale.pl-PL.Form.Validator]
+
+...
+*/
+
+Locale.define('pl-PL', 'FormValidator', {
+
+	required: 'To pole jest wymagane.',
+	minLength: 'Wymagane jest przynajmniej {minLength} znaków (wpisanych zostało tylko {length}).',
+	maxLength: 'Dozwolone jest nie więcej niż {maxLength} znaków (wpisanych zostało {length})',
+	integer: 'To pole wymaga liczb całych. Liczby dziesiętne (np. 1.25) są niedozwolone.',
+	numeric: 'Prosimy używać tylko numerycznych wartości w tym polu (np. "1", "1.1", "-1" lub "-1.1").',
+	digits: 'Prosimy używać liczb oraz zankow punktuacyjnych w typ polu (dla przykładu, przy numerze telefonu myślniki i kropki są dozwolone).',
+	alpha: 'Prosimy używać tylko liter (a-z) w tym polu. Spacje oraz inne znaki są niedozwolone.',
+	alphanum: 'Prosimy używać tylko liter (a-z) lub liczb (0-9) w tym polu. Spacje oraz inne znaki są niedozwolone.',
+	dateSuchAs: 'Prosimy podać prawidłową datę w formacie: {date}',
+	dateInFormatMDY: 'Prosimy podać poprawną date w formacie DD.MM.RRRR (i.e. "12.01.2009")',
+	email: 'Prosimy podać prawidłowy adres e-mail, np. "jan@domena.pl".',
+	url: 'Prosimy podać prawidłowy adres URL, np. http://www.example.com.',
+	currencyDollar: 'Prosimy podać prawidłową sumę w PLN. Dla przykładu: 100.00 PLN.',
+	oneRequired: 'Prosimy wypełnić chociaż jedno z pól.',
+	errorPrefix: 'Błąd: ',
+	warningPrefix: 'Uwaga: ',
+
+	// Form.Validator.Extras
+	noSpace: 'W tym polu nie mogą znajdować się spacje.',
+	reqChkByNode: 'Brak zaznaczonych elementów.',
+	requiredChk: 'To pole jest wymagane.',
+	reqChkByName: 'Prosimy wybrać z {label}.',
+	match: 'To pole musi być takie samo jak {matchName}',
+	startDate: 'data początkowa',
+	endDate: 'data końcowa',
+	currentDate: 'aktualna data',
+	afterDate: 'Podana data poinna być taka sama lub po {label}.',
+	beforeDate: 'Podana data poinna być taka sama lub przed {label}.',
+	startMonth: 'Prosimy wybrać początkowy miesiąc.',
+	sameMonth: 'Te dwie daty muszą być w zakresie tego samego miesiąca - wymagana jest zmiana któregoś z pól.'
+
+});
+
+/*
+---
+
+name: Locale.pt-PT.Date
+
+description: Date messages for Portuguese.
+
+license: MIT-style license
+
+authors:
+  - Fabio Miranda Costa
+
+requires:
+  - Locale
+
+provides: [Locale.pt-PT.Date]
+
+...
+*/
+
+Locale.define('pt-PT', 'Date', {
+
+	months: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+	months_abbr: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+	days: ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
+	days_abbr: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
+
+	// Culture's date order: DD-MM-YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d-%m-%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: 'º',
+
+	lessThanMinuteAgo: 'há menos de um minuto',
+	minuteAgo: 'há cerca de um minuto',
+	minutesAgo: 'há {delta} minutos',
+	hourAgo: 'há cerca de uma hora',
+	hoursAgo: 'há cerca de {delta} horas',
+	dayAgo: 'há um dia',
+	daysAgo: 'há {delta} dias',
+	weekAgo: 'há uma semana',
+	weeksAgo: 'há {delta} semanas',
+	monthAgo: 'há um mês',
+	monthsAgo: 'há {delta} meses',
+	yearAgo: 'há um ano',
+	yearsAgo: 'há {delta} anos',
+
+	lessThanMinuteUntil: 'em menos de um minuto',
+	minuteUntil: 'em um minuto',
+	minutesUntil: 'em {delta} minutos',
+	hourUntil: 'em uma hora',
+	hoursUntil: 'em {delta} horas',
+	dayUntil: 'em um dia',
+	daysUntil: 'em {delta} dias',
+	weekUntil: 'em uma semana',
+	weeksUntil: 'em {delta} semanas',
+	monthUntil: 'em um mês',
+	monthsUntil: 'em {delta} meses',
+	yearUntil: 'em um ano',
+	yearsUntil: 'em {delta} anos'
+
+});
+
+/*
+---
+
+name: Locale.pt-BR.Date
+
+description: Date messages for Portuguese (Brazil).
+
+license: MIT-style license
+
+authors:
+  - Fabio Miranda Costa
+
+requires:
+  - Locale
+  - Locale.pt-PT.Date
+
+provides: [Locale.pt-BR.Date]
+
+...
+*/
+
+Locale.define('pt-BR', 'Date', {
+
+	// Culture's date order: DD/MM/YYYY
+	shortDate: '%d/%m/%Y'
+
+}).inherit('pt-PT', 'Date');
+
+/*
+---
+
+name: Locale.pt-BR.Form.Validator
+
+description: Form Validator messages for Portuguese (Brazil).
+
+license: MIT-style license
+
+authors:
+  - Fábio Miranda Costa
+
+requires:
+  - Locale
+
+provides: [Locale.pt-BR.Form.Validator]
+
+...
+*/
+
+Locale.define('pt-BR', 'FormValidator', {
+
+	required: 'Este campo é obrigatório.',
+	minLength: 'Digite pelo menos {minLength} caracteres (tamanho atual: {length}).',
+	maxLength: 'Não digite mais de {maxLength} caracteres (tamanho atual: {length}).',
+	integer: 'Por favor digite apenas um número inteiro neste campo. Não são permitidos números decimais (por exemplo, 1,25).',
+	numeric: 'Por favor digite apenas valores numéricos neste campo (por exemplo, "1" ou "1.1" ou "-1" ou "-1,1").',
+	digits: 'Por favor use apenas números e pontuação neste campo (por exemplo, um número de telefone com traços ou pontos é permitido).',
+	alpha: 'Por favor use somente letras (a-z). Espaço e outros caracteres não são permitidos.',
+	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Espaço e outros caracteres não são permitidos.',
+	dateSuchAs: 'Digite uma data válida, como {date}',
+	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (por exemplo, "31/12/1999")',
+	email: 'Digite um endereço de email válido. Por exemplo "nome@dominio.com".',
+	url: 'Digite uma URL válida. Exemplo: http://www.example.com.',
+	currencyDollar: 'Digite um valor em dinheiro válido. Exemplo: R$100,00 .',
+	oneRequired: 'Digite algo para pelo menos um desses campos.',
+	errorPrefix: 'Erro: ',
+	warningPrefix: 'Aviso: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Não é possível digitar espaços neste campo.',
+	reqChkByNode: 'Não foi selecionado nenhum item.',
+	requiredChk: 'Este campo é obrigatório.',
+	reqChkByName: 'Por favor digite um {label}.',
+	match: 'Este campo deve ser igual ao campo {matchName}.',
+	startDate: 'a data inicial',
+	endDate: 'a data final',
+	currentDate: 'a data atual',
+	afterDate: 'A data deve ser igual ou posterior a {label}.',
+	beforeDate: 'A data deve ser igual ou anterior a {label}.',
+	startMonth: 'Por favor selecione uma data inicial.',
+	sameMonth: 'Estas duas datas devem ter o mesmo mês - você deve modificar uma das duas.',
+	creditcard: 'O número do cartão de crédito informado é inválido. Por favor verifique o valor e tente novamente. {length} números informados.'
+
+});
+
+/*
+---
+
+name: Locale.pt-BR.Number
+
+description: Number messages for PT Brazilian.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+  - Danillo César
+
+requires:
+  - Locale
+
+provides: [Locale.pt-BR.Number]
+
+...
+*/
+
+Locale.define('pt-BR', 'Number', {
+
+	decimal: ',',
+	group: '.',
+
+	currency: {
+		prefix: 'R$ '
+	}
+
+});
+
+
+
+/*
+---
+
+name: Locale.pt-PT.Form.Validator
+
+description: Form Validator messages for Portuguese.
+
+license: MIT-style license
+
+authors:
+  - Miquel Hudin
+
+requires:
+  - Locale
+
+provides: [Locale.pt-PT.Form.Validator]
+
+...
+*/
+
+Locale.define('pt-PT', 'FormValidator', {
+
+	required: 'Este campo é necessário.',
+	minLength: 'Digite pelo menos{minLength} caracteres (comprimento {length} caracteres).',
+	maxLength: 'Não insira mais de {maxLength} caracteres (comprimento {length} caracteres).',
+	integer: 'Digite um número inteiro neste domínio. Com números decimais (por exemplo, 1,25), não são permitidas.',
+	numeric: 'Digite apenas valores numéricos neste domínio (p.ex., "1" ou "1.1" ou "-1" ou "-1,1").',
+	digits: 'Por favor, use números e pontuação apenas neste campo (p.ex., um número de telefone com traços ou pontos é permitida).',
+	alpha: 'Por favor use somente letras (a-z), com nesta área. Não utilize espaços nem outros caracteres são permitidos.',
+	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Não utilize espaços nem outros caracteres são permitidos.',
+	dateSuchAs: 'Digite uma data válida, como {date}',
+	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (p.ex. "31/12/1999")',
+	email: 'Digite um endereço de email válido. Por exemplo "fred@domain.com".',
+	url: 'Digite uma URL válida, como http://www.example.com.',
+	currencyDollar: 'Digite um valor válido $. Por exemplo $ 100,00. ',
+	oneRequired: 'Digite algo para pelo menos um desses insumos.',
+	errorPrefix: 'Erro: ',
+	warningPrefix: 'Aviso: '
+
+});
+
+/*
+---
+
+name: Locale.ru-RU-unicode.Date
+
+description: Date messages for Russian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Evstigneev Pavel
+  - Kuryanovich Egor
+
+requires:
+  - Locale
+
+provides: [Locale.ru-RU.Date]
+
+...
+*/
+
+(function(){
+
+// Russian language pluralization rules, taken from CLDR project, http://unicode.org/cldr/
+// one -> n mod 10 is 1 and n mod 100 is not 11;
+// few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
+// many -> n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14;
+// other -> everything else (example 3.14)
+var pluralize = function (n, one, few, many, other){
+	var modulo10 = n % 10,
+		modulo100 = n % 100;
+
+	if (modulo10 == 1 && modulo100 != 11){
+		return one;
+	} else if ((modulo10 == 2 || modulo10 == 3 || modulo10 == 4) && !(modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
+		return few;
+	} else if (modulo10 == 0 || (modulo10 == 5 || modulo10 == 6 || modulo10 == 7 || modulo10 == 8 || modulo10 == 9) || (modulo100 == 11 || modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
+		return many;
+	} else {
+		return other;
+	}
+};
+
+Locale.define('ru-RU', 'Date', {
+
+	months: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'],
+	months_abbr: ['янв', 'февр', 'март', 'апр', 'май','июнь','июль','авг','сент','окт','нояб','дек'],
+	days: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'],
+	days_abbr: ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'меньше минуты назад',
+	minuteAgo: 'минуту назад',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'минуту', 'минуты', 'минут') + ' назад'; },
+	hourAgo: 'час назад',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ' назад'; },
+	dayAgo: 'вчера',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ' назад'; },
+	weekAgo: 'неделю назад',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'неделя', 'недели', 'недель') + ' назад'; },
+	monthAgo: 'месяц назад',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'месяц', 'месяца', 'месяцев') + ' назад'; },
+	yearAgo: 'год назад',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'год', 'года', 'лет') + ' назад'; },
+
+	lessThanMinuteUntil: 'меньше чем через минуту',
+	minuteUntil: 'через минуту',
+	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'минуту', 'минуты', 'минут') + ''; },
+	hourUntil: 'через час',
+	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ''; },
+	dayUntil: 'завтра',
+	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ''; },
+	weekUntil: 'через неделю',
+	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'неделю', 'недели', 'недель') + ''; },
+	monthUntil: 'через месяц',
+	monthsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'месяц', 'месяца', 'месяцев') + ''; },
+	yearUntil: 'через',
+	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'год', 'года', 'лет') + ''; }
+
+});
+
+
+
+})();
+
+/*
+---
+
+name: Locale.ru-RU-unicode.Form.Validator
+
+description: Form Validator messages for Russian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Chernodarov Egor
+
+requires:
+  - Locale
+
+provides: [Locale.ru-RU.Form.Validator]
+
+...
+*/
+
+Locale.define('ru-RU', 'FormValidator', {
+
+	required: 'Это поле обязательно к заполнению.',
+	minLength: 'Пожалуйста, введите хотя бы {minLength} символов (Вы ввели {length}).',
+	maxLength: 'Пожалуйста, введите не больше {maxLength} символов (Вы ввели {length}).',
+	integer: 'Пожалуйста, введите в это поле число. Дробные числа (например 1.25) тут не разрешены.',
+	numeric: 'Пожалуйста, введите в это поле число (например "1" или "1.1", или "-1", или "-1.1").',
+	digits: 'В этом поле Вы можете использовать только цифры и знаки пунктуации (например, телефонный номер со знаками дефиса или с точками).',
+	alpha: 'В этом поле можно использовать только латинские буквы (a-z). Пробелы и другие символы запрещены.',
+	alphanum: 'В этом поле можно использовать только латинские буквы (a-z) и цифры (0-9). Пробелы и другие символы запрещены.',
+	dateSuchAs: 'Пожалуйста, введите корректную дату {date}',
+	dateInFormatMDY: 'Пожалуйста, введите дату в формате ММ/ДД/ГГГГ (например "12/31/1999")',
+	email: 'Пожалуйста, введите корректный емейл-адрес. Для примера "fred@domain.com".',
+	url: 'Пожалуйста, введите правильную ссылку вида http://www.example.com.',
+	currencyDollar: 'Пожалуйста, введите сумму в долларах. Например: $100.00 .',
+	oneRequired: 'Пожалуйста, выберите хоть что-нибудь в одном из этих полей.',
+	errorPrefix: 'Ошибка: ',
+	warningPrefix: 'Внимание: '
+
+});
+
+
+
+/*
+---
+
+name: Locale.sk-SK.Date
+
+description: Date messages for Slovak.
+
+license: MIT-style license
+
+authors:
+  - Ivan Masár
+
+requires:
+  - Locale
+
+provides: [Locale.sk-SK.Date]
+
+...
+*/
+(function(){
+
+// Slovak language pluralization rules, see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
+// one -> n is 1;            1
+// few -> n in 2..4;         2-4
+// other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
+var pluralize = function (n, one, few, other){
+	if (n == 1) return one;
+	else if (n == 2 || n == 3 || n == 4) return few;
+	else return other;
+};
+
+Locale.define('sk-SK', 'Date', {
+
+	months: ['Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December'],
+	months_abbr: ['januára', 'februára', 'marca', 'apríla', 'mája', 'júna', 'júla', 'augusta', 'septembra', 'októbra', 'novembra', 'decembra'],
+	days: ['Nedele', 'Pondelí', 'Úterý', 'Streda', 'Čtvrtek', 'Pátek', 'Sobota'],
+	days_abbr: ['ne', 'po', 'ut', 'st', 'št', 'pi', 'so'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H:%M',
+	AM: 'dop.',
+	PM: 'pop.',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'pred chvíľou',
+	minuteAgo: 'približne pred minútou',
+	minutesAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'minútou', 'minútami', 'minútami'); },
+	hourAgo: 'približne pred hodinou',
+	hoursAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'hodinou', 'hodinami', 'hodinami'); },
+	dayAgo: 'pred dňom',
+	daysAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'dňom', 'dňami', 'dňami'); },
+	weekAgo: 'pred týždňom',
+	weeksAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'týždňom', 'týždňami', 'týždňami'); },
+	monthAgo: 'pred mesiacom',
+	monthsAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'mesiacom', 'mesiacmi', 'mesiacmi'); },
+	yearAgo: 'pred rokom',
+	yearsAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'rokom', 'rokmi', 'rokmi'); },
+
+	lessThanMinuteUntil: 'o chvíľu',
+	minuteUntil: 'približne o minútu',
+	minutesUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'minútu', 'minúty', 'minúty'); },
+	hourUntil: 'približne o hodinu',
+	hoursUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'hodinu', 'hodiny', 'hodín'); },
+	dayUntil: 'o deň',
+	daysUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'deň', 'dni', 'dní'); },
+	weekUntil: 'o týždeň',
+	weeksUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'týždeň', 'týždne', 'týždňov'); },
+	monthUntil: 'o mesiac',
+	monthsUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'mesiac', 'mesiace', 'mesiacov'); },
+	yearUntil: 'o rok',
+	yearsUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'rok', 'roky', 'rokov'); }
+});
+
+})();
+
+/*
+---
+
+name: Locale.sk-SK.Form.Validator
+
+description: Form Validator messages for Czech.
+
+license: MIT-style license
+
+authors:
+  - Ivan Masár
+
+requires:
+  - Locale
+
+provides: [Locale.sk-SK.Form.Validator]
+
+...
+*/
+
+Locale.define('sk-SK', 'FormValidator', {
+
+	required: 'Táto položka je povinná.',
+	minLength: 'Zadajte prosím aspoň {minLength} znakov (momentálne {length} znakov).',
+	maxLength: 'Zadajte prosím menej ako {maxLength} znakov (momentálne {length} znakov).',
+	integer: 'Zadajte prosím celé číslo. Desetinné čísla (napr. 1.25) nie sú povolené.',
+	numeric: 'Zadajte len číselné hodnoty (t.j. „1“ alebo „1.1“ alebo „-1“ alebo „-1.1“).',
+	digits: 'Zadajte prosím len čísla a interpunkčné znamienka (napríklad telefónne číslo s pomlčkami albo bodkami je povolené).',
+	alpha: 'Zadajte prosím len písmená (a-z). Medzery alebo iné znaky nie sú povolené.',
+	alphanum: 'Zadajte prosím len písmená (a-z) alebo číslice (0-9). Medzery alebo iné znaky nie sú povolené.',
+	dateSuchAs: 'Zadajte prosím platný dátum v tvare {date}',
+	dateInFormatMDY: 'Zadajte prosím platný datum v tvare MM / DD / RRRR (t.j. „12/31/1999“)',
+	email: 'Zadajte prosím platnú emailovú adresu. Napríklad „fred@domain.com“.',
+	url: 'Zadajte prosím platnoú adresu URL v tvare http://www.example.com.',
+	currencyDollar: 'Zadajte prosím platnú čiastku. Napríklad $100.00.',
+	oneRequired: 'Zadajte prosím aspoň jednu hodnotu z týchto položiek.',
+	errorPrefix: 'Chyba: ',
+	warningPrefix: 'Upozornenie: ',
+
+	// Form.Validator.Extras
+	noSpace: 'V tejto položle nie sú povolené medzery',
+	reqChkByNode: 'Nie sú vybrané žiadne položky.',
+	requiredChk: 'Táto položka je povinná.',
+	reqChkByName: 'Prosím vyberte {label}.',
+	match: 'Táto položka sa musí zhodovať s položkou {matchName}',
+	startDate: 'dátum začiatku',
+	endDate: 'dátum ukončenia',
+	currendDate: 'aktuálny dátum',
+	afterDate: 'Dátum by mal býť rovnaký alebo väčší ako {label}.',
+	beforeDate: 'Dátum by mal byť rovnaký alebo menší ako {label}.',
+	startMonth: 'Vyberte počiatočný mesiac.',
+	sameMonth: 'Tieto dva dátumy musia býť v rovnakom mesiaci - zmeňte jeden z nich.',
+	creditcard: 'Zadané číslo kreditnej karty je neplatné. Prosím, opravte ho. Bolo zadaných {length} číslic.'
+
+});
+
+/*
+---
+
+name: Locale.si-SI.Date
+
+description: Date messages for Slovenian.
+
+license: MIT-style license
+
+authors:
+  - Radovan Lozej
+
+requires:
+  - Locale
+
+provides: [Locale.si-SI.Date]
+
+...
+*/
+
+(function(){
+
+var pluralize = function(n, one, two, three, other){
+	return (n >= 1 && n <= 3) ? arguments[n] : other;
+};
+
+Locale.define('sl-SI', 'Date', {
+
+	months: ['januar', 'februar', 'marec', 'april', 'maj', 'junij', 'julij', 'avgust', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep', 'okt', 'nov', 'dec'],
+	days: ['nedelja', 'ponedeljek', 'torek', 'sreda', 'četrtek', 'petek', 'sobota'],
+	days_abbr: ['ned', 'pon', 'tor', 'sre', 'čet', 'pet', 'sob'],
+
+	// Culture's date order: DD.MM.YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d.%m.%Y',
+	shortTime: '%H.%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '.',
+
+	lessThanMinuteAgo: 'manj kot minuto nazaj',
+	minuteAgo: 'minuto nazaj',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'minuto', 'minuti', 'minute', 'minut') + ' nazaj'; },
+	hourAgo: 'uro nazaj',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'uro', 'uri', 'ure', 'ur') + ' nazaj'; },
+	dayAgo: 'dan nazaj',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'dan', 'dneva', 'dni', 'dni') + ' nazaj'; },
+	weekAgo: 'teden nazaj',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'teden', 'tedna', 'tedne', 'tednov') + ' nazaj'; },
+	monthAgo: 'mesec nazaj',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'mesec', 'meseca', 'mesece', 'mesecov') + ' nazaj'; },
+	yearthAgo: 'leto nazaj',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let') + ' nazaj'; },
+
+	lessThanMinuteUntil: 'še manj kot minuto',
+	minuteUntil: 'še minuta',
+	minutesUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'minuta', 'minuti', 'minute', 'minut'); },
+	hourUntil: 'še ura',
+	hoursUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'ura', 'uri', 'ure', 'ur'); },
+	dayUntil: 'še dan',
+	daysUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'dan', 'dneva', 'dnevi', 'dni'); },
+	weekUntil: 'še tedn',
+	weeksUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'teden', 'tedna', 'tedni', 'tednov'); },
+	monthUntil: 'še mesec',
+	monthsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'mesec', 'meseca', 'meseci', 'mesecov'); },
+	yearUntil: 'še leto',
+	yearsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let'); }
+
+});
+
+})();
+
+/*
+---
+
+name: Locale.si-SI.Form.Validator
+
+description: Form Validator messages for Slovenian.
+
+license: MIT-style license
+
+authors:
+  - Radovan Lozej
+
+requires:
+  - Locale
+
+provides: [Locale.si-SI.Form.Validator]
+
+...
+*/
+
+Locale.define('sl-SI', 'FormValidator', {
+
+	required: 'To polje je obvezno',
+	minLength: 'Prosim, vnesite vsaj {minLength} znakov (vnesli ste {length} znakov).',
+	maxLength: 'Prosim, ne vnesite več kot {maxLength} znakov (vnesli ste {length} znakov).',
+	integer: 'Prosim, vnesite celo število. Decimalna števila (kot 1,25) niso dovoljena.',
+	numeric: 'Prosim, vnesite samo numerične vrednosti (kot "1" ali "1.1" ali "-1" ali "-1.1").',
+	digits: 'Prosim, uporabite številke in ločila le na tem polju (na primer, dovoljena je telefonska številka z pomišlaji ali pikami).',
+	alpha: 'Prosim, uporabite le črke v tem plju. Presledki in drugi znaki niso dovoljeni.',
+	alphanum: 'Prosim, uporabite samo črke ali številke v tem polju. Presledki in drugi znaki niso dovoljeni.',
+	dateSuchAs: 'Prosim, vnesite pravilen datum kot {date}',
+	dateInFormatMDY: 'Prosim, vnesite pravilen datum kot MM.DD.YYYY (primer "12.31.1999")',
+	email: 'Prosim, vnesite pravilen email naslov. Na primer "fred@domain.com".',
+	url: 'Prosim, vnesite pravilen URL kot http://www.example.com.',
+	currencyDollar: 'Prosim, vnesit epravilno vrednost €. Primer 100,00€ .',
+	oneRequired: 'Prosimo, vnesite nekaj za vsaj eno izmed teh polj.',
+	errorPrefix: 'Napaka: ',
+	warningPrefix: 'Opozorilo: ',
+
+	// Form.Validator.Extras
+	noSpace: 'To vnosno polje ne dopušča presledkov.',
+	reqChkByNode: 'Nič niste izbrali.',
+	requiredChk: 'To polje je obvezno',
+	reqChkByName: 'Prosim, izberite {label}.',
+	match: 'To polje se mora ujemati z poljem {matchName}',
+	startDate: 'datum začetka',
+	endDate: 'datum konca',
+	currentDate: 'trenuten datum',
+	afterDate: 'Datum bi moral biti isti ali po {label}.',
+	beforeDate: 'Datum bi moral biti isti ali pred {label}.',
+	startMonth: 'Prosim, vnesite začetni datum',
+	sameMonth: 'Ta dva datuma morata biti v istem mesecu - premeniti morate eno ali drugo.',
+	creditcard: 'Številka kreditne kartice ni pravilna. Preverite številko ali poskusite še enkrat. Vnešenih {length} znakov.'
+
+});
+
+/*
+---
+
+name: Locale.sv-SE.Date
+
+description: Date messages for Swedish.
+
+license: MIT-style license
+
+authors:
+  - Martin Lundgren
+
+requires:
+  - Locale
+
+provides: [Locale.sv-SE.Date]
+
+...
+*/
+
+Locale.define('sv-SE', 'Date', {
+
+	months: ['januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december'],
+	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
+	days: ['söndag', 'måndag', 'tisdag', 'onsdag', 'torsdag', 'fredag', 'lördag'],
+	days_abbr: ['sön', 'mån', 'tis', 'ons', 'tor', 'fre', 'lör'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%H:%M',
+	AM: '',
+	PM: '',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'mindre än en minut sedan',
+	minuteAgo: 'ungefär en minut sedan',
+	minutesAgo: '{delta} minuter sedan',
+	hourAgo: 'ungefär en timme sedan',
+	hoursAgo: 'ungefär {delta} timmar sedan',
+	dayAgo: '1 dag sedan',
+	daysAgo: '{delta} dagar sedan',
+
+	lessThanMinuteUntil: 'mindre än en minut sedan',
+	minuteUntil: 'ungefär en minut sedan',
+	minutesUntil: '{delta} minuter sedan',
+	hourUntil: 'ungefär en timme sedan',
+	hoursUntil: 'ungefär {delta} timmar sedan',
+	dayUntil: '1 dag sedan',
+	daysUntil: '{delta} dagar sedan'
+
+});
+
+/*
+---
+
+name: Locale.sv-SE.Form.Validator
+
+description: Form Validator messages for Swedish.
+
+license: MIT-style license
+
+authors:
+  - Martin Lundgren
+
+requires:
+  - Locale
+
+provides: [Locale.sv-SE.Form.Validator]
+
+...
+*/
+
+Locale.define('sv-SE', 'FormValidator', {
+
+	required: 'Fältet är obligatoriskt.',
+	minLength: 'Ange minst {minLength} tecken (du angav {length} tecken).',
+	maxLength: 'Ange högst {maxLength} tecken (du angav {length} tecken). ',
+	integer: 'Ange ett heltal i fältet. Tal med decimaler (t.ex. 1,25) är inte tillåtna.',
+	numeric: 'Ange endast numeriska värden i detta fält (t.ex. "1" eller "1.1" eller "-1" eller "-1,1").',
+	digits: 'Använd endast siffror och skiljetecken i detta fält (till exempel ett telefonnummer med bindestreck tillåtet).',
+	alpha: 'Använd endast bokstäver (a-ö) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
+	alphanum: 'Använd endast bokstäver (a-ö) och siffror (0-9) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
+	dateSuchAs: 'Ange ett giltigt datum som t.ex. {date}',
+	dateInFormatMDY: 'Ange ett giltigt datum som t.ex. YYYY-MM-DD (i.e. "1999-12-31")',
+	email: 'Ange en giltig e-postadress. Till exempel "erik@domain.com".',
+	url: 'Ange en giltig webbadress som http://www.example.com.',
+	currencyDollar: 'Ange en giltig belopp. Exempelvis 100,00.',
+	oneRequired: 'Vänligen ange minst ett av dessa alternativ.',
+	errorPrefix: 'Fel: ',
+	warningPrefix: 'Varning: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Det får inte finnas några mellanslag i detta fält.',
+	reqChkByNode: 'Inga objekt är valda.',
+	requiredChk: 'Detta är ett obligatoriskt fält.',
+	reqChkByName: 'Välj en {label}.',
+	match: 'Detta fält måste matcha {matchName}',
+	startDate: 'startdatumet',
+	endDate: 'slutdatum',
+	currentDate: 'dagens datum',
+	afterDate: 'Datumet bör vara samma eller senare än {label}.',
+	beforeDate: 'Datumet bör vara samma eller tidigare än {label}.',
+	startMonth: 'Välj en start månad',
+	sameMonth: 'Dessa två datum måste vara i samma månad - du måste ändra det ena eller det andra.'
+
+});
+
+/*
+---
+
+name: Locale.sv-SE.Number
+
+description: Number messages for Swedish.
+
+license: MIT-style license
+
+authors:
+  - Arian Stolwijk
+  - Martin Lundgren
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.sv-SE.Number]
+
+...
+*/
+
+Locale.define('sv-SE', 'Number', {
+
+	currency: {
+		prefix: 'SEK '
+	}
+
+}).inherit('EU', 'Number');
+
+/*
+---
+
+name: Locale.tr-TR.Date
+
+description: Date messages for Turkish.
+
+license: MIT-style license
+
+authors:
+  - Faruk Can Bilir
+
+requires:
+  - Locale
+
+provides: [Locale.tr-TR.Date]
+
+...
+*/
+
+Locale.define('tr-TR', 'Date', {
+
+	months: ['Ocak', 'Şubat', 'Mart', 'Nisan', 'Mayıs', 'Haziran', 'Temmuz', 'Ağustos', 'Eylül', 'Ekim', 'Kasım', 'Aralık'],
+	months_abbr: ['Oca', 'Şub', 'Mar', 'Nis', 'May', 'Haz', 'Tem', 'Ağu', 'Eyl', 'Eki', 'Kas', 'Ara'],
+	days: ['Pazar', 'Pazartesi', 'Salı', 'Çarşamba', 'Perşembe', 'Cuma', 'Cumartesi'],
+	days_abbr: ['Pa', 'Pzt', 'Sa', 'Ça', 'Pe', 'Cu', 'Cmt'],
+
+	// Culture's date order: MM/DD/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H.%M',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'bir dakikadan önce',
+	minuteAgo: 'yaklaşık bir dakika önce',
+	minutesAgo: '{delta} dakika önce',
+	hourAgo: 'bir saat kadar önce',
+	hoursAgo: '{delta} saat kadar önce',
+	dayAgo: 'bir gün önce',
+	daysAgo: '{delta} gün önce',
+	weekAgo: 'bir hafta önce',
+	weeksAgo: '{delta} hafta önce',
+	monthAgo: 'bir ay önce',
+	monthsAgo: '{delta} ay önce',
+	yearAgo: 'bir yıl önce',
+	yearsAgo: '{delta} yıl önce',
+
+	lessThanMinuteUntil: 'bir dakikadan az sonra',
+	minuteUntil: 'bir dakika kadar sonra',
+	minutesUntil: '{delta} dakika sonra',
+	hourUntil: 'bir saat kadar sonra',
+	hoursUntil: '{delta} saat kadar sonra',
+	dayUntil: 'bir gün sonra',
+	daysUntil: '{delta} gün sonra',
+	weekUntil: 'bir hafta sonra',
+	weeksUntil: '{delta} hafta sonra',
+	monthUntil: 'bir ay sonra',
+	monthsUntil: '{delta} ay sonra',
+	yearUntil: 'bir yıl sonra',
+	yearsUntil: '{delta} yıl sonra'
+
+});
+
+/*
+---
+
+name: Locale.tr-TR.Form.Validator
+
+description: Form Validator messages for Turkish.
+
+license: MIT-style license
+
+authors:
+  - Faruk Can Bilir
+
+requires:
+  - Locale
+
+provides: [Locale.tr-TR.Form.Validator]
+
+...
+*/
+
+Locale.define('tr-TR', 'FormValidator', {
+
+	required: 'Bu alan zorunlu.',
+	minLength: 'Lütfen en az {minLength} karakter girin (siz {length} karakter girdiniz).',
+	maxLength: 'Lütfen en fazla {maxLength} karakter girin (siz {length} karakter girdiniz).',
+	integer: 'Lütfen bu alana sadece tamsayı girin. Ondalıklı sayılar (ör: 1.25) kullanılamaz.',
+	numeric: 'Lütfen bu alana sadece sayısal değer girin (ör: "1", "1.1", "-1" ya da "-1.1").',
+	digits: 'Lütfen bu alana sadece sayısal değer ve noktalama işareti girin (örneğin, nokta ve tire içeren bir telefon numarası kullanılabilir).',
+	alpha: 'Lütfen bu alanda yalnızca harf kullanın. Boşluk ve diğer karakterler kullanılamaz.',
+	alphanum: 'Lütfen bu alanda sadece harf ve rakam kullanın. Boşluk ve diğer karakterler kullanılamaz.',
+	dateSuchAs: 'Lütfen geçerli bir tarih girin (Ör: {date})',
+	dateInFormatMDY: 'Lütfen geçerli bir tarih girin (GG/AA/YYYY, ör: "31/12/1999")',
+	email: 'Lütfen geçerli bir email adresi girin. Ör: "kemal@etikan.com".',
+	url: 'Lütfen geçerli bir URL girin. Ör: http://www.example.com.',
+	currencyDollar: 'Lütfen geçerli bir TL miktarı girin. Ör: 100,00 TL .',
+	oneRequired: 'Lütfen en az bir tanesini doldurun.',
+	errorPrefix: 'Hata: ',
+	warningPrefix: 'Uyarı: ',
+
+	// Form.Validator.Extras
+	noSpace: 'Bu alanda boşluk kullanılamaz.',
+	reqChkByNode: 'Hiçbir öğe seçilmemiş.',
+	requiredChk: 'Bu alan zorunlu.',
+	reqChkByName: 'Lütfen bir {label} girin.',
+	match: 'Bu alan, {matchName} alanıyla uyuşmalı',
+	startDate: 'başlangıç tarihi',
+	endDate: 'bitiş tarihi',
+	currentDate: 'bugünün tarihi',
+	afterDate: 'Tarih, {label} tarihiyle aynı gün ya da ondan sonra olmalıdır.',
+	beforeDate: 'Tarih, {label} tarihiyle aynı gün ya da ondan önce olmalıdır.',
+	startMonth: 'Lütfen bir başlangıç ayı seçin',
+	sameMonth: 'Bu iki tarih aynı ayda olmalı - bir tanesini değiştirmeniz gerekiyor.',
+	creditcard: 'Girdiğiniz kredi kartı numarası geçersiz. Lütfen kontrol edip tekrar deneyin. {length} hane girildi.'
+
+});
+
+/*
+---
+
+name: Locale.tr-TR.Number
+
+description: Number messages for Turkish.
+
+license: MIT-style license
+
+authors:
+  - Faruk Can Bilir
+
+requires:
+  - Locale
+  - Locale.EU.Number
+
+provides: [Locale.tr-TR.Number]
+
+...
+*/
+
+Locale.define('tr-TR', 'Number', {
+
+	currency: {
+		decimals: 0,
+		suffix: ' TL'
+	}
+
+}).inherit('EU', 'Number');
+
+/*
+---
+
+name: Locale.uk-UA.Date
+
+description: Date messages for Ukrainian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Slik
+
+requires:
+  - Locale
+
+provides: [Locale.uk-UA.Date]
+
+...
+*/
+
+(function(){
+
+var pluralize = function(n, one, few, many, other){
+	var d = (n / 10).toInt(),
+		z = n % 10,
+		s = (n / 100).toInt();
+
+	if (d == 1 && n > 10) return many;
+	if (z == 1) return one;
+	if (z > 0 && z < 5) return few;
+	return many;
+};
+
+Locale.define('uk-UA', 'Date', {
+
+	months: ['Січень', 'Лютий', 'Березень', 'Квітень', 'Травень', 'Червень', 'Липень', 'Серпень', 'Вересень', 'Жовтень', 'Листопад', 'Грудень'],
+	months_abbr: ['Січ', 'Лют', 'Бер', 'Квіт', 'Трав', 'Черв', 'Лип', 'Серп', 'Вер', 'Жовт', 'Лист', 'Груд' ],
+	days: ['Неділя', 'Понеділок', 'Вівторок', 'Середа', 'Четвер', "П'ятниця", 'Субота'],
+	days_abbr: ['Нд', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
+
+	// Culture's date order: DD/MM/YYYY
+	dateOrder: ['date', 'month', 'year'],
+	shortDate: '%d/%m/%Y',
+	shortTime: '%H:%M',
+	AM: 'до полудня',
+	PM: 'по полудню',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: 'меньше хвилини тому',
+	minuteAgo: 'хвилину тому',
+	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин') + ' тому'; },
+	hourAgo: 'годину тому',
+	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'годину', 'години', 'годин') + ' тому'; },
+	dayAgo: 'вчора',
+	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'днів') + ' тому'; },
+	weekAgo: 'тиждень тому',
+	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів') + ' тому'; },
+	monthAgo: 'місяць тому',
+	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців') + ' тому'; },
+	yearAgo: 'рік тому',
+	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'рік', 'роки', 'років') + ' тому'; },
+
+	lessThanMinuteUntil: 'за мить',
+	minuteUntil: 'через хвилину',
+	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин'); },
+	hourUntil: 'через годину',
+	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'годину', 'години', 'годин'); },
+	dayUntil: 'завтра',
+	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'днів'); },
+	weekUntil: 'через тиждень',
+	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів'); },
+	monthUntil: 'через місяць',
+	monthesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців'); },
+	yearUntil: 'через рік',
+	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'рік', 'роки', 'років'); }
+
+});
+
+})();
+
+/*
+---
+
+name: Locale.uk-UA.Form.Validator
+
+description: Form Validator messages for Ukrainian (utf-8).
+
+license: MIT-style license
+
+authors:
+  - Slik
+
+requires:
+  - Locale
+
+provides: [Locale.uk-UA.Form.Validator]
+
+...
+*/
+
+Locale.define('uk-UA', 'FormValidator', {
+
+	required: 'Це поле повинне бути заповненим.',
+	minLength: 'Введіть хоча б {minLength} символів (Ви ввели {length}).',
+	maxLength: 'Кількість символів не може бути більше {maxLength} (Ви ввели {length}).',
+	integer: 'Введіть в це поле число. Дробові числа (наприклад 1.25) не дозволені.',
+	numeric: 'Введіть в це поле число (наприклад "1" або "1.1", або "-1", або "-1.1").',
+	digits: 'В цьому полі ви можете використовувати лише цифри і знаки пунктіації (наприклад, телефонний номер з знаками дефізу або з крапками).',
+	alpha: 'В цьому полі можна використовувати лише латинські літери (a-z). Пробіли і інші символи заборонені.',
+	alphanum: 'В цьому полі можна використовувати лише латинські літери (a-z) і цифри (0-9). Пробіли і інші символи заборонені.',
+	dateSuchAs: 'Введіть коректну дату {date}.',
+	dateInFormatMDY: 'Введіть дату в форматі ММ/ДД/РРРР (наприклад "12/31/2009").',
+	email: 'Введіть коректну адресу електронної пошти (наприклад "name@domain.com").',
+	url: 'Введіть коректне інтернет-посилання (наприклад http://www.example.com).',
+	currencyDollar: 'Введіть суму в доларах (наприклад "$100.00").',
+	oneRequired: 'Заповніть одне з полів.',
+	errorPrefix: 'Помилка: ',
+	warningPrefix: 'Увага: ',
+
+	noSpace: 'Пробіли заборонені.',
+	reqChkByNode: 'Не відмічено жодного варіанту.',
+	requiredChk: 'Це поле повинне бути віміченим.',
+	reqChkByName: 'Будь ласка, відмітьте {label}.',
+	match: 'Це поле повинно відповідати {matchName}',
+	startDate: 'початкова дата',
+	endDate: 'кінцева дата',
+	currentDate: 'сьогоднішня дата',
+	afterDate: 'Ця дата повинна бути такою ж, або пізнішою за {label}.',
+	beforeDate: 'Ця дата повинна бути такою ж, або ранішою за {label}.',
+	startMonth: 'Будь ласка, виберіть початковий місяць',
+	sameMonth: 'Ці дати повинні відноситись одного і того ж місяця. Будь ласка, змініть одну з них.',
+	creditcard: 'Номер кредитної карти введений неправильно. Будь ласка, перевірте його. Введено {length} символів.'
+
+});
+
+/*
+---
+
+name: Locale.zh-CH.Date
+
+description: Date messages for Chinese (simplified and traditional).
+
+license: MIT-style license
+
+authors:
+  - YMind Chan
+
+requires:
+  - Locale
+
+provides: [Locale.zh-CH.Date]
+
+...
+*/
+
+// Simplified Chinese
+Locale.define('zh-CHS', 'Date', {
+
+	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
+	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%I:%M%p',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '不到1分钟前',
+	minuteAgo: '大约1分钟前',
+	minutesAgo: '{delta}分钟之前',
+	hourAgo: '大约1小时前',
+	hoursAgo: '大约{delta}小时前',
+	dayAgo: '1天前',
+	daysAgo: '{delta}天前',
+	weekAgo: '1星期前',
+	weeksAgo: '{delta}星期前',
+	monthAgo: '1个月前',
+	monthsAgo: '{delta}个月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '从现在开始不到1分钟',
+	minuteUntil: '从现在开始約1分钟',
+	minutesUntil: '从现在开始约{delta}分钟',
+	hourUntil: '从现在开始1小时',
+	hoursUntil: '从现在开始约{delta}小时',
+	dayUntil: '从现在开始1天',
+	daysUntil: '从现在开始{delta}天',
+	weekUntil: '从现在开始1星期',
+	weeksUntil: '从现在开始{delta}星期',
+	monthUntil: '从现在开始一个月',
+	monthsUntil: '从现在开始{delta}个月',
+	yearUntil: '从现在开始1年',
+	yearsUntil: '从现在开始{delta}年'
+
+});
+
+// Traditional Chinese
+Locale.define('zh-CHT', 'Date', {
+
+	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
+	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
+	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
+
+	// Culture's date order: YYYY-MM-DD
+	dateOrder: ['year', 'month', 'date'],
+	shortDate: '%Y-%m-%d',
+	shortTime: '%I:%M%p',
+	AM: 'AM',
+	PM: 'PM',
+	firstDayOfWeek: 1,
+
+	// Date.Extras
+	ordinal: '',
+
+	lessThanMinuteAgo: '不到1分鐘前',
+	minuteAgo: '大約1分鐘前',
+	minutesAgo: '{delta}分鐘之前',
+	hourAgo: '大約1小時前',
+	hoursAgo: '大約{delta}小時前',
+	dayAgo: '1天前',
+	daysAgo: '{delta}天前',
+	weekAgo: '1星期前',
+	weeksAgo: '{delta}星期前',
+	monthAgo: '1个月前',
+	monthsAgo: '{delta}个月前',
+	yearAgo: '1年前',
+	yearsAgo: '{delta}年前',
+
+	lessThanMinuteUntil: '從現在開始不到1分鐘',
+	minuteUntil: '從現在開始約1分鐘',
+	minutesUntil: '從現在開始約{delta}分鐘',
+	hourUntil: '從現在開始1小時',
+	hoursUntil: '從現在開始約{delta}小時',
+	dayUntil: '從現在開始1天',
+	daysUntil: '從現在開始{delta}天',
+	weekUntil: '從現在開始1星期',
+	weeksUntil: '從現在開始{delta}星期',
+	monthUntil: '從現在開始一個月',
+	monthsUntil: '從現在開始{delta}個月',
+	yearUntil: '從現在開始1年',
+	yearsUntil: '從現在開始{delta}年'
+
+});
+
+/*
+---
+
+name: Locale.zh-CH.Form.Validator
+
+description: Form Validator messages for Chinese (simplified and traditional).
+
+license: MIT-style license
+
+authors:
+  - YMind Chan
+
+requires:
+  - Locale
+  - Form.Validator
+
+provides: [Form.zh-CH.Form.Validator, Form.Validator.CurrencyYuanValidator]
+
+...
+*/
+
+// Simplified Chinese
+Locale.define('zh-CHS', 'FormValidator', {
+
+	required: '此项必填。',
+	minLength: '请至少输入 {minLength} 个字符 (已输入 {length} 个)。',
+	maxLength: '最多只能输入 {maxLength} 个字符 (已输入 {length} 个)。',
+	integer: '请输入一个整数，不能包含小数点。例如："1", "200"。',
+	numeric: '请输入一个数字，例如："1", "1.1", "-1", "-1.1"。',
+	digits: '请输入由数字和标点符号组成的内容。例如电话号码。',
+	alpha: '请输入 A-Z 的 26 个字母，不能包含空格或任何其他字符。',
+	alphanum: '请输入 A-Z 的 26 个字母或 0-9 的 10 个数字，不能包含空格或任何其他字符。',
+	dateSuchAs: '请输入合法的日期格式，如：{date}。',
+	dateInFormatMDY: '请输入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。',
+	email: '请输入合法的电子信箱地址，例如："fred@domain.com"。',
+	url: '请输入合法的 Url 地址，例如：http://www.example.com。',
+	currencyDollar: '请输入合法的货币符号，例如：￥100.0',
+	oneRequired: '请至少选择一项。',
+	errorPrefix: '错误：',
+	warningPrefix: '警告：',
+
+	// Form.Validator.Extras
+	noSpace: '不能包含空格。',
+	reqChkByNode: '未选择任何内容。',
+	requiredChk: '此项必填。',
+	reqChkByName: '请选择 {label}.',
+	match: '必须与{matchName}相匹配',
+	startDate: '起始日期',
+	endDate: '结束日期',
+	currentDate: '当前日期',
+	afterDate: '日期必须等于或晚于 {label}.',
+	beforeDate: '日期必须早于或等于 {label}.',
+	startMonth: '请选择起始月份',
+	sameMonth: '您必须修改两个日期中的一个，以确保它们在同一月份。',
+	creditcard: '您输入的信用卡号码不正确。当前已输入{length}个字符。'
+
+});
+
+// Traditional Chinese
+Locale.define('zh-CHT', 'FormValidator', {
+
+	required: '此項必填。 ',
+	minLength: '請至少輸入{minLength} 個字符(已輸入{length} 個)。 ',
+	maxLength: '最多只能輸入{maxLength} 個字符(已輸入{length} 個)。 ',
+	integer: '請輸入一個整數，不能包含小數點。例如："1", "200"。 ',
+	numeric: '請輸入一個數字，例如："1", "1.1", "-1", "-1.1"。 ',
+	digits: '請輸入由數字和標點符號組成的內容。例如電話號碼。 ',
+	alpha: '請輸入AZ 的26 個字母，不能包含空格或任何其他字符。 ',
+	alphanum: '請輸入AZ 的26 個字母或0-9 的10 個數字，不能包含空格或任何其他字符。 ',
+	dateSuchAs: '請輸入合法的日期格式，如：{date}。 ',
+	dateInFormatMDY: '請輸入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。 ',
+	email: '請輸入合法的電子信箱地址，例如："fred@domain.com"。 ',
+	url: '請輸入合法的Url 地址，例如：http://www.example.com。 ',
+	currencyDollar: '請輸入合法的貨幣符號，例如：￥100.0',
+	oneRequired: '請至少選擇一項。 ',
+	errorPrefix: '錯誤：',
+	warningPrefix: '警告：',
+
+	// Form.Validator.Extras
+	noSpace: '不能包含空格。 ',
+	reqChkByNode: '未選擇任何內容。 ',
+	requiredChk: '此項必填。 ',
+	reqChkByName: '請選擇 {label}.',
+	match: '必須與{matchName}相匹配',
+	startDate: '起始日期',
+	endDate: '結束日期',
+	currentDate: '當前日期',
+	afterDate: '日期必須等於或晚於{label}.',
+	beforeDate: '日期必須早於或等於{label}.',
+	startMonth: '請選擇起始月份',
+	sameMonth: '您必須修改兩個日期中的一個，以確保它們在同一月份。 ',
+	creditcard: '您輸入的信用卡號碼不正確。當前已輸入{length}個字符。 '
+
+});
+
+Form.Validator.add('validate-currency-yuan', {
+
+	errorMsg: function(){
+		return Form.Validator.getMsg('currencyYuan');
+	},
+
+	test: function(element){
+		// [￥]1[##][,###]+[.##]
+		// [￥]1###+[.##]
+		// [￥]0.##
+		// [￥].##
+		return Form.Validator.getValidator('IsEmpty').test(element) || (/^￥?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value'));
+	}
+
+});
+
+/*
+---
+
+name: Locale.zh-CH.Number
+
+description: Number messages for for Chinese (simplified and traditional).
+
+license: MIT-style license
+
+authors:
+  - YMind Chan
+
+requires:
+  - Locale
+  - Locale.en-US.Number
+
+provides: [Locale.zh-CH.Number]
+
+...
+*/
+
+// Simplified Chinese
+Locale.define('zh-CHS', 'Number', {
+
+	currency: {
+		prefix: '￥ '
+	}
+
+}).inherit('en-US', 'Number');
+
+// Traditional Chinese
+Locale.define('zh-CHT').inherit('zh-CHS', 'Number');
 
 /*
 ---
@@ -7680,6 +12750,57 @@ Request.JSONP = new Class({
 Request.JSONP.counter = 0;
 Request.JSONP.request_map = {};
 
+/*
+---
+
+script: Request.Periodical.js
+
+name: Request.Periodical
+
+description: Requests the same URL to pull data from a server but increases the intervals if no data is returned to reduce the load
+
+license: MIT-style license
+
+authors:
+  - Christoph Pojer
+
+requires:
+  - Core/Request
+  - MooTools.More
+
+provides: [Request.Periodical]
+
+...
+*/
+
+Request.implement({
+
+	options: {
+		initialDelay: 5000,
+		delay: 5000,
+		limit: 60000
+	},
+
+	startTimer: function(data){
+		var fn = function(){
+			if (!this.running) this.send({data: data});
+		};
+		this.lastDelay = this.options.initialDelay;
+		this.timer = fn.delay(this.lastDelay, this);
+		this.completeCheck = function(response){
+			clearTimeout(this.timer);
+			this.lastDelay = (response) ? this.options.delay : (this.lastDelay + this.options.delay).min(this.options.limit);
+			this.timer = fn.delay(this.lastDelay, this);
+		};
+		return this.addEvent('complete', this.completeCheck);
+	},
+
+	stopTimer: function(){
+		clearTimeout(this.timer);
+		return this.removeEvent('complete', this.completeCheck);
+	}
+
+});
 
 /*
 ---
@@ -7698,7 +12819,7 @@ authors:
 requires:
   - Core/Element
   - Core/Request
-  - /Class.Binds
+  - Class.Binds
 
 provides: [Request.Queue]
 
@@ -7894,59 +13015,732 @@ Request.Queue = new Class({
 
 });
 
-
 /*
 ---
 
-script: Request.Periodical.js
+script: Array.Extras.js
 
-name: Request.Periodical
+name: Array.Extras
 
-description: Requests the same URL to pull data from a server but increases the intervals if no data is returned to reduce the load
+description: Extends the Array native object to include useful methods to work with arrays.
 
 license: MIT-style license
 
 authors:
   - Christoph Pojer
+  - Sebastian Markbåge
 
 requires:
-  - Core/Request
-  - /MooTools.More
+  - Core/Array
+  - MooTools.More
 
-provides: [Request.Periodical]
+provides: [Array.Extras]
 
 ...
 */
 
-Request.implement({
+(function(nil){
 
-	options: {
-		initialDelay: 5000,
-		delay: 5000,
-		limit: 60000
+Array.implement({
+
+	min: function(){
+		return Math.min.apply(null, this);
 	},
 
-	startTimer: function(data){
-		var fn = function(){
-			if (!this.running) this.send({data: data});
-		};
-		this.lastDelay = this.options.initialDelay;
-		this.timer = fn.delay(this.lastDelay, this);
-		this.completeCheck = function(response){
-			clearTimeout(this.timer);
-			this.lastDelay = (response) ? this.options.delay : (this.lastDelay + this.options.delay).min(this.options.limit);
-			this.timer = fn.delay(this.lastDelay, this);
-		};
-		return this.addEvent('complete', this.completeCheck);
+	max: function(){
+		return Math.max.apply(null, this);
 	},
 
-	stopTimer: function(){
-		clearTimeout(this.timer);
-		return this.removeEvent('complete', this.completeCheck);
+	average: function(){
+		return this.length ? this.sum() / this.length : 0;
+	},
+
+	sum: function(){
+		var result = 0, l = this.length;
+		if (l){
+			while (l--){
+				if (this[l] != null) result += parseFloat(this[l]);
+			}
+		}
+		return result;
+	},
+
+	unique: function(){
+		return [].combine(this);
+	},
+
+	shuffle: function(){
+		for (var i = this.length; i && --i;){
+			var temp = this[i], r = Math.floor(Math.random() * ( i + 1 ));
+			this[i] = this[r];
+			this[r] = temp;
+		}
+		return this;
+	},
+
+	reduce: function(fn, value){
+		for (var i = 0, l = this.length; i < l; i++){
+			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
+		}
+		return value;
+	},
+
+	reduceRight: function(fn, value){
+		var i = this.length;
+		while (i--){
+			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
+		}
+		return value;
+	},
+
+	pluck: function(prop){
+		return this.map(function(item){
+			return item[prop];
+		});
 	}
 
 });
 
+})();
+
+/*
+---
+
+script: Date.Extras.js
+
+name: Date.Extras
+
+description: Extends the Date native object to include extra methods (on top of those in Date.js).
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+  - Scott Kyle
+
+requires:
+  - Date
+
+provides: [Date.Extras]
+
+...
+*/
+
+Date.implement({
+
+	timeDiffInWords: function(to){
+		return Date.distanceOfTimeInWords(this, to || new Date);
+	},
+
+	timeDiff: function(to, separator){
+		if (to == null) to = new Date;
+		var delta = ((to - this) / 1000).floor().abs();
+
+		var vals = [],
+			durations = [60, 60, 24, 365, 0],
+			names = ['s', 'm', 'h', 'd', 'y'],
+			value, duration;
+
+		for (var item = 0; item < durations.length; item++){
+			if (item && !delta) break;
+			value = delta;
+			if ((duration = durations[item])){
+				value = (delta % duration);
+				delta = (delta / duration).floor();
+			}
+			vals.unshift(value + (names[item] || ''));
+		}
+
+		return vals.join(separator || ':');
+	}
+
+}).extend({
+
+	distanceOfTimeInWords: function(from, to){
+		return Date.getTimePhrase(((to - from) / 1000).toInt());
+	},
+
+	getTimePhrase: function(delta){
+		var suffix = (delta < 0) ? 'Until' : 'Ago';
+		if (delta < 0) delta *= -1;
+
+		var units = {
+			minute: 60,
+			hour: 60,
+			day: 24,
+			week: 7,
+			month: 52 / 12,
+			year: 12,
+			eon: Infinity
+		};
+
+		var msg = 'lessThanMinute';
+
+		for (var unit in units){
+			var interval = units[unit];
+			if (delta < 1.5 * interval){
+				if (delta > 0.75 * interval) msg = unit;
+				break;
+			}
+			delta /= interval;
+			msg = unit + 's';
+		}
+
+		delta = delta.round();
+		return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
+	}
+
+}).defineParsers(
+
+	{
+		// "today", "tomorrow", "yesterday"
+		re: /^(?:tod|tom|yes)/i,
+		handler: function(bits){
+			var d = new Date().clearTime();
+			switch (bits[0]){
+				case 'tom': return d.increment();
+				case 'yes': return d.decrement();
+				default: return d;
+			}
+		}
+	},
+
+	{
+		// "next Wednesday", "last Thursday"
+		re: /^(next|last) ([a-z]+)$/i,
+		handler: function(bits){
+			var d = new Date().clearTime();
+			var day = d.getDay();
+			var newDay = Date.parseDay(bits[2], true);
+			var addDays = newDay - day;
+			if (newDay <= day) addDays += 7;
+			if (bits[1] == 'last') addDays -= 7;
+			return d.set('date', d.getDate() + addDays);
+		}
+	}
+
+).alias('timeAgoInWords', 'timeDiffInWords');
+
+/*
+---
+
+name: Hash
+
+description: Contains Hash Prototypes. Provides a means for overcoming the JavaScript practical impossibility of extending native Objects.
+
+license: MIT-style license.
+
+requires:
+  - Core/Object
+  - MooTools.More
+
+provides: [Hash]
+
+...
+*/
+
+(function(){
+
+if (this.Hash) return;
+
+var Hash = this.Hash = new Type('Hash', function(object){
+	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
+	for (var key in object) this[key] = object[key];
+	return this;
+});
+
+this.$H = function(object){
+	return new Hash(object);
+};
+
+Hash.implement({
+
+	forEach: function(fn, bind){
+		Object.forEach(this, fn, bind);
+	},
+
+	getClean: function(){
+		var clean = {};
+		for (var key in this){
+			if (this.hasOwnProperty(key)) clean[key] = this[key];
+		}
+		return clean;
+	},
+
+	getLength: function(){
+		var length = 0;
+		for (var key in this){
+			if (this.hasOwnProperty(key)) length++;
+		}
+		return length;
+	}
+
+});
+
+Hash.alias('each', 'forEach');
+
+Hash.implement({
+
+	has: Object.prototype.hasOwnProperty,
+
+	keyOf: function(value){
+		return Object.keyOf(this, value);
+	},
+
+	hasValue: function(value){
+		return Object.contains(this, value);
+	},
+
+	extend: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.set(this, key, value);
+		}, this);
+		return this;
+	},
+
+	combine: function(properties){
+		Hash.each(properties || {}, function(value, key){
+			Hash.include(this, key, value);
+		}, this);
+		return this;
+	},
+
+	erase: function(key){
+		if (this.hasOwnProperty(key)) delete this[key];
+		return this;
+	},
+
+	get: function(key){
+		return (this.hasOwnProperty(key)) ? this[key] : null;
+	},
+
+	set: function(key, value){
+		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
+		return this;
+	},
+
+	empty: function(){
+		Hash.each(this, function(value, key){
+			delete this[key];
+		}, this);
+		return this;
+	},
+
+	include: function(key, value){
+		if (this[key] == undefined) this[key] = value;
+		return this;
+	},
+
+	map: function(fn, bind){
+		return new Hash(Object.map(this, fn, bind));
+	},
+
+	filter: function(fn, bind){
+		return new Hash(Object.filter(this, fn, bind));
+	},
+
+	every: function(fn, bind){
+		return Object.every(this, fn, bind);
+	},
+
+	some: function(fn, bind){
+		return Object.some(this, fn, bind);
+	},
+
+	getKeys: function(){
+		return Object.keys(this);
+	},
+
+	getValues: function(){
+		return Object.values(this);
+	},
+
+	toQueryString: function(base){
+		return Object.toQueryString(this, base);
+	}
+
+});
+
+Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
+
+
+})();
+
+
+/*
+---
+
+script: Hash.Extras.js
+
+name: Hash.Extras
+
+description: Extends the Hash Type to include getFromPath which allows a path notation to child elements.
+
+license: MIT-style license
+
+authors:
+  - Aaron Newton
+
+requires:
+  - Hash
+  - Object.Extras
+
+provides: [Hash.Extras]
+
+...
+*/
+
+Hash.implement({
+
+	getFromPath: function(notation){
+		return Object.getFromPath(this, notation);
+	},
+
+	cleanValues: function(method){
+		return new Hash(Object.cleanValues(this, method));
+	},
+
+	run: function(){
+		Object.run(arguments);
+	}
+
+});
+
+/*
+---
+name: Number.Format
+description: Extends the Number Type object to include a number formatting method.
+license: MIT-style license
+authors: [Arian Stolwijk]
+requires: [Core/Number, Locale.en-US.Number]
+# Number.Extras is for compatibility
+provides: [Number.Format, Number.Extras]
+...
+*/
+
+
+Number.implement({
+
+	format: function(options){
+		// Thanks dojo and YUI for some inspiration
+		var value = this;
+		options = options ? Object.clone(options) : {};
+		var getOption = function(key){
+			if (options[key] != null) return options[key];
+			return Locale.get('Number.' + key);
+		};
+
+		var negative = value < 0,
+			decimal = getOption('decimal'),
+			precision = getOption('precision'),
+			group = getOption('group'),
+			decimals = getOption('decimals');
+
+		if (negative){
+			var negativeLocale = getOption('negative') || {};
+			if (negativeLocale.prefix == null && negativeLocale.suffix == null) negativeLocale.prefix = '-';
+			['prefix', 'suffix'].each(function(key){
+				if (negativeLocale[key]) options[key] = getOption(key) + negativeLocale[key];
+			});
+
+			value = -value;
+		}
+
+		var prefix = getOption('prefix'),
+			suffix = getOption('suffix');
+
+		if (decimals !== '' && decimals >= 0 && decimals <= 20) value = value.toFixed(decimals);
+		if (precision >= 1 && precision <= 21) value = (+value).toPrecision(precision);
+
+		value += '';
+		var index;
+		if (getOption('scientific') === false && value.indexOf('e') > -1){
+			var match = value.split('e'),
+				zeros = +match[1];
+			value = match[0].replace('.', '');
+
+			if (zeros < 0){
+				zeros = -zeros - 1;
+				index = match[0].indexOf('.');
+				if (index > -1) zeros -= index - 1;
+				while (zeros--) value = '0' + value;
+				value = '0.' + value;
+			} else {
+				index = match[0].lastIndexOf('.');
+				if (index > -1) zeros -= match[0].length - index - 1;
+				while (zeros--) value += '0';
+			}
+		}
+
+		if (decimal != '.') value = value.replace('.', decimal);
+
+		if (group){
+			index = value.lastIndexOf(decimal);
+			index = (index > -1) ? index : value.length;
+			var newOutput = value.substring(index),
+				i = index;
+
+			while (i--){
+				if ((index - i - 1) % 3 == 0 && i != (index - 1)) newOutput = group + newOutput;
+				newOutput = value.charAt(i) + newOutput;
+			}
+
+			value = newOutput;
+		}
+
+		if (prefix) value = prefix + value;
+		if (suffix) value += suffix;
+
+		return value;
+	},
+
+	formatCurrency: function(decimals){
+		var locale = Locale.get('Number.currency') || {};
+		if (locale.scientific == null) locale.scientific = false;
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
+
+		return this.format(locale);
+	},
+
+	formatPercentage: function(decimals){
+		var locale = Locale.get('Number.percentage') || {};
+		if (locale.suffix == null) locale.suffix = '%';
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
+
+		return this.format(locale);
+	}
+
+});
+
+/*
+---
+
+script: URI.js
+
+name: URI
+
+description: Provides methods useful in managing the window location and uris.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+  - Aaron Newton
+
+requires:
+  - Core/Object
+  - Core/Class
+  - Core/Class.Extras
+  - Core/Element
+  - String.QueryString
+
+provides: [URI]
+
+...
+*/
+
+(function(){
+
+var toString = function(){
+	return this.get('value');
+};
+
+var URI = this.URI = new Class({
+
+	Implements: Options,
+
+	options: {
+		/*base: false*/
+	},
+
+	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+	parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
+	schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
+
+	initialize: function(uri, options){
+		this.setOptions(options);
+		var base = this.options.base || URI.base;
+		if (!uri) uri = base;
+
+		if (uri && uri.parsed) this.parsed = Object.clone(uri.parsed);
+		else this.set('value', uri.href || uri.toString(), base ? new URI(base) : false);
+	},
+
+	parse: function(value, base){
+		var bits = value.match(this.regex);
+		if (!bits) return false;
+		bits.shift();
+		return this.merge(bits.associate(this.parts), base);
+	},
+
+	merge: function(bits, base){
+		if ((!bits || !bits.scheme) && (!base || !base.scheme)) return false;
+		if (base){
+			this.parts.every(function(part){
+				if (bits[part]) return false;
+				bits[part] = base[part] || '';
+				return true;
+			});
+		}
+		bits.port = bits.port || this.schemes[bits.scheme.toLowerCase()];
+		bits.directory = bits.directory ? this.parseDirectory(bits.directory, base ? base.directory : '') : '/';
+		return bits;
+	},
+
+	parseDirectory: function(directory, baseDirectory){
+		directory = (directory.substr(0, 1) == '/' ? '' : (baseDirectory || '/')) + directory;
+		if (!directory.test(URI.regs.directoryDot)) return directory;
+		var result = [];
+		directory.replace(URI.regs.endSlash, '').split('/').each(function(dir){
+			if (dir == '..' && result.length > 0) result.pop();
+			else if (dir != '.') result.push(dir);
+		});
+		return result.join('/') + '/';
+	},
+
+	combine: function(bits){
+		return bits.value || bits.scheme + '://' +
+			(bits.user ? bits.user + (bits.password ? ':' + bits.password : '') + '@' : '') +
+			(bits.host || '') + (bits.port && bits.port != this.schemes[bits.scheme] ? ':' + bits.port : '') +
+			(bits.directory || '/') + (bits.file || '') +
+			(bits.query ? '?' + bits.query : '') +
+			(bits.fragment ? '#' + bits.fragment : '');
+	},
+
+	set: function(part, value, base){
+		if (part == 'value'){
+			var scheme = value.match(URI.regs.scheme);
+			if (scheme) scheme = scheme[1];
+			if (scheme && this.schemes[scheme.toLowerCase()] == null) this.parsed = { scheme: scheme, value: value };
+			else this.parsed = this.parse(value, (base || this).parsed) || (scheme ? { scheme: scheme, value: value } : { value: value });
+		} else if (part == 'data'){
+			this.setData(value);
+		} else {
+			this.parsed[part] = value;
+		}
+		return this;
+	},
+
+	get: function(part, base){
+		switch (part){
+			case 'value': return this.combine(this.parsed, base ? base.parsed : false);
+			case 'data' : return this.getData();
+		}
+		return this.parsed[part] || '';
+	},
+
+	go: function(){
+		document.location.href = this.toString();
+	},
+
+	toURI: function(){
+		return this;
+	},
+
+	getData: function(key, part){
+		var qs = this.get(part || 'query');
+		if (!(qs || qs === 0)) return key ? null : {};
+		var obj = qs.parseQueryString();
+		return key ? obj[key] : obj;
+	},
+
+	setData: function(values, merge, part){
+		if (typeof values == 'string'){
+			var data = this.getData();
+			data[arguments[0]] = arguments[1];
+			values = data;
+		} else if (merge){
+			values = Object.merge(this.getData(null, part), values);
+		}
+		return this.set(part || 'query', Object.toQueryString(values));
+	},
+
+	clearData: function(part){
+		return this.set(part || 'query', '');
+	},
+
+	toString: toString,
+	valueOf: toString
+
+});
+
+URI.regs = {
+	endSlash: /\/$/,
+	scheme: /^(\w+):/,
+	directoryDot: /\.\/|\.$/
+};
+
+URI.base = new URI(Array.from(document.getElements('base[href]', true)).getLast(), {base: document.location});
+
+String.implement({
+
+	toURI: function(options){
+		return new URI(this, options);
+	}
+
+});
+
+})();
+
+/*
+---
+
+script: URI.Relative.js
+
+name: URI.Relative
+
+description: Extends the URI class to add methods for computing relative and absolute urls.
+
+license: MIT-style license
+
+authors:
+  - Sebastian Markbåge
+
+
+requires:
+  - Class.refactor
+  - URI
+
+provides: [URI.Relative]
+
+...
+*/
+
+URI = Class.refactor(URI, {
+
+	combine: function(bits, base){
+		if (!base || bits.scheme != base.scheme || bits.host != base.host || bits.port != base.port)
+			return this.previous.apply(this, arguments);
+		var end = bits.file + (bits.query ? '?' + bits.query : '') + (bits.fragment ? '#' + bits.fragment : '');
+
+		if (!base.directory) return (bits.directory || (bits.file ? '' : './')) + end;
+
+		var baseDir = base.directory.split('/'),
+			relDir = bits.directory.split('/'),
+			path = '',
+			offset;
+
+		var i = 0;
+		for (offset = 0; offset < baseDir.length && offset < relDir.length && baseDir[offset] == relDir[offset]; offset++);
+		for (i = 0; i < baseDir.length - offset - 1; i++) path += '../';
+		for (i = offset; i < relDir.length - 1; i++) path += relDir[i] + '/';
+
+		return (path || (bits.file ? '' : './')) + end;
+	},
+
+	toAbsolute: function(base){
+		base = new URI(base);
+		if (base) base.set('directory', '').set('file', '');
+		return this.toRelative(base);
+	},
+
+	toRelative: function(base){
+		return this.get('value', new URI(base));
+	}
+
+});
 
 /*
 ---
@@ -7964,7 +13758,7 @@ authors:
 
 requires:
   - Core/Element.Event
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Assets]
 
@@ -7978,44 +13772,62 @@ var Asset = {
 
 		var script = new Element('script', {src: source, type: 'text/javascript'}),
 			doc = properties.document || document,
-			loaded = 0,
-			loadEvent = properties.onload || properties.onLoad;
-
-		var load = loadEvent ? function(){ // make sure we only call the event once
-			if (++loaded == 1) loadEvent.call(this);
-		} : function(){};
+			load = properties.onload || properties.onLoad;
 
 		delete properties.onload;
 		delete properties.onLoad;
 		delete properties.document;
 
-		return script.addEvents({
-			load: load,
-			readystatechange: function(){
-				if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
+		if (load){
+			if (!script.addEventListener){
+				script.addEvent('readystatechange', function(){
+					if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
+				});
+			} else {
+				script.addEvent('load', load);
 			}
-		}).set(properties).inject(doc.head);
+		}
+
+		return script.set(properties).inject(doc.head);
 	},
 
 	css: function(source, properties){
 		if (!properties) properties = {};
 
-		var link = new Element('link', {
-			rel: 'stylesheet',
-			media: 'screen',
-			type: 'text/css',
-			href: source
+		var load = properties.onload || properties.onLoad,
+			doc = properties.document || document,
+			timeout = properties.timeout || 3000;
+
+		['onload', 'onLoad', 'document'].each(function(prop){
+			delete properties[prop];
 		});
 
-		var load = properties.onload || properties.onLoad,
-			doc = properties.document || document;
+		var link = new Element('link', {
+			type: 'text/css',
+			rel: 'stylesheet',
+			media: 'screen',
+			href: source
+		}).setProperties(properties).inject(doc.head);
 
-		delete properties.onload;
-		delete properties.onLoad;
-		delete properties.document;
-
-		if (load) link.addEvent('load', load);
-		return link.set(properties).inject(doc.head);
+		if (load){
+			// based on article at http://www.yearofmoo.com/2011/03/cross-browser-stylesheet-preloading.html
+			var loaded = false, retries = 0;
+			var check = function(){
+				var stylesheets = document.styleSheets;
+				for (var i = 0; i < stylesheets.length; i++){
+					var file = stylesheets[i];
+					var owner = file.ownerNode ? file.ownerNode : file.owningElement;
+					if (owner && owner == link){
+						loaded = true;
+						return load.call(link);
+					}
+				}
+				retries++;
+				if (!loaded && retries < timeout / 50) return setTimeout(check, 50);
+			}
+			setTimeout(check, 0);
+		}
+		return link;
 	},
 
 	image: function(source, properties){
@@ -8080,7 +13892,6 @@ var Asset = {
 
 };
 
-
 /*
 ---
 
@@ -8244,7 +14055,6 @@ String.implement({
 })();
 
 
-
 /*
 ---
 
@@ -8261,7 +14071,7 @@ authors:
 
 requires:
   - Core/Events
-  - /MooTools.More
+  - MooTools.More
 
 provides: [Group]
 
@@ -8274,39 +14084,32 @@ this.Group = new Class({
 
 	initialize: function(){
 		this.instances = Array.flatten(arguments);
-		this.events = {};
-		this.checker = {};
 	},
 
 	addEvent: function(type, fn){
-		this.checker[type] = this.checker[type] || {};
-		this.events[type] = this.events[type] || [];
-		if (this.events[type].contains(fn)) return false;
-		else this.events[type].push(fn);
-		this.instances.each(function(instance, i){
-			instance.addEvent(type, this.check.pass([type, instance, i], this));
-		}, this);
-		return this;
-	},
+		var instances = this.instances,
+			len = instances.length,
+			togo = len,
+			args = new Array(len),
+			self = this;
 
-	check: function(type, instance, i){
-		this.checker[type][i] = true;
-		var every = this.instances.every(function(current, j){
-			return this.checker[type][j] || false;
-		}, this);
-		if (!every) return;
-		this.checker[type] = {};
-		this.events[type].each(function(event){
-			event.call(this, this.instances, instance);
-		}, this);
+		instances.each(function(instance, i){
+			instance.addEvent(type, function(){
+				if (!args[i]) togo--;
+				args[i] = arguments;
+				if (!togo){
+					fn.call(self, instances, instance, args);
+					togo = len;
+					args = new Array(len);
+				}
+			});
+		});
 	}
 
 });
 
 })();
 
-
-
 /*
 ---
 
@@ -8325,8 +14128,8 @@ authors:
 requires:
   - Core/Cookie
   - Core/JSON
-  - /MooTools.More
-  - /Hash
+  - MooTools.More
+  - Hash
 
 provides: [Hash.Cookie]
 
@@ -8369,6 +14172,119 @@ Hash.each(Hash.prototype, function(method, name){
 	});
 });
 
+/*
+---
+
+name: Swiff
+
+description: Wrapper for embedding SWF movies. Supports External Interface Communication.
+
+license: MIT-style license.
+
+credits:
+  - Flash detection & Internet Explorer + Flash Player 9 fix inspired by SWFObject.
+
+requires: [Core/Options, Core/Object, Core/Element]
+
+provides: Swiff
+
+...
+*/
+
+(function(){
+
+var Swiff = this.Swiff = new Class({
+
+	Implements: Options,
+
+	options: {
+		id: null,
+		height: 1,
+		width: 1,
+		container: null,
+		properties: {},
+		params: {
+			quality: 'high',
+			allowScriptAccess: 'always',
+			wMode: 'window',
+			swLiveConnect: true
+		},
+		callBacks: {},
+		vars: {}
+	},
+
+	toElement: function(){
+		return this.object;
+	},
+
+	initialize: function(path, options){
+		this.instance = 'Swiff_' + String.uniqueID();
+
+		this.setOptions(options);
+		options = this.options;
+		var id = this.id = options.id || this.instance;
+		var container = document.id(options.container);
+
+		Swiff.CallBacks[this.instance] = {};
+
+		var params = options.params, vars = options.vars, callBacks = options.callBacks;
+		var properties = Object.append({height: options.height, width: options.width}, options.properties);
+
+		var self = this;
+
+		for (var callBack in callBacks){
+			Swiff.CallBacks[this.instance][callBack] = (function(option){
+				return function(){
+					return option.apply(self.object, arguments);
+				};
+			})(callBacks[callBack]);
+			vars[callBack] = 'Swiff.CallBacks.' + this.instance + '.' + callBack;
+		}
+
+		params.flashVars = Object.toQueryString(vars);
+		if ('ActiveXObject' in window){
+			properties.classid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+			params.movie = path;
+		} else {
+			properties.type = 'application/x-shockwave-flash';
+		}
+		properties.data = path;
+
+		var build = '<object id="' + id + '"';
+		for (var property in properties) build += ' ' + property + '="' + properties[property] + '"';
+		build += '>';
+		for (var param in params){
+			if (params[param]) build += '<param name="' + param + '" value="' + params[param] + '" />';
+		}
+		build += '</object>';
+		this.object = ((container) ? container.empty() : new Element('div')).set('html', build).firstChild;
+	},
+
+	replaces: function(element){
+		element = document.id(element, true);
+		element.parentNode.replaceChild(this.toElement(), element);
+		return this;
+	},
+
+	inject: function(element){
+		document.id(element, true).appendChild(this.toElement());
+		return this;
+	},
+
+	remote: function(){
+		return Swiff.remote.apply(Swiff, [this.toElement()].append(arguments));
+	}
+
+});
+
+Swiff.CallBacks = {};
+
+Swiff.remote = function(obj, fn){
+	var rs = obj.CallFunction('<invoke name="' + fn + '" returntype="javascript">' + __flash__argumentsToXML(arguments, 2) + '</invoke>');
+	return eval(rs);
+};
+
+})();
 
 /*
 ---
@@ -8427,1616 +14343,3 @@ var Table = this.Table = function(){
 if (this.Type) new Type('Table', Table);
 
 })();
-
-
-/*
----
-
-script: HtmlTable.js
-
-name: HtmlTable
-
-description: Builds table elements with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - /Class.Occlude
-
-provides: [HtmlTable]
-
-...
-*/
-
-var HtmlTable = new Class({
-
-	Implements: [Options, Events, Class.Occlude],
-
-	options: {
-		properties: {
-			cellpadding: 0,
-			cellspacing: 0,
-			border: 0
-		},
-		rows: [],
-		headers: [],
-		footers: []
-	},
-
-	property: 'HtmlTable',
-
-	initialize: function(){
-		var params = Array.link(arguments, {options: Type.isObject, table: Type.isElement, id: Type.isString});
-		this.setOptions(params.options);
-		if (!params.table && params.id) params.table = document.id(params.id);
-		this.element = params.table || new Element('table', this.options.properties);
-		if (this.occlude()) return this.occluded;
-		this.build();
-	},
-
-	build: function(){
-		this.element.store('HtmlTable', this);
-
-		this.body = document.id(this.element.tBodies[0]) || new Element('tbody').inject(this.element);
-		$$(this.body.rows);
-
-		if (this.options.headers.length) this.setHeaders(this.options.headers);
-		else this.thead = document.id(this.element.tHead);
-
-		if (this.thead) this.head = this.getHead();
-		if (this.options.footers.length) this.setFooters(this.options.footers);
-
-		this.tfoot = document.id(this.element.tFoot);
-		if (this.tfoot) this.foot = document.id(this.tfoot.rows[0]);
-
-		this.options.rows.each(function(row){
-			this.push(row);
-		}, this);
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	empty: function(){
-		this.body.empty();
-		return this;
-	},
-
-	set: function(what, items){
-		var target = (what == 'headers') ? 'tHead' : 'tFoot',
-			lower = target.toLowerCase();
-
-		this[lower] = (document.id(this.element[target]) || new Element(lower).inject(this.element, 'top')).empty();
-		var data = this.push(items, {}, this[lower], what == 'headers' ? 'th' : 'td');
-
-		if (what == 'headers') this.head = this.getHead();
-		else this.foot = this.getHead();
-
-		return data;
-	},
-
-	getHead: function(){
-		var rows = this.thead.rows;
-		return rows.length > 1 ? $$(rows) : rows.length ? document.id(rows[0]) : false;
-	},
-
-	setHeaders: function(headers){
-		this.set('headers', headers);
-		return this;
-	},
-
-	setFooters: function(footers){
-		this.set('footers', footers);
-		return this;
-	},
-
-	push: function(row, rowProperties, target, tag, where){
-		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
-			row.inject(target || this.body, where);
-			return {
-				tr: row,
-				tds: row.getChildren('td')
-			};
-		}
-
-		var tds = row.map(function(data){
-			var td = new Element(tag || 'td', data ? data.properties : {}),
-				content = (data ? data.content : '') || data,
-				type = typeOf(content);
-
-			if (['element', 'array', 'collection', 'elements'].contains(type)) td.adopt(content);
-			else td.set('html', content);
-
-			return td;
-		});
-
-		return {
-			tr: new Element('tr', rowProperties).inject(target || this.body, where).adopt(tds),
-			tds: tds
-		};
-	}
-
-});
-
-
-['adopt', 'inject', 'wraps', 'grab', 'replaces', 'dispose'].each(function(method){
-	HtmlTable.implement(method, function(){
-		this.element[method].apply(this.element, arguments);
-		return this;
-	});
-});
-
-
-
-
-/*
----
-
-script: HtmlTable.Zebra.js
-
-name: HtmlTable.Zebra
-
-description: Builds a stripy table with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-
-requires:
-  - /HtmlTable
-  - /Class.refactor
-
-provides: [HtmlTable.Zebra]
-
-...
-*/
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {
-		classZebra: 'table-tr-odd',
-		zebra: true
-	},
-
-	initialize: function(){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-		if (this.options.zebra) this.updateZebras();
-	},
-
-	updateZebras: function(){
-		Array.each(this.body.rows, this.zebra, this);
-	},
-
-	setRowStyle: function(row, i){
-		if (this.previous) this.previous(row, i);
-		this.zebra(row, i);
-	},
-
-	zebra: function(row, i){
-		return row[((i % 2) ? 'remove' : 'add')+'Class'](this.options.classZebra);
-	},
-
-	push: function(){
-		var pushed = this.previous.apply(this, arguments);
-		if (this.options.zebra) this.updateZebras();
-		return pushed;
-	}
-
-});
-
-
-/*
----
-
-script: HtmlTable.Sort.js
-
-name: HtmlTable.Sort
-
-description: Builds a stripy, sortable table with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-  - Jacob Thornton
-
-requires:
-  - Core/Hash
-  - /HtmlTable
-  - /Class.refactor
-  - /Element.Delegation
-  - /String.Extras
-  - /Date
-
-provides: [HtmlTable.Sort]
-
-...
-*/
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {/*
-		onSort: function(){}, */
-		sortIndex: 0,
-		sortReverse: false,
-		parsers: [],
-		defaultParser: 'string',
-		classSortable: 'table-sortable',
-		classHeadSort: 'table-th-sort',
-		classHeadSortRev: 'table-th-sort-rev',
-		classNoSort: 'table-th-nosort',
-		classGroupHead: 'table-tr-group-head',
-		classGroup: 'table-tr-group',
-		classCellSort: 'table-td-sort',
-		classSortSpan: 'table-th-sort-span',
-		sortable: false,
-		thSelector: 'th'
-	},
-
-	initialize: function (){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-		this.sorted = {index: null, dir: 1};
-		this.bound = {
-			headClick: this.headClick.bind(this)
-		};
-		this.sortSpans = new Elements();
-		if (this.options.sortable){
-			this.enableSort();
-			if (this.options.sortIndex != null) this.sort(this.options.sortIndex, this.options.sortReverse);
-		}
-	},
-
-	attachSorts: function(attach){
-		this.detachSorts();
-		if (attach !== false) this.element.addEvent('click:relay(' + this.options.thSelector + ')', this.bound.headClick);
-	},
-
-	detachSorts: function(){
-		this.element.removeEvents('click:relay(' + this.options.thSelector + ')');
-	},
-
-	setHeaders: function(){
-		this.previous.apply(this, arguments);
-		if (this.sortEnabled) this.setParsers();
-	},
-
-	setParsers: function(){
-		this.parsers = this.detectParsers();
-	},
-
-	detectParsers: function(){
-		return this.head && this.head.getElements(this.options.thSelector).flatten().map(this.detectParser, this);
-	},
-
-	detectParser: function(cell, index){
-		if (cell.hasClass(this.options.classNoSort) || cell.retrieve('htmltable-parser')) return cell.retrieve('htmltable-parser');
-		var thDiv = new Element('div');
-		thDiv.adopt(cell.childNodes).inject(cell);
-		var sortSpan = new Element('span', {'class': this.options.classSortSpan}).inject(thDiv, 'top');
-		this.sortSpans.push(sortSpan);
-		var parser = this.options.parsers[index],
-			rows = this.body.rows,
-			cancel;
-		switch (typeOf(parser)){
-			case 'function': parser = {convert: parser}; cancel = true; break;
-			case 'string': parser = parser; cancel = true; break;
-		}
-		if (!cancel){
-			HtmlTable.ParserPriority.some(function(parserName){
-				var current = HtmlTable.Parsers[parserName],
-					match = current.match;
-				if (!match) return false;
-				for (var i = 0, j = rows.length; i < j; i++){
-					var cell = document.id(rows[i].cells[index]),
-						text = cell ? cell.get('html').clean() : '';
-					if (text && match.test(text)){
-						parser = current;
-						return true;
-					}
-				}
-			});
-		}
-		if (!parser) parser = this.options.defaultParser;
-		cell.store('htmltable-parser', parser);
-		return parser;
-	},
-
-	headClick: function(event, el){
-		if (!this.head || el.hasClass(this.options.classNoSort)) return;
-		return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(), el) % this.body.rows[0].cells.length);
-	},
-
-	serialize: function() {
-		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.sortable) {
-			previousSerialization.sortIndex = this.sorted.index;
-			previousSerialization.sortReverse = this.sorted.reverse;
-		}
-		return previousSerialization;
-	},
-
-	restore: function(tableState) {
-		if(this.options.sortable && tableState.sortIndex) {
-			this.sort(tableState.sortIndex, tableState.sortReverse);
-		}
-		this.previous.apply(this, arguments);
-	},
-
-	setSortedState: function(index, reverse){
-		if (reverse != null) this.sorted.reverse = reverse;
-		else if (this.sorted.index == index) this.sorted.reverse = !this.sorted.reverse;
-		else this.sorted.reverse = this.sorted.index == null;
-
-		if (index != null) this.sorted.index = index;
-	},
-
-	setHeadSort: function(sorted){
-		var head = $$(!this.head.length ? this.head.cells[this.sorted.index] : this.head.map(function(row){
-			return row.getElements(this.options.thSelector)[this.sorted.index];
-		}, this).clean());
-		if (!head.length) return;
-		if (sorted){
-			head.addClass(this.options.classHeadSort);
-			if (this.sorted.reverse) head.addClass(this.options.classHeadSortRev);
-			else head.removeClass(this.options.classHeadSortRev);
-		} else {
-			head.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);
-		}
-	},
-
-	setRowSort: function(data, pre){
-		var count = data.length,
-			body = this.body,
-			group,
-			rowIndex;
-
-		while (count){
-			var item = data[--count],
-				position = item.position,
-				row = body.rows[position];
-
-			if (row.disabled) continue;
-			if (!pre){
-				group = this.setGroupSort(group, row, item);
-				this.setRowStyle(row, count);
-			}
-			body.appendChild(row);
-
-			for (rowIndex = 0; rowIndex < count; rowIndex++){
-				if (data[rowIndex].position > position) data[rowIndex].position--;
-			}
-		}
-	},
-
-	setRowStyle: function(row, i){
-		this.previous(row, i);
-		row.cells[this.sorted.index].addClass(this.options.classCellSort);
-	},
-
-	setGroupSort: function(group, row, item){
-		if (group == item.value) row.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);
-		else row.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
-		return item.value;
-	},
-
-	getParser: function(){
-		var parser = this.parsers[this.sorted.index];
-		return typeOf(parser) == 'string' ? HtmlTable.Parsers[parser] : parser;
-	},
-
-	sort: function(index, reverse, pre){
-		if (!this.head) return;
-
-		if (!pre){
-			this.clearSort();
-			this.setSortedState(index, reverse);
-			this.setHeadSort(true);
-		}
-
-		var parser = this.getParser();
-		if (!parser) return;
-
-		var rel;
-		if (!Browser.ie){
-			rel = this.body.getParent();
-			this.body.dispose();
-		}
-
-		var data = this.parseData(parser).sort(function(a, b){
-			if (a.value === b.value) return 0;
-			return a.value > b.value ? 1 : -1;
-		});
-
-		if (this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked'])) data.reverse(true);
-		this.setRowSort(data, pre);
-
-		if (rel) rel.grab(this.body);
-		this.fireEvent('stateChanged');
-		return this.fireEvent('sort', [this.body, this.sorted.index]);
-	},
-
-	parseData: function(parser){
-		return Array.map(this.body.rows, function(row, i){
-			var value = parser.convert.call(document.id(row.cells[this.sorted.index]));
-			return {
-				position: i,
-				value: value
-			};
-		}, this);
-	},
-
-	clearSort: function(){
-		this.setHeadSort(false);
-		this.body.getElements('td').removeClass(this.options.classCellSort);
-	},
-
-	reSort: function(){
-		if (this.sortEnabled) this.sort.call(this, this.sorted.index, this.sorted.reverse);
-		return this;
-	},
-
-	enableSort: function(){
-		this.element.addClass(this.options.classSortable);
-		this.attachSorts(true);
-		this.setParsers();
-		this.sortEnabled = true;
-		return this;
-	},
-
-	disableSort: function(){
-		this.element.removeClass(this.options.classSortable);
-		this.attachSorts(false);
-		this.sortSpans.each(function(span){
-			span.destroy();
-		});
-		this.sortSpans.empty();
-		this.sortEnabled = false;
-		return this;
-	}
-
-});
-
-HtmlTable.ParserPriority = ['date', 'input-checked', 'input-value', 'float', 'number'];
-
-HtmlTable.Parsers = {
-
-	'date': {
-		match: /^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,
-		convert: function(){
-			var d = Date.parse(this.get('text').stripTags());
-			return (typeOf(d) == 'date') ? d.format('db') : '';
-		},
-		type: 'date'
-	},
-	'input-checked': {
-		match: / type="(radio|checkbox)" /,
-		convert: function(){
-			return this.getElement('input').checked;
-		}
-	},
-	'input-value': {
-		match: /<input/,
-		convert: function(){
-			return this.getElement('input').value;
-		}
-	},
-	'number': {
-		match: /^\d+[^\d.,]*$/,
-		convert: function(){
-			return this.get('text').stripTags().toInt();
-		},
-		number: true
-	},
-	'numberLax': {
-		match: /^[^\d]+\d+$/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^0-9]/, '').stripTags().toInt();
-		},
-		number: true
-	},
-	'float': {
-		match: /^[\d]+\.[\d]+/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^\d.]/, '').stripTags().toFloat();
-		},
-		number: true
-	},
-	'floatLax': {
-		match: /^[^\d]+[\d]+\.[\d]+$/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^\d.]/, '').stripTags();
-		},
-		number: true
-	},
-	'string': {
-		match: null,
-		convert: function(){
-			return this.get('text').stripTags().toLowerCase();
-		}
-	},
-	'title': {
-		match: null,
-		convert: function(){
-			return this.title;
-		}
-	}
-
-};
-
-
-
-HtmlTable.defineParsers = function(parsers){
-	HtmlTable.Parsers = Object.append(HtmlTable.Parsers, parsers);
-	for (var parser in parsers){
-		HtmlTable.ParserPriority.unshift(parser);
-	}
-};
-
-
-/*
----
-
-script: Keyboard.js
-
-name: Keyboard
-
-description: KeyboardEvents used to intercept events on a class for keyboard and format modifiers in a specific order so as to make alt+shift+c the same as shift+alt+c.
-
-license: MIT-style license
-
-authors:
-  - Perrin Westrich
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - Core/Events
-  - Core/Options
-  - Core/Element.Event
-  - Element.Event.Pseudos.Keys
-
-provides: [Keyboard]
-
-...
-*/
-
-(function(){
-
-	var Keyboard = this.Keyboard = new Class({
-
-		Extends: Events,
-
-		Implements: [Options],
-
-		options: {/*
-			onActivate: function(){},
-			onDeactivate: function(){},*/
-			defaultEventType: 'keydown',
-			active: false,
-			manager: null,
-			events: {},
-			nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
-		},
-
-		initialize: function(options){
-			if (options && options.manager){
-				this._manager = options.manager;
-				delete options.manager;
-			}
-			this.setOptions(options);
-			this._setup();
-		},
-
-		addEvent: function(type, fn, internal){
-			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
-		},
-
-		removeEvent: function(type, fn){
-			return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
-		},
-
-		toggleActive: function(){
-			return this[this.isActive() ? 'deactivate' : 'activate']();
-		},
-
-		activate: function(instance){
-			if (instance){
-				if (instance.isActive()) return this;
-				//if we're stealing focus, store the last keyboard to have it so the relinquish command works
-				if (this._activeKB && instance != this._activeKB){
-					this.previous = this._activeKB;
-					this.previous.fireEvent('deactivate');
-				}
-				//if we're enabling a child, assign it so that events are now passed to it
-				this._activeKB = instance.fireEvent('activate');
-				Keyboard.manager.fireEvent('changed');
-			} else if (this._manager){
-				//else we're enabling ourselves, we must ask our parent to do it for us
-				this._manager.activate(this);
-			}
-			return this;
-		},
-
-		isActive: function(){
-			return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
-		},
-
-		deactivate: function(instance){
-			if (instance){
-				if (instance === this._activeKB){
-					this._activeKB = null;
-					instance.fireEvent('deactivate');
-					Keyboard.manager.fireEvent('changed');
-				}
-			} else if (this._manager){
-				this._manager.deactivate(this);
-			}
-			return this;
-		},
-
-		relinquish: function(){
-			if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
-			else this.deactivate();
-			return this;
-		},
-
-		//management logic
-		manage: function(instance){
-			if (instance._manager) instance._manager.drop(instance);
-			this._instances.push(instance);
-			instance._manager = this;
-			if (!this._activeKB) this.activate(instance);
-			return this;
-		},
-
-		drop: function(instance){
-			instance.relinquish();
-			this._instances.erase(instance);
-			if (this._activeKB == instance){
-				if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
-				else this._activeKB = this._instances[0];
-			}
-			return this;
-		},
-
-		trace: function(){
-			Keyboard.trace(this);
-		},
-
-		each: function(fn){
-			Keyboard.each(this, fn);
-		},
-
-		/*
-			PRIVATE METHODS
-		*/
-
-		_instances: [],
-
-		_disable: function(instance){
-			if (this._activeKB == instance) this._activeKB = null;
-		},
-
-		_setup: function(){
-			this.addEvents(this.options.events);
-			//if this is the root manager, nothing manages it
-			if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
-			if (this.options.active) this.activate();
-			else this.relinquish();
-		},
-
-		_handle: function(event, type){
-			//Keyboard.stop(event) prevents key propagation
-			if (event.preventKeyboardPropagation) return;
-
-			var bubbles = !!this._manager;
-			if (bubbles && this._activeKB){
-				this._activeKB._handle(event, type);
-				if (event.preventKeyboardPropagation) return;
-			}
-			this.fireEvent(type, event);
-
-			if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
-		}
-
-	});
-
-	var parsed = {};
-	var modifiers = ['shift', 'control', 'alt', 'meta'];
-	var regex = /^(?:shift|control|ctrl|alt|meta)$/;
-
-	Keyboard.parse = function(type, eventType, ignore){
-		if (ignore && ignore.contains(type.toLowerCase())) return type;
-
-		type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
-			eventType = $1;
-			return '';
-		});
-
-		if (!parsed[type]){
-			var key, mods = {};
-			type.split('+').each(function(part){
-				if (regex.test(part)) mods[part] = true;
-				else key = part;
-			});
-
-			mods.control = mods.control || mods.ctrl; // allow both control and ctrl
-
-			var keys = [];
-			modifiers.each(function(mod){
-				if (mods[mod]) keys.push(mod);
-			});
-
-			if (key) keys.push(key);
-			parsed[type] = keys.join('+');
-		}
-
-		return eventType + ':keys(' + parsed[type] + ')';
-	};
-
-	Keyboard.each = function(keyboard, fn){
-		var current = keyboard || Keyboard.manager;
-		while (current){
-			fn.run(current);
-			current = current._activeKB;
-		}
-	};
-
-	Keyboard.stop = function(event){
-		event.preventKeyboardPropagation = true;
-	};
-
-	Keyboard.manager = new Keyboard({
-		active: true
-	});
-
-	Keyboard.trace = function(keyboard){
-		keyboard = keyboard || Keyboard.manager;
-		var hasConsole = window.console && console.log;
-		if (hasConsole) console.log('the following items have focus: ');
-		Keyboard.each(keyboard, function(current){
-			if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
-		});
-	};
-
-	var handler = function(event){
-		var keys = [];
-		modifiers.each(function(mod){
-			if (event[mod]) keys.push(mod);
-		});
-
-		if (!regex.test(event.key)) keys.push(event.key);
-		Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
-	};
-
-	document.addEvents({
-		'keyup': handler,
-		'keydown': handler
-	});
-
-})();
-
-
-/*
----
-
-script: Keyboard.Extras.js
-
-name: Keyboard.Extras
-
-description: Enhances Keyboard by adding the ability to name and describe keyboard shortcuts, and the ability to grab shortcuts by name and bind the shortcut to different keys.
-
-license: MIT-style license
-
-authors:
-  - Perrin Westrich
-
-requires:
-  - /Keyboard
-  - /MooTools.More
-
-provides: [Keyboard.Extras]
-
-...
-*/
-Keyboard.prototype.options.nonParsedEvents.combine(['rebound', 'onrebound']);
-
-Keyboard.implement({
-
-	/*
-		shortcut should be in the format of:
-		{
-			'keys': 'shift+s', // the default to add as an event.
-			'description': 'blah blah blah', // a brief description of the functionality.
-			'handler': function(){} // the event handler to run when keys are pressed.
-		}
-	*/
-	addShortcut: function(name, shortcut){
-		this._shortcuts = this._shortcuts || [];
-		this._shortcutIndex = this._shortcutIndex || {};
-
-		shortcut.getKeyboard = Function.from(this);
-		shortcut.name = name;
-		this._shortcutIndex[name] = shortcut;
-		this._shortcuts.push(shortcut);
-		if (shortcut.keys) this.addEvent(shortcut.keys, shortcut.handler);
-		return this;
-	},
-
-	addShortcuts: function(obj){
-		for (var name in obj) this.addShortcut(name, obj[name]);
-		return this;
-	},
-
-	removeShortcut: function(name){
-		var shortcut = this.getShortcut(name);
-		if (shortcut && shortcut.keys){
-			this.removeEvent(shortcut.keys, shortcut.handler);
-			delete this._shortcutIndex[name];
-			this._shortcuts.erase(shortcut);
-		}
-		return this;
-	},
-
-	removeShortcuts: function(names){
-		names.each(this.removeShortcut, this);
-		return this;
-	},
-
-	getShortcuts: function(){
-		return this._shortcuts || [];
-	},
-
-	getShortcut: function(name){
-		return (this._shortcutIndex || {})[name];
-	}
-
-});
-
-Keyboard.rebind = function(newKeys, shortcuts){
-	Array.from(shortcuts).each(function(shortcut){
-		shortcut.getKeyboard().removeEvent(shortcut.keys, shortcut.handler);
-		shortcut.getKeyboard().addEvent(newKeys, shortcut.handler);
-		shortcut.keys = newKeys;
-		shortcut.getKeyboard().fireEvent('rebound');
-	});
-};
-
-
-Keyboard.getActiveShortcuts = function(keyboard){
-	var activeKBS = [], activeSCS = [];
-	Keyboard.each(keyboard, [].push.bind(activeKBS));
-	activeKBS.each(function(kb){ activeSCS.extend(kb.getShortcuts()); });
-	return activeSCS;
-};
-
-Keyboard.getShortcut = function(name, keyboard, opts){
-	opts = opts || {};
-	var shortcuts = opts.many ? [] : null,
-		set = opts.many ? function(kb){
-				var shortcut = kb.getShortcut(name);
-				if (shortcut) shortcuts.push(shortcut);
-			} : function(kb){
-				if (!shortcuts) shortcuts = kb.getShortcut(name);
-			};
-	Keyboard.each(keyboard, set);
-	return shortcuts;
-};
-
-Keyboard.getShortcuts = function(name, keyboard){
-	return Keyboard.getShortcut(name, keyboard, { many: true });
-};
-
-
-/*
----
-
-script: HtmlTable.Select.js
-
-name: HtmlTable.Select
-
-description: Builds a stripy, sortable table with methods to add rows. Rows can be selected with the mouse or keyboard navigation.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-
-requires:
-  - /Keyboard
-  - /Keyboard.Extras
-  - /HtmlTable
-  - /Class.refactor
-  - /Element.Delegation
-  - /Element.Shortcuts
-
-provides: [HtmlTable.Select]
-
-...
-*/
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {
-		/*onRowFocus: function(){},
-		onRowUnfocus: function(){},*/
-		useKeyboard: true,
-		classRowSelected: 'table-tr-selected',
-		classRowHovered: 'table-tr-hovered',
-		classSelectable: 'table-selectable',
-		shiftForMultiSelect: true,
-		allowMultiSelect: true,
-		selectable: false
-	},
-
-	initialize: function(){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-
-		this.selectedRows = new Elements();
-
-		this.bound = {
-			mouseleave: this.mouseleave.bind(this),
-			clickRow: this.clickRow.bind(this),
-			activateKeyboard: function() {
-				if (this.keyboard && this.selectEnabled) this.keyboard.activate();
-			}.bind(this)
-		};
-
-		if (this.options.selectable) this.enableSelect();
-	},
-
-	empty: function(){
-		this.selectNone();
-		return this.previous();
-	},
-
-	enableSelect: function(){
-		this.selectEnabled = true;
-		this.attachSelects();
-		this.element.addClass(this.options.classSelectable);
-		return this;
-	},
-
-	disableSelect: function(){
-		this.selectEnabled = false;
-		this.attachSelects(false);
-		this.element.removeClass(this.options.classSelectable);
-		return this;
-	},
-
-	push: function(){
-		var ret = this.previous.apply(this, arguments);
-		this.updateSelects();
-		return ret;
-	},
-
-	isSelected: function(row){
-		return this.selectedRows.contains(row);
-	},
-
-	toggleRow: function(row){
-		return this[(this.isSelected(row) ? 'de' : '') + 'selectRow'](row);
-	},
-
-	selectRow: function(row, _nocheck){
-		//private variable _nocheck: boolean whether or not to confirm the row is in the table body
-		//added here for optimization when selecting ranges
-		if (this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
-		if (!this.options.allowMultiSelect) this.selectNone();
-
-		if (!this.isSelected(row)){
-			this.selectedRows.push(row);
-			row.addClass(this.options.classRowSelected);
-			this.fireEvent('rowFocus', [row, this.selectedRows]);
-			this.fireEvent('stateChanged');
-		}
-
-		this.focused = row;
-		document.clearSelection();
-
-		return this;
-	},
-
-	getSelected: function(){
-		return this.selectedRows;
-	},
-
-	serialize: function() {
-		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.selectable) {
-			previousSerialization.selectedRows = this.selectedRows.map(function(row) {
-				return Array.indexOf(this.body.rows, row);
-			}.bind(this));
-		}
-		return previousSerialization;
-	},
-
-	restore: function(tableState) {
-		if(this.options.selectable && tableState.selectedRows) {
-			tableState.selectedRows.each(function(index) {
-				this.selectRow(this.body.rows[index]);
-			}.bind(this));
-		}
-		this.previous.apply(this, arguments);
-	},
-
-	deselectRow: function(row, _nocheck){
-		if (!this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
-
-		this.selectedRows = new Elements(Array.from(this.selectedRows).erase(row));
-		row.removeClass(this.options.classRowSelected);
-		this.fireEvent('rowUnfocus', [row, this.selectedRows]);
-		this.fireEvent('stateChanged');
-		return this;
-	},
-
-	selectAll: function(selectNone){
-		if (!selectNone && !this.options.allowMultiSelect) return;
-		this.selectRange(0, this.body.rows.length, selectNone);
-		return this;
-	},
-
-	selectNone: function(){
-		return this.selectAll(true);
-	},
-
-	selectRange: function(startRow, endRow, _deselect){
-		if (!this.options.allowMultiSelect && !_deselect) return;
-		var method = _deselect ? 'deselectRow' : 'selectRow',
-			rows = Array.clone(this.body.rows);
-
-		if (typeOf(startRow) == 'element') startRow = rows.indexOf(startRow);
-		if (typeOf(endRow) == 'element') endRow = rows.indexOf(endRow);
-		endRow = endRow < rows.length - 1 ? endRow : rows.length - 1;
-
-		if (endRow < startRow){
-			var tmp = startRow;
-			startRow = endRow;
-			endRow = tmp;
-		}
-
-		for (var i = startRow; i <= endRow; i++) this[method](rows[i], true);
-
-		return this;
-	},
-
-	deselectRange: function(startRow, endRow){
-		this.selectRange(startRow, endRow, true);
-	},
-
-	getSelected: function(){
-		return this.selectedRows;
-	},
-
-/*
-	Private methods:
-*/
-
-	enterRow: function(row){
-		if (this.hovered) this.hovered = this.leaveRow(this.hovered);
-		this.hovered = row.addClass(this.options.classRowHovered);
-	},
-
-	leaveRow: function(row){
-		row.removeClass(this.options.classRowHovered);
-	},
-
-	updateSelects: function(){
-		Array.each(this.body.rows, function(row){
-			var binders = row.retrieve('binders');
-			if (!binders && !this.selectEnabled) return;
-			if (!binders){
-				binders = {
-					mouseenter: this.enterRow.pass([row], this),
-					mouseleave: this.leaveRow.pass([row], this)
-				};
-				row.store('binders', binders);
-			}
-			if (this.selectEnabled) row.addEvents(binders);
-			else row.removeEvents(binders);
-		}, this);
-	},
-
-	shiftFocus: function(offset, event){
-		if (!this.focused) return this.selectRow(this.body.rows[0], event);
-		var to = this.getRowByOffset(offset);
-		if (to === null || this.focused == this.body.rows[to]) return this;
-		this.toggleRow(this.body.rows[to], event);
-	},
-
-	clickRow: function(event, row){
-		var selecting = (event.shift || event.meta || event.control) && this.options.shiftForMultiSelect;
-		if (!selecting && !(event.rightClick && this.isSelected(row) && this.options.allowMultiSelect)) this.selectNone();
-
-		if (event.rightClick) this.selectRow(row);
-		else this.toggleRow(row);
-
-		if (event.shift){
-			this.selectRange(this.rangeStart || this.body.rows[0], row, this.rangeStart ? !this.isSelected(row) : true);
-			this.focused = row;
-		}
-		this.rangeStart = row;
-	},
-
-	getRowByOffset: function(offset){
-		if (!this.focused) return 0;
-		var rows = Array.clone(this.body.rows),
-			index = rows.indexOf(this.focused) + offset;
-
-		if (index < 0) index = null;
-		if (index >= rows.length) index = null;
-
-		return index;
-	},
-
-	attachSelects: function(attach){
-		attach = attach != null ? attach : true;
-
-		var method = attach ? 'addEvents' : 'removeEvents';
-		this.element[method]({
-			mouseleave: this.bound.mouseleave,
-			click: this.bound.activateKeyboard
-		});
-
-		this.body[method]({
-			'click:relay(tr)': this.bound.clickRow,
-			'contextmenu:relay(tr)': this.bound.clickRow
-		});
-
-		if (this.options.useKeyboard || this.keyboard){
-			if (!this.keyboard) this.keyboard = new Keyboard();
-			if (!this.selectKeysDefined) {
-				this.selectKeysDefined = true;
-				var timer, held;
-
-				var move = function(offset){
-					var mover = function(e){
-						clearTimeout(timer);
-						e.preventDefault();
-
-						var to = this.body.rows[this.getRowByOffset(offset)];
-						if (e.shift && to && this.isSelected(to)){
-							this.deselectRow(this.focused);
-							this.focused = to;
-						} else {
-							if (to && (!this.options.allowMultiSelect || !e.shift)){
-								this.selectNone();
-							}
-							this.shiftFocus(offset, e);
-						}
-
-						if (held){
-							timer = mover.delay(100, this, e);
-						} else {
-							timer = (function(){
-								held = true;
-								mover(e);
-							}).delay(400);
-						}
-					}.bind(this);
-					return mover;
-				}.bind(this);
-
-				var clear = function(){
-					clearTimeout(timer);
-					held = false;
-				};
-				
-				this.keyboard.addEvents({
-					'keydown:shift+up': move(-1),
-					'keydown:shift+down': move(1),
-					'keyup:shift+up': clear,
-					'keyup:shift+down': clear,
-					'keyup:up': clear,
-					'keyup:down': clear
-				});
-
-				var shiftHint = '';
-				if (this.options.allowMultiSelect && this.options.shiftForMultiSelect && this.options.useKeyboard){
-					shiftHint = " (Shift multi-selects).";
-				}
-
-				this.keyboard.addShortcuts({
-					'Select Previous Row': {
-						keys: 'up',
-						shortcut: 'up arrow',
-						handler: move(-1),
-						description: 'Select the previous row in the table.' + shiftHint
-					},
-					'Select Next Row': {
-						keys: 'down',
-						shortcut: 'down arrow',
-						handler: move(1),
-						description: 'Select the next row in the table.' + shiftHint
-					}
-				});
-
-			}
-			this.keyboard[attach ? 'activate' : 'deactivate']();
-		}
-		this.updateSelects();
-	},
-
-	mouseleave: function(){
-		if (this.hovered) this.leaveRow(this.hovered);
-	}
-
-});
-
-
-/*
----
-
-script: Scroller.js
-
-name: Scroller
-
-description: Class which scrolls the contents of any Element (including the window) when the mouse reaches the Element's boundaries.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Events
-  - Core/Options
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Scroller]
-
-...
-*/
-
-var Scroller = new Class({
-
-	Implements: [Events, Options],
-
-	options: {
-		area: 20,
-		velocity: 1,
-		onChange: function(x, y){
-			this.element.scrollTo(x, y);
-		},
-		fps: 50
-	},
-
-	initialize: function(element, options){
-		this.setOptions(options);
-		this.element = document.id(element);
-		this.docBody = document.id(this.element.getDocument().body);
-		this.listener = (typeOf(this.element) != 'element') ? this.docBody : this.element;
-		this.timer = null;
-		this.bound = {
-			attach: this.attach.bind(this),
-			detach: this.detach.bind(this),
-			getCoords: this.getCoords.bind(this)
-		};
-	},
-
-	start: function(){
-		this.listener.addEvents({
-			mouseover: this.bound.attach,
-			mouseleave: this.bound.detach
-		});
-		return this;
-	},
-
-	stop: function(){
-		this.listener.removeEvents({
-			mouseover: this.bound.attach,
-			mouseleave: this.bound.detach
-		});
-		this.detach();
-		this.timer = clearInterval(this.timer);
-		return this;
-	},
-
-	attach: function(){
-		this.listener.addEvent('mousemove', this.bound.getCoords);
-	},
-
-	detach: function(){
-		this.listener.removeEvent('mousemove', this.bound.getCoords);
-		this.timer = clearInterval(this.timer);
-	},
-
-	getCoords: function(event){
-		this.page = (this.listener.get('tag') == 'body') ? event.client : event.page;
-		if (!this.timer) this.timer = this.scroll.periodical(Math.round(1000 / this.options.fps), this);
-	},
-
-	scroll: function(){
-		var size = this.element.getSize(),
-			scroll = this.element.getScroll(),
-			pos = this.element != this.docBody ? this.element.getOffsets() : {x: 0, y:0},
-			scrollSize = this.element.getScrollSize(),
-			change = {x: 0, y: 0},
-			top = this.options.area.top || this.options.area,
-			bottom = this.options.area.bottom || this.options.area;
-		for (var z in this.page){
-			if (this.page[z] < (top + pos[z]) && scroll[z] != 0){
-				change[z] = (this.page[z] - top - pos[z]) * this.options.velocity;
-			} else if (this.page[z] + bottom > (size[z] + pos[z]) && scroll[z] + size[z] != scrollSize[z]){
-				change[z] = (this.page[z] - size[z] + bottom - pos[z]) * this.options.velocity;
-			}
-			change[z] = change[z].round();
-		}
-		if (change.y || change.x) this.fireEvent('change', [scroll.x + change.x, scroll.y + change.y]);
-	}
-
-});
-
-
-/*
----
-
-script: Tips.js
-
-name: Tips
-
-description: Class for creating nice tips that follow the mouse cursor when hovering an element.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Christoph Pojer
-  - Luis Merino
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - /MooTools.More
-
-provides: [Tips]
-
-...
-*/
-
-(function(){
-
-var read = function(option, element){
-	return (option) ? (typeOf(option) == 'function' ? option(element) : element.get(option)) : '';
-};
-
-this.Tips = new Class({
-
-	Implements: [Events, Options],
-
-	options: {/*
-		onAttach: function(element){},
-		onDetach: function(element){},
-		onBound: function(coords){},*/
-		onShow: function(){
-			this.tip.setStyle('display', 'block');
-		},
-		onHide: function(){
-			this.tip.setStyle('display', 'none');
-		},
-		title: 'title',
-		text: function(element){
-			return element.get('rel') || element.get('href');
-		},
-		showDelay: 100,
-		hideDelay: 100,
-		className: 'tip-wrap',
-		offset: {x: 16, y: 16},
-		windowPadding: {x:0, y:0},
-		fixed: false
-	},
-
-	initialize: function(){
-		var params = Array.link(arguments, {
-			options: Type.isObject,
-			elements: function(obj){
-				return obj != null;
-			}
-		});
-		this.setOptions(params.options);
-		if (params.elements) this.attach(params.elements);
-		this.container = new Element('div', {'class': 'tip'});
-	},
-
-	toElement: function(){
-		if (this.tip) return this.tip;
-
-		this.tip = new Element('div', {
-			'class': this.options.className,
-			styles: {
-				position: 'absolute',
-				top: 0,
-				left: 0
-			}
-		}).adopt(
-			new Element('div', {'class': 'tip-top'}),
-			this.container,
-			new Element('div', {'class': 'tip-bottom'})
-		);
-
-		return this.tip;
-	},
-
-	attach: function(elements){
-		$$(elements).each(function(element){
-			var title = read(this.options.title, element),
-				text = read(this.options.text, element);
-
-			element.set('title', '').store('tip:native', title).retrieve('tip:title', title);
-			element.retrieve('tip:text', text);
-			this.fireEvent('attach', [element]);
-
-			var events = ['enter', 'leave'];
-			if (!this.options.fixed) events.push('move');
-
-			events.each(function(value){
-				var event = element.retrieve('tip:' + value);
-				if (!event) event = function(event){
-					this['element' + value.capitalize()].apply(this, [event, element]);
-				}.bind(this);
-
-				element.store('tip:' + value, event).addEvent('mouse' + value, event);
-			}, this);
-		}, this);
-
-		return this;
-	},
-
-	detach: function(elements){
-		$$(elements).each(function(element){
-			['enter', 'leave', 'move'].each(function(value){
-				element.removeEvent('mouse' + value, element.retrieve('tip:' + value)).eliminate('tip:' + value);
-			});
-
-			this.fireEvent('detach', [element]);
-
-			if (this.options.title == 'title'){ // This is necessary to check if we can revert the title
-				var original = element.retrieve('tip:native');
-				if (original) element.set('title', original);
-			}
-		}, this);
-
-		return this;
-	},
-
-	elementEnter: function(event, element){
-		clearTimeout(this.timer);
-		this.timer = (function(){
-			this.container.empty();
-
-			['title', 'text'].each(function(value){
-				var content = element.retrieve('tip:' + value);
-				var div = this['_' + value + 'Element'] = new Element('div', {
-						'class': 'tip-' + value
-					}).inject(this.container);
-				if (content) this.fill(div, content);
-			}, this);
-			this.show(element);
-			this.position((this.options.fixed) ? {page: element.getPosition()} : event);
-		}).delay(this.options.showDelay, this);
-	},
-
-	elementLeave: function(event, element){
-		clearTimeout(this.timer);
-		this.timer = this.hide.delay(this.options.hideDelay, this, element);
-		this.fireForParent(event, element);
-	},
-
-	setTitle: function(title){
-		if (this._titleElement){
-			this._titleElement.empty();
-			this.fill(this._titleElement, title);
-		}
-		return this;
-	},
-
-	setText: function(text){
-		if (this._textElement){
-			this._textElement.empty();
-			this.fill(this._textElement, text);
-		}
-		return this;
-	},
-
-	fireForParent: function(event, element){
-		element = element.getParent();
-		if (!element || element == document.body) return;
-		if (element.retrieve('tip:enter')) element.fireEvent('mouseenter', event);
-		else this.fireForParent(event, element);
-	},
-
-	elementMove: function(event, element){
-		this.position(event);
-	},
-
-	position: function(event){
-		if (!this.tip) document.id(this);
-
-		var size = window.getSize(), scroll = window.getScroll(),
-			tip = {x: this.tip.offsetWidth, y: this.tip.offsetHeight},
-			props = {x: 'left', y: 'top'},
-			bounds = {y: false, x2: false, y2: false, x: false},
-			obj = {};
-
-		for (var z in props){
-			obj[props[z]] = event.page[z] + this.options.offset[z];
-			if (obj[props[z]] < 0) bounds[z] = true;
-			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]){
-				obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z];
-				bounds[z+'2'] = true;
-			}
-		}
-
-		this.fireEvent('bound', bounds);
-		this.tip.setStyles(obj);
-	},
-
-	fill: function(element, contents){
-		if (typeof contents == 'string') element.set('html', contents);
-		else element.adopt(contents);
-	},
-
-	show: function(element){
-		if (!this.tip) document.id(this);
-		if (!this.tip.getParent()) this.tip.inject(document.body);
-		this.fireEvent('show', [this.tip, element]);
-	},
-
-	hide: function(element){
-		if (!this.tip) document.id(this);
-		this.fireEvent('hide', [this.tip, element]);
-	}
-
-});
-
-})();
-
-
-/*
----
-
-name: Locale.en-GB.Date
-
-description: Date messages for British English.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - /Locale
-  - /Locale.en-US.Date
-
-provides: [Locale.en-GB.Date]
-
-...
-*/
-
-Locale.define('en-GB', 'Date', {
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M'
-
-}).inherit('en-US', 'Date');
-
diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake
index bb2bdecef..728093881 100644
--- a/zoneminder-config.cmake
+++ b/zoneminder-config.cmake
@@ -4,7 +4,10 @@
 /* This file is used by cmake to create config.h for ZM */
 
 /* General system checks */
+#cmakedefine BSD 1
+#cmakedefine SOLARIS 1
 #cmakedefine HAVE_LINUX_VIDEODEV_H 1
+#cmakedefine HAVE_LIBV4L1_VIDEODEV_H 1
 #cmakedefine HAVE_LINUX_VIDEODEV2_H 1
 #cmakedefine HAVE_EXECINFO_H 1
 #cmakedefine HAVE_UCONTEXT_H 1