diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f52716c2d..809393c3e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 **THIS FORUM IS FOR BUG REPORTS ONLY**
 
-Do not post feature or enhancement requests, general discussions or support questions here.
+Do not post feature or enhancement requests, general discussions, or support questions here.
 
 Feature and enhancement requests, general discussions, and support questions should occur in one of the following areas:
 
@@ -9,7 +9,9 @@ Feature and enhancement requests, general discussions, and support questions sho
 
 Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles
 
-In order to submit a bug report, please populate the fields below. This is required.
+In order to submit a bug report, please populate the fields below this line. This is required.
+
+----------------------------------------------------------------------------------------------------
 
 **Describe Your Environment**
 - Version of ZoneMinder [release version, development version, or commit]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..ce4347efe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Issues that do not follow the template will be closed
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe Your Environment**
+- Version of ZoneMinder [release version, development version, or commit]
+- How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
+- Full name and version of OS
+
+**If the issue concerns a camera**
+- Make and Model
+- frame rate
+- resolution
+- ZoneMinder Source Type:
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Debug Logs**
+```
+
+<insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
+
+```
diff --git a/.github/issue-close-app.yml b/.github/issue-close-app.yml
new file mode 100644
index 000000000..ebe4cdcfa
--- /dev/null
+++ b/.github/issue-close-app.yml
@@ -0,0 +1,16 @@
+# Comment that will be sent if an issue is judged to be closed
+comment: "This issue is closed because it does not meet our bug report issue template. Please read it."
+issueConfigs:
+# There can be several configs for different kind of issues.
+- content:
+# Example 1: bug report
+  - "Describe Your Environment"
+  - "Describe the bug"
+  - "Expected behavior"
+# Optional configuration:
+#
+# whether the keywords are case-insensitive
+# default value is false, which means keywords are case-sensitive
+caseInsensitive: true
+# The issue is judged to be legal if it includes all keywords from any of these two configs.
+# Or it will be closed by the app.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0d037099..9646ffc3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,9 +162,6 @@ set(ZM_WEB_GROUP "" CACHE STRING
     Leave empty to be the same as the web user")
 set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH 
     "Location where events are recorded to, default: ZM_CONTENTDIR/events")
-set(ZM_DIR_IMAGES "${ZM_CONTENTDIR}/images" CACHE PATH
-    "Location where images, not directly associated with events,
-     are recorded to, default: ZM_CONTENTDIR/images")
 set(ZM_DIR_SOUNDS "sounds" CACHE PATH
     "Location to look for optional sound files, default: sounds")
 set(ZM_PATH_ZMS "/cgi-bin/nph-zms" CACHE PATH
@@ -186,8 +183,6 @@ set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING
 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 
@@ -227,7 +222,6 @@ if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 	set(ZM_WEBDIR "/usr/share/zoneminder/www")
 	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
 	set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
-	set(ZM_DIR_IMAGES "/var/lib/zoneminder/images")
 	set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_RUNDIR "/var/run/zoneminder")
@@ -518,141 +512,137 @@ endif(MP4V2_LIBRARIES)
 
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
-# Do not check for ffmpeg if ZM_NO_FFMPEG is on
-if(NOT ZM_NO_FFMPEG)
-	# avformat (using find_library and find_path)
-	find_library(AVFORMAT_LIBRARIES avformat)
-	if(AVFORMAT_LIBRARIES)
-		set(HAVE_LIBAVFORMAT 1)
-		list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
-		find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
-		if(AVFORMAT_INCLUDE_DIR)
-			include_directories("${AVFORMAT_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
-		endif(AVFORMAT_INCLUDE_DIR)
-		mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
-		check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
-		set(optlibsfound "${optlibsfound} AVFormat")
-	else(AVFORMAT_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} AVFormat")
-	endif(AVFORMAT_LIBRARIES)
+# avformat (using find_library and find_path)
+find_library(AVFORMAT_LIBRARIES avformat)
+if(AVFORMAT_LIBRARIES)
+	set(HAVE_LIBAVFORMAT 1)
+	list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
+	find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
+	if(AVFORMAT_INCLUDE_DIR)
+		include_directories("${AVFORMAT_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
+	endif(AVFORMAT_INCLUDE_DIR)
+	mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
+	check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
+	set(optlibsfound "${optlibsfound} AVFormat")
+else(AVFORMAT_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} AVFormat")
+endif(AVFORMAT_LIBRARIES)
 
-	# avcodec (using find_library and find_path)
-	find_library(AVCODEC_LIBRARIES avcodec)
-	if(AVCODEC_LIBRARIES)
-		set(HAVE_LIBAVCODEC 1)
-		list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
-		find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
-		if(AVCODEC_INCLUDE_DIR)
-			include_directories("${AVCODEC_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
-		endif(AVCODEC_INCLUDE_DIR)
-		mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
-		check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
-		set(optlibsfound "${optlibsfound} AVCodec")
-	else(AVCODEC_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} AVCodec")
-	endif(AVCODEC_LIBRARIES)
+# avcodec (using find_library and find_path)
+find_library(AVCODEC_LIBRARIES avcodec)
+if(AVCODEC_LIBRARIES)
+	set(HAVE_LIBAVCODEC 1)
+	list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
+	find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
+	if(AVCODEC_INCLUDE_DIR)
+		include_directories("${AVCODEC_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
+	endif(AVCODEC_INCLUDE_DIR)
+	mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
+	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
+	set(optlibsfound "${optlibsfound} AVCodec")
+else(AVCODEC_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} AVCodec")
+endif(AVCODEC_LIBRARIES)
 
-	# avdevice (using find_library and find_path)
-	find_library(AVDEVICE_LIBRARIES avdevice)
-	if(AVDEVICE_LIBRARIES)
-		set(HAVE_LIBAVDEVICE 1)
-		list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
-		find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
-		if(AVDEVICE_INCLUDE_DIR)
-			include_directories("${AVDEVICE_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
-		endif(AVDEVICE_INCLUDE_DIR)
-		mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
-		check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
-		set(optlibsfound "${optlibsfound} AVDevice")
-	else(AVDEVICE_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} AVDevice")
-	endif(AVDEVICE_LIBRARIES)
+# avdevice (using find_library and find_path)
+find_library(AVDEVICE_LIBRARIES avdevice)
+if(AVDEVICE_LIBRARIES)
+	set(HAVE_LIBAVDEVICE 1)
+	list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
+	find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
+	if(AVDEVICE_INCLUDE_DIR)
+		include_directories("${AVDEVICE_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
+	endif(AVDEVICE_INCLUDE_DIR)
+	mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
+	check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
+	set(optlibsfound "${optlibsfound} AVDevice")
+else(AVDEVICE_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} AVDevice")
+endif(AVDEVICE_LIBRARIES)
 
-	# avutil (using find_library and find_path)
-	find_library(AVUTIL_LIBRARIES avutil)
-	if(AVUTIL_LIBRARIES)
-		set(HAVE_LIBAVUTIL 1)
-		list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
-		find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
-		if(AVUTIL_INCLUDE_DIR)
-			include_directories("${AVUTIL_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
-		endif(AVUTIL_INCLUDE_DIR)
-		mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
-		check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
-		check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
-		check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
-		set(optlibsfound "${optlibsfound} AVUtil")
-	else(AVUTIL_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} AVUtil")
-	endif(AVUTIL_LIBRARIES)
+# avutil (using find_library and find_path)
+find_library(AVUTIL_LIBRARIES avutil)
+if(AVUTIL_LIBRARIES)
+	set(HAVE_LIBAVUTIL 1)
+	list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
+	find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
+	if(AVUTIL_INCLUDE_DIR)
+		include_directories("${AVUTIL_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
+	endif(AVUTIL_INCLUDE_DIR)
+	mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
+	check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
+	check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
+	check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
+	set(optlibsfound "${optlibsfound} AVUtil")
+else(AVUTIL_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} AVUtil")
+endif(AVUTIL_LIBRARIES)
 
-	# swscale (using find_library and find_path)
-	find_library(SWSCALE_LIBRARIES swscale)
-	if(SWSCALE_LIBRARIES)
-		set(HAVE_LIBSWSCALE 1)
-		list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
-		find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
-		if(SWSCALE_INCLUDE_DIR)
-			include_directories("${SWSCALE_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
-		endif(SWSCALE_INCLUDE_DIR)
-		mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
-		check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
-		set(optlibsfound "${optlibsfound} SWScale")
-	else(SWSCALE_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} SWScale")
-	endif(SWSCALE_LIBRARIES)
+# swscale (using find_library and find_path)
+find_library(SWSCALE_LIBRARIES swscale)
+if(SWSCALE_LIBRARIES)
+	set(HAVE_LIBSWSCALE 1)
+	list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
+	find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
+	if(SWSCALE_INCLUDE_DIR)
+		include_directories("${SWSCALE_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
+	endif(SWSCALE_INCLUDE_DIR)
+	mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
+	check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
+	set(optlibsfound "${optlibsfound} SWScale")
+else(SWSCALE_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} SWScale")
+endif(SWSCALE_LIBRARIES)
 
-  # SWresample (using find_library and find_path)
-  find_library(SWRESAMPLE_LIBRARIES swresample)
-  if(SWRESAMPLE_LIBRARIES)
-    set(HAVE_LIBSWRESAMPLE 1)
-    list(APPEND ZM_BIN_LIBS "${SWRESAMPLE_LIBRARIES}")
-    find_path(SWRESAMPLE_INCLUDE_DIR "libswresample/swresample.h" /usr/include/ffmpeg)
-    if(SWRESAMPLE_INCLUDE_DIR)
-      include_directories("${SWRESAMPLE_INCLUDE_DIR}")
-      set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
-    endif(SWRESAMPLE_INCLUDE_DIR)
-    mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
-    check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
-    set(optlibsfound "${optlibsfound} SWResample")
-  else(SWRESAMPLE_LIBRARIES)
-    set(optlibsnotfound "${optlibsnotfound} SWResample")
+# SWresample (using find_library and find_path)
+find_library(SWRESAMPLE_LIBRARIES swresample)
+if(SWRESAMPLE_LIBRARIES)
+  set(HAVE_LIBSWRESAMPLE 1)
+  list(APPEND ZM_BIN_LIBS "${SWRESAMPLE_LIBRARIES}")
+  find_path(SWRESAMPLE_INCLUDE_DIR "libswresample/swresample.h" /usr/include/ffmpeg)
+  if(SWRESAMPLE_INCLUDE_DIR)
+    include_directories("${SWRESAMPLE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
+  endif(SWRESAMPLE_INCLUDE_DIR)
+  mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
+  check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
+  set(optlibsfound "${optlibsfound} SWResample")
+else(SWRESAMPLE_LIBRARIES)
+  set(optlibsnotfound "${optlibsnotfound} SWResample")
 
-    # AVresample (using find_library and find_path)
-    find_library(AVRESAMPLE_LIBRARIES avresample)
-    if(AVRESAMPLE_LIBRARIES)
-      set(HAVE_LIBAVRESAMPLE 1)
-      list(APPEND ZM_BIN_LIBS "${AVRESAMPLE_LIBRARIES}")
-      find_path(AVRESAMPLE_INCLUDE_DIR "libavresample/avresample.h" /usr/include/ffmpeg)
-      if(AVRESAMPLE_INCLUDE_DIR)
-        include_directories("${AVRESAMPLE_INCLUDE_DIR}")
-        set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
-      endif(AVRESAMPLE_INCLUDE_DIR)
-      mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
-      check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
-      set(optlibsfound "${optlibsfound} AVResample")
-    else(AVRESAMPLE_LIBRARIES)
-      set(optlibsnotfound "${optlibsnotfound} AVResample")
-    endif(AVRESAMPLE_LIBRARIES)
+  # AVresample (using find_library and find_path)
+  find_library(AVRESAMPLE_LIBRARIES avresample)
+  if(AVRESAMPLE_LIBRARIES)
+    set(HAVE_LIBAVRESAMPLE 1)
+    list(APPEND ZM_BIN_LIBS "${AVRESAMPLE_LIBRARIES}")
+    find_path(AVRESAMPLE_INCLUDE_DIR "libavresample/avresample.h" /usr/include/ffmpeg)
+    if(AVRESAMPLE_INCLUDE_DIR)
+      include_directories("${AVRESAMPLE_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
+    endif(AVRESAMPLE_INCLUDE_DIR)
+    mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
+    check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
+    set(optlibsfound "${optlibsfound} AVResample")
+  else(AVRESAMPLE_LIBRARIES)
+    set(optlibsnotfound "${optlibsnotfound} AVResample")
+  endif(AVRESAMPLE_LIBRARIES)
 
-  endif(SWRESAMPLE_LIBRARIES)
+endif(SWRESAMPLE_LIBRARIES)
 
-	# Find the path to the ffmpeg executable
-	find_program(FFMPEG_EXECUTABLE 
-		NAMES ffmpeg avconv
-		PATH_SUFFIXES ffmpeg)
-	if(FFMPEG_EXECUTABLE)
-		set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
-		set(OPT_FFMPEG "yes")
-		mark_as_advanced(FFMPEG_EXECUTABLE)
-	endif(FFMPEG_EXECUTABLE)
-
-endif(NOT ZM_NO_FFMPEG)
+# Find the path to the ffmpeg executable
+find_program(FFMPEG_EXECUTABLE 
+	NAMES ffmpeg avconv
+	PATH_SUFFIXES ffmpeg)
+if(FFMPEG_EXECUTABLE)
+	set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
+	set(OPT_FFMPEG "yes")
+	mark_as_advanced(FFMPEG_EXECUTABLE)
+endif(FFMPEG_EXECUTABLE)
 
 # Do not check for libvlc if ZM_NO_LIBVLC is on
 if(NOT ZM_NO_LIBVLC)
diff --git a/INSTALL b/INSTALL
index 666105c40..ecf7b909a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,7 +51,6 @@ Possible configuration options:
 	ZM_WEB_USER		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
 	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
         ZM_DIR_EVENTS           Location where events are recorded to, default: ZM_CONTENTDIR/events
-        ZM_DIR_IMAGES           Location where images, not directly associated with events, are recorded to, default: ZM_CONTENTDIR/images
         ZM_DIR_SOUNDS           Location to look for optional sound files, default: sounds
         ZM_PATH_ZMS             Web url to zms streaming server, default: /cgi-bin/nph-zms
 Advanced:
@@ -62,7 +61,6 @@ Advanced:
 	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
 	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
 	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_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: ""
@@ -130,8 +128,8 @@ cmake -C zm_conf.cmake [extra options] .
 
 2) Run "make" to compile ZoneMinder
 3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
-4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
-You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+4) Depending on your configuration: If DIR_EVENTS is set to default, You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "events" directory, you can use:
 ./zmlinkcontent.sh /var/lib/zoneminder
 By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
 
diff --git a/conf.d/01-system-paths.conf.in b/conf.d/01-system-paths.conf.in
index e97433ba2..e1aaf0bef 100644
--- a/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@@ -16,11 +16,6 @@
 # The web account user must have full read/write permission to this folder.
 ZM_DIR_EVENTS=@ZM_DIR_EVENTS@
 
-# Full path to the folder images, not directly associated with events,
-# are recorded to.
-# The web account user must have full read/write permission to this folder.
-ZM_DIR_IMAGES=@ZM_DIR_IMAGES@
-
 # Foldername under the webroot where ZoneMinder looks for optional sound files
 # to play when an alarm is detected.
 ZM_DIR_SOUNDS=@ZM_DIR_SOUNDS@
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 26d31dd2f..4e6a6646c 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `Controls`;
 CREATE TABLE `Controls` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','Ffmpeg','Libvlc','cURL','WebSite') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
   `Protocol` varchar(64) default NULL,
   `CanWake` tinyint(3) unsigned NOT NULL default '0',
   `CanSleep` tinyint(3) unsigned NOT NULL default '0',
@@ -397,7 +397,7 @@ DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','NVSocket') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
   `Device` tinytext,
   `Channel` tinyint(3) unsigned default NULL,
   `Format` int(10) unsigned default NULL,
@@ -430,7 +430,7 @@ CREATE TABLE `Monitors` (
   `Name` varchar(64) NOT NULL default '',
   `ServerId` int(10) unsigned,
   `StorageId`	smallint(5) unsigned default 0,
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `LinkedMonitors` varchar(255),
@@ -787,6 +787,7 @@ INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,
 INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Dahua','Remote','Dahua',0,0,0,1,0,0,1,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
 
 --
 -- Add some monitor preset values
diff --git a/db/zm_update-1.33.1.sql b/db/zm_update-1.33.1.sql
new file mode 100644
index 000000000..ddac8adae
--- /dev/null
+++ b/db/zm_update-1.33.1.sql
@@ -0,0 +1,16 @@
+--
+-- This updates a 1.33.0 database to 1.33.1
+--
+-- Add WebSite enum to Monitor.Type
+-- Add Refresh column to Monitors table
+--
+
+ALTER TABLE `Monitors` 
+CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
+
+ALTER TABLE `MonitorPresets` 
+CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
+
+ALTER TABLE `Controls` 
+CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
+
diff --git a/distros/debian/rules b/distros/debian/rules
index fe725c2d0..6185838e0 100755
--- a/distros/debian/rules
+++ b/distros/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_configure:
                 -DZM_CONFIG_SUBDIR="/etc/zm/conf.d" \
 		-DZM_CONFIG_DIR="/etc/zm" \
                 -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-                -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
                 -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               
 
 override_dh_auto_install:
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 06b0e8cbf..f1a1bc75b 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -21,7 +21,7 @@ endif(ZM_TARGET_DISTRO MATCHES "^el")
 # Configure the common zoneminder files
 configure_file(common/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 configure_file(common/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events images temp)
+file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events temp)
 
 # Configure the Apache zoneminder files
 configure_file(httpd/zm-httpd.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zm-httpd.conf @ONLY)
@@ -52,7 +52,7 @@ install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WR
 install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/cache DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(DIRECTORY events images temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(DIRECTORY events temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 # Install the Apache zoneminder files
 install(FILES zm-httpd.conf DESTINATION /usr/lib/systemd/system/zoneminder.service.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/distros/redhat/httpd/zoneminder.httpd.tmpfiles.in b/distros/redhat/httpd/zoneminder.httpd.tmpfiles.in
index f24babdc6..b403fb24d 100644
--- a/distros/redhat/httpd/zoneminder.httpd.tmpfiles.in
+++ b/distros/redhat/httpd/zoneminder.httpd.tmpfiles.in
@@ -2,5 +2,4 @@ D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_CACHEDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 d @ZM_DIR_EVENTS@ 0755 @WEB_USER@ @WEB_GROUP@
-D @ZM_DIR_IMAGES@ 0755 @WEB_USER@ @WEB_GROUP@
 
diff --git a/distros/redhat/nginx/zoneminder.nginx.tmpfiles.in b/distros/redhat/nginx/zoneminder.nginx.tmpfiles.in
index 1c581fcb9..502b817d8 100644
--- a/distros/redhat/nginx/zoneminder.nginx.tmpfiles.in
+++ b/distros/redhat/nginx/zoneminder.nginx.tmpfiles.in
@@ -2,5 +2,4 @@ D @ZM_TMPDIR@ 0755 nginx nginx
 D @ZM_SOCKDIR@ 0755 nginx nginx
 D @ZM_CACHEDIR@ 0755 nginx nginx
 d @ZM_DIR_EVENTS@ 0755 nginx nginx
-D @ZM_DIR_IMAGES@ 0755 nginx nginx
 
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index cbda079ca..8f30d6fee 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -377,7 +377,6 @@ EOF
 %{_tmpfilesdir}/zoneminder.httpd.tmpfiles.conf
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/images
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/sock
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/swap
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
@@ -402,7 +401,6 @@ EOF
 %{_tmpfilesdir}/zoneminder.nginx.tmpfiles.conf
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/events
-%dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/images
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/sock
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/swap
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
diff --git a/distros/ubuntu1204/rules b/distros/ubuntu1204/rules
index f971e9cc3..20dd303f8 100755
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@@ -27,7 +27,6 @@ override_dh_auto_configure:
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"         \
             -DZM_CACHEDIR="/var/cache/zoneminder/cache"       \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-            -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
             -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               
 
 override_dh_clean:
diff --git a/distros/ubuntu1504_cmake_split_packages/rules b/distros/ubuntu1504_cmake_split_packages/rules
index 0eca4b511..f6169c495 100755
--- a/distros/ubuntu1504_cmake_split_packages/rules
+++ b/distros/ubuntu1504_cmake_split_packages/rules
@@ -64,7 +64,6 @@ override_dh_auto_configure:
                 -DZM_CONFIG_SUBDIR="/etc/zm/conf.d" \
 		-DZM_CONFIG_DIR="/etc/zm" \
                 -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-                -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
                 -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               
 
 override_dh_auto_test:
diff --git a/distros/ubuntu1604/rules b/distros/ubuntu1604/rules
index f0808a8e1..98b9ac0a2 100755
--- a/distros/ubuntu1604/rules
+++ b/distros/ubuntu1604/rules
@@ -27,7 +27,6 @@ override_dh_auto_configure:
             -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
             -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
             -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-            -DZM_DIR_IMAGES="/var/cache/zoneminder/images"    \
             -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"
 
 override_dh_clean:
diff --git a/docs/installationguide/dedicateddrive.rst b/docs/installationguide/dedicateddrive.rst
index f0dfadc28..6a7367b8b 100644
--- a/docs/installationguide/dedicateddrive.rst
+++ b/docs/installationguide/dedicateddrive.rst
@@ -31,7 +31,6 @@ Add the following content to the file and save your changes:
 ::
 
     ZM_DIR_EVENTS=/full/path/to/the/events/folder
-    ZM_DIR_IMAGES=/full/path/to/the/images/folder
 
 **Step 5:** Start ZoneMinder and inspect the ZoneMinder log files for errors.
 ::
diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 12d9ed769..71b4f5278 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -197,7 +197,7 @@ If you have previsouly cloned the ZoneMinder git repo and wish to update it to t
 
 ::
 
-    cd ~\ZoneMinder
+    cd ~/ZoneMinder
     git pull origin master
     
 Get the crud submodule tarball:
@@ -210,14 +210,14 @@ At this point, you can make changes to the source code. Depending on what you wa
 
 ::
 
-    cd ~\ZoneMinder
+    cd ~/ZoneMinder
     git checkout -b mynewbranch
 
 Again, depending on what you want to do with those changes, you may want to commit your changes:
 
 ::
 
-    cd ~\ZoneMinder
+    cd ~/ZoneMinder
     git add .
     git commit
 
@@ -231,7 +231,7 @@ Scroll down until you see the Version field. Note the value, which will be in th
 
 ::
 
-    cd ~\ZoneMinder
+    cd ~/ZoneMinder
     git archive --prefix=ZoneMinder-1.31.1/ -o ~/rpmbuild/SOURCES/zoneminder-1.31.1.tar.gz HEAD
 
 Replace "1.31.1" with the Version shown in the rpm specfile.
@@ -240,7 +240,7 @@ From the root of the local ZoneMinder git repo, execute the following:
 
 ::
 
-    cd ~\ZoneMinder
+    cd ~/ZoneMinder
     rpmbuild -bs --nodeps distros/redhat/zoneminder.spec
 
 This step will create a source rpm and it will tell you where it was saved. For example:
diff --git a/docs/userguide/definezone.rst b/docs/userguide/definezone.rst
index cf33f44c9..97f42f864 100644
--- a/docs/userguide/definezone.rst
+++ b/docs/userguide/definezone.rst
@@ -29,7 +29,7 @@ Type
     Triggers an alarm when motion is detected within it, as long as no alarms have already been triggered in an Active zone.  This is the most specialized of the zone types. For instance in the camera covering my garden I keep watch for a hedgehog that visits most nights and scoffs the food out of my cats bowls. By creating a sensitive Exclusive zone in that area I can ensure that a hedgehog alarm will only trigger if there is activity in that small area. If something much bigger occurs, like someone walking by it will trigger a regular alarm and not one from the Exclusive zone. Thus I can ensure I get alarms for big events and also special small events but not the noise in between.
 
   * Preclusive 
-    This zone type is relatively recent. It is called a Preclusive zone because if it is triggered it actually precludes an alarm being generated for that image frame. So motion or other changes that occur in a Preclusive zone will have the effect of ensuring that no alarm occurs at all. The application for this zone type is primarily as a shortcut for detecting general large-scale lighting or other changes. Generally this may be achieved by limiting the maximum number of alarm pixels or other measure in an Active zone. However in some cases that zone may cover an area where the area of variable illumination occurs in different places as the sun and/or shadows move and it thus may be difficult to come up with general values. Additionally, if the sun comes out rapidly then although the initial change may be ignored in this way as the reference image catches up an alarm may ultimately be triggered as the image becomes less different. Using one or more Preclusive zones offers a different approach. Preclusive zones are designed to be fairly small, even just a few pixels across, with quite low alarm thresholds. They should be situated in areas of the image that are less likely to have motion occur such as high on a wall or in a corner. Should a general illumination change occur they would be triggered at least as early as any Active zones and prevent any other zones from generating an alarm. Obviously careful placement is required to ensure that they do not cancel any genuine alarms or that they are not so close together that any motion just hops from one Preclusive zone to another.  Preclusive zones may also be used to reduce processing time by situating one over an Active zone.  The Preclusive zone is processed first; if it is small, and is triggered, the rest of the zone/image will not be processed.
+    This zone type is relatively recent. It is called a Preclusive zone because if it is triggered it actually precludes an alarm being generated for that image frame. So motion or other changes that occur in a Preclusive zone will have the effect of ensuring that no alarm occurs at all. The application for this zone type is primarily as a shortcut for detecting general large-scale lighting or other changes. Generally this may be achieved by limiting the maximum number of alarm pixels or other measure in an Active zone. However in some cases that zone may cover an area where the area of variable illumination occurs in different places as the sun and/or shadows move and it thus may be difficult to come up with general values. Additionally, if the sun comes out rapidly then although the initial change may be ignored in this way as the reference image catches up an alarm may ultimately be triggered as the image becomes less different. Using one or more Preclusive zones offers a different approach. Preclusive zones are designed to be fairly small, even just a few pixels across, with quite low alarm thresholds. They should be situated in areas of the image that are less likely to have motion occur such as high on a wall or in a corner. Should a general illumination change occur they would be triggered at least as early as any Active zones and prevent any other zones from generating an alarm. Obviously careful placement is required to ensure that they do not cancel any genuine alarms or that they are not so close together that any motion just hops from one Preclusive zone to another.  Preclusive zones may also be used to reduce processing time by situating one over an Active zone.  The Preclusive zone is processed first; if it is small, and is triggered, the rest of the zone/image will not be processed. See Extend Alarm Frame Count below for a way to hold the preclusive zone active for an extended period.
 
   * Inactive
     Suppresses the detection of motion within it.  This can be layered on top of any other zone type, preventing motion within the Inactive zone from being effective for any other zone type.  Use inactive zones to cover areas in which nothing notable will ever happen or where you get false alarms that don't relate to what you are trying to monitor.  Inactive zones may be overlaid on other zones to blank out areas, and are processed first (with the exception of Privacy zones, see below).  As a general practice, you should try and make zones abut each other instead of overlapping to avoid repeated duplicate processing of the same area.  
@@ -104,6 +104,9 @@ Overload Frame Ignore Count
   * Number of Blobs > Max Blobs
   The idea is that after a change like a light going on that is considered too big to count as an alarm, it could take a couple of frames for things to settle down again.
 
+Extend Alarm Frame Count
+  This field applies to Preclusive Zones only. Placing a value in this field holds the Preclusive zone active for the specified number of frames after the initial triggering event. This is useful in cases where a sudden change in light level triggers the Preclusive zone, but the zone needs to be held active for a few frames as the camera itself adjusts to that change in light level.
+  
 Other information
 -----------------
 Refer to `this <http://www.zoneminder.com/wiki/index.php/Understanding_ZoneMinder%27s_Zoning_system_for_Dummies>`__ user contributed Zone guide for additional information will illustrations if you are new to zones and need more help.
diff --git a/docs/userguide/options/options_images.rst b/docs/userguide/options/options_images.rst
index 3e8598425..1b17d8336 100644
--- a/docs/userguide/options/options_images.rst
+++ b/docs/userguide/options/options_images.rst
@@ -23,7 +23,7 @@ MPEG_LIVE_FORMAT - When using MPEG mode ZoneMinder can output live video. Howeve
 
 MPEG_REPLAY_FORMAT - When using MPEG mode ZoneMinder can replay events in encoded video format. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player and 'mpg', or 'avi' etc should work under Linux. If you know any more then please let me know! If this option is left blank then live streams will revert to being in motion jpeg format
 
-RAND_STREAM - Some browsers can cache the streams used by ZoneMinder. In order to prevent his a harmless random string can be appended to the url to make each invocation of the stream appear unique.
+RAND_STREAM - Some browsers can cache the streams used by ZoneMinder. In order to prevent this a harmless random string can be appended to the url to make each invocation of the stream appear unique.
 
 OPT_CAMBOZOLA - Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.
 
diff --git a/docs/userguide/options/options_paths.rst b/docs/userguide/options/options_paths.rst
index 024998194..1d4911f70 100644
--- a/docs/userguide/options/options_paths.rst
+++ b/docs/userguide/options/options_paths.rst
@@ -7,8 +7,6 @@ ZM_DIR_EVENTS - This is the path to the events directory where all the event ima
 
 USE_DEEP_STORAGE - Traditionally ZoneMinder stores all events for a monitor in one directory for that monitor. This is simple and efficient except when you have very large amounts of events. Some filesystems are unable to store more than 32k files in one directory and even without this limitation, large numbers of files in a directory can slow creation and deletion of files. This option allows you to select an alternate method of storing events by year/month/day/hour/min/second which has the effect of separating events out into more directories, resulting in less per directory, and also making it easier to manually navigate to any events that may have happened at a particular time or date.
 
-DIR_IMAGES - 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.
-
 DIR_SOUNDS - ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where to look for this file. CAUTION: The directory you specify here cannot be outside the web root. Most users should never change this value.
 
 PATH_ZMS - The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 27d993894..fa7b86079 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -659,7 +659,7 @@ our @options = (
     description => 'Add a random string to prevent caching of streams',
     help        => q`
       Some browsers can cache the streams used by ZoneMinder. In
-      order to prevent his a harmless random string can be appended
+      order to prevent this a harmless random string can be appended
       to the url to make each invocation of the stream appear unique.
       `,
     type        => $types{boolean},
@@ -2450,7 +2450,7 @@ our @options = (
   },
   {
     name        => 'ZM_RUN_AUDIT',
-    default     => 'yes',
+    default     => 'no',
     description => 'Run zmaudit to check data consistency',
     help        => q`
       The zmaudit daemon exists to check that the saved information
@@ -2679,7 +2679,7 @@ our @options = (
   },
   {
     name        => 'ZM_OPT_CONTROL',
-    default     => 'no',
+    default     => 'yes',
     description => 'Support controllable (e.g. PTZ) cameras',
     help        => q`
       ZoneMinder includes limited support for controllable cameras. A
@@ -2892,7 +2892,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_LIST_THUMBS',
-    default     => 'no',
+    default     => 'yes',
     description => 'Display mini-thumbnails of event images in event lists',
     help        => q`
       Ordinarily the event lists just display text details of the
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FOSCAMR2C.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FOSCAMR2C.pm
new file mode 100644
index 000000000..1b96ae52b
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FOSCAMR2C.pm
@@ -0,0 +1,381 @@
+# Modified Jan 2019 for use with Foscam R2C IP Camera by Erik Schoepplenberg
+# The presets work with names so adds table to ZM db to track preset names and deletes and adds presets
+# in the camera and modifies the ZM db entries.The camera has 16 presets with 1-4
+# occupied with TopMost, Bottomost, LeftMost, RightMost so configure for 12.
+# the camera stores presets in available spot until full. the script first deletes 
+# a preset then sets one using the now avialable spot.
+#
+# ==========================================================================
+#
+# ZoneMinder Foscam FI8918W IP Control Protocol Module, $Date: 2009-11-25 09:20:00 +0000 (Wed, 04 Nov 2009) $, $Revision: 0001 $
+# Copyright (C) 2001-2008 Philip Coombes
+# 
+# Modified for use with Foscam FI8918W IP Camera by Dave Harris
+# Modified Feb 2011 by Howard Durdle (http://durdl.es/x) to:
+#      fix horizontal panning, add presets and IR on/off
+#      use Control Device field to pass username and password
+# Modified May 2014 by Arun Horne (http://arunhorne.co.uk) to:
+#      use HTTP basic auth as required by firmware 11.37.x.x upward
+# Modified Jan 2019 for use with Foscam R2C IP Camera by Erik Schoepplenberg
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Foscam R2C camera control
+# protocol
+#
+
+package MyAgent;
+
+use base 'LWP::UserAgent';
+
+
+package ZoneMinder::Control::FOSCAMR2C;
+ 
+use 5.006;
+use strict;
+use warnings;
+ 
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+ 
+our @ISA = qw(ZoneMinder::Control);
+ 
+our $VERSION = $ZoneMinder::Base::VERSION;
+ 
+# ==========================================================================
+#
+# Foscam R2C IP Control Protocol
+#
+# ==========================================================================
+ 
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Database qw(zmDbConnect); 
+use Time::HiRes qw( usleep );
+ 
+sub new
+{
+	my $class = shift;
+	my $id = shift;
+	my $self = ZoneMinder::Control->new( $id );
+	my $logindetails = "";
+	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" );
+}
+our $stop_command;
+ 
+sub open
+{
+	my $self = shift;
+ 
+	$self->loadMonitor();
+ 
+	$self->{ua} = MyAgent->new;
+	$self->{ua}->agent( "ZoneMinder Control Agent/" );
+ 
+	$self->{state} = 'open';
+}
+ 
+sub close
+{
+	my $self = shift;
+	$self->{state} = 'closed';
+}
+ 
+sub printMsg
+{
+	my $self = shift;
+	my $msg = shift;
+	my $msg_len = length($msg);
+ 
+	Debug( $msg."[".$msg_len."]" );
+}
+ 
+sub sendCmd
+{
+	my $self = shift;
+	my $cmd = shift;
+	my $result = undef;
+	printMsg( $cmd, "Tx" );
+ 
+	# PP Old cameras also support onstep=1 but it is too granular. Instead using moveCon and stop after interval
+	# PP - cleaned up URL to take it properly from Control device
+	# Control device needs to be of format usr=xxx&pwd=yyy
+	my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd"."&".$self->{Monitor}->{ControlDevice});
+	print ("Sending $req\n");
+	my $res = $self->{ua}->request($req);
+ 
+	if ( $res->is_success )
+	{
+		$result = !undef;
+	}
+	else
+	{
+		Error( "Error REALLY check failed:'".$res->status_line()."'" );
+		Error ("Cmd:".$req);
+	}
+ 
+	return( $result );
+}
+ 
+sub reset
+{
+	my $self = shift;
+	Debug( "Camera Reset" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzReset";
+	$self->sendCmd( $cmd );
+}
+
+# PP - in all move operations, added auto stop after timeout
+
+#Up Arrow
+sub moveConUp
+{
+	my $self = shift;
+	Debug( "Move Up" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveUp";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Down Arrow
+sub moveConDown
+{
+	my $self = shift;
+	Debug( "Move Down" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveDown";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Left Arrow
+sub moveConLeft
+{
+	my $self = shift;
+	Debug( "Move Left" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveLeft";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Right Arrow
+sub moveConRight
+{
+	my $self = shift;
+	Debug( "Move Right" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveRight";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Diagonally Up Right Arrow
+sub moveConUpRight
+{
+	my $self = shift;
+	Debug( "Move Diagonally Up Right" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveTopRight";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+
+}
+ 
+#Diagonally Down Right Arrow
+sub moveConDownRight
+{
+	my $self = shift;
+	Debug( "Move Diagonally Down Right" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveBottomRight";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Diagonally Up Left Arrow
+sub moveConUpLeft
+{
+	my $self = shift;
+	Debug( "Move Diagonally Up Left" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveTopLeft";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Diagonally Down Left Arrow
+sub moveConDownLeft
+{
+	my $self = shift;
+	Debug( "Move Diagonally Down Left" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzMoveBottomLeft";
+	$self->sendCmd( $cmd );
+	$self->autoStop( $self->{Monitor}->{AutoStopTimeout} );
+}
+ 
+#Stop
+sub moveStop
+{
+	my $self = shift;
+	Debug( "Move Stop" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzStopRun";
+	$self->sendCmd( $cmd );
+}
+
+# PP - imported from 9831 - autostop after usleep
+sub autoStop
+{
+    my $self = shift;
+    my $autostop = shift;
+    if( $autostop )
+    {
+       Debug( "Auto Stop" );
+       usleep( $autostop );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzStopRun";
+       $self->sendCmd( $cmd );
+    }
+}
+ 
+#Move Camera to Home Position
+sub presetHome
+{
+	my $self = shift;
+	Debug( "Home Preset" );
+	my $cmd = "CGIProxy.fcgi?cmd=ptzReset";
+	$self->sendCmd( $cmd );
+}
+ 
+#Set preset
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    my $dbh = zmDbConnect(1);
+	my $sth = $dbh->prepare("SELECT `Label` FROM `ControlPresets` WHERE `Preset` = $preset");
+    $sth->execute();
+    my $ref = ($sth->fetchrow_hashref());
+    my $label = $ref->{'Label'};
+    $sth = $dbh->prepare("CREATE TABLE IF NOT EXISTS `ControlPresetNames` (`Preset` int(10) unsigned NOT NULL,`Label2` varchar(64) NOT NULL, UNIQUE KEY (`Label2`))");
+    $sth->execute();    
+    $sth = $dbh->prepare("SELECT `Label2` FROM `ControlPresetNames` WHERE `Preset` = $preset");  
+    $sth->execute();
+    $ref = ($sth->fetchrow_hashref());
+    my $label2 = $ref->{'Label2'};
+    Debug( "Delete Preset $preset with name $label2 from camera" );
+    my $cmd = "CGIProxy.fcgi?cmd=ptzDeletePresetPoint&name=$label2";
+    $self->sendCmd( $cmd );
+    Debug( "Set Preset $preset with cmd $label in camera" );
+    $cmd = "CGIProxy.fcgi?cmd=ptzAddPresetPoint&name=$label";
+    $self->sendCmd( $cmd );
+    Debug( "Delete row Preset $preset with Label2 $label2 from db" );
+    $sth = $dbh->prepare("DELETE FROM `ControlPresetNames` WHERE `Preset` = $preset");
+    $sth->execute();
+    Debug( "Insert Preset $preset with cmd $label in db" );
+    $sth = $dbh->prepare("INSERT INTO `ControlPresetNames`(`Preset`, `Label2`) VALUES ('$preset','$label')");
+    $sth->execute();
+    $sth->finish();
+
+
+}
+ 
+#Goto preset
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+	my $dbh = zmDbConnect(1);
+	my $sth = $dbh->prepare("SELECT `Label` FROM `ControlPresets` WHERE `Preset` = $preset");
+    $sth->execute();
+    my $ref = ($sth->fetchrow_hashref());
+    my $label = $ref->{'Label'};
+    $sth->finish();
+    Debug( "Goto Preset $preset with cmd $label" );
+    my $cmd = "CGIProxy.fcgi?cmd=ptzGotoPresetPoint&name=$label";
+    $self->sendCmd( $cmd );
+}
+ 
+#Turn IR on
+sub wake
+{
+	my $self = shift;
+	Debug( "Wake - IR on" );
+	my $cmd = "CGIProxy.fcgi?cmd=openInfraLed";
+	$self->sendCmd( $cmd );
+}
+ 
+#Turn IR off
+sub sleep
+{
+	my $self = shift;
+	Debug( "Sleep - IR off" );
+	my $cmd = "CGIProxy.fcgi?cmd=closeInfraLed";
+	$self->sendCmd( $cmd );
+}
+ 
+1;
+__END__
+
+=head1 R2C
+
+ZoneMinder::Database - Perl extension for FOSCAM R2C
+
+=head1 SYNOPSIS
+
+Control script for Foscam R2C cameras. 
+
+=head1 DESCRIPTION
+
+You need to set "usr=xxx&pwd=yyy" in the ControlDevice field
+of the control tab for that monitor.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
+
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 9b0163999..45035ca23 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -48,7 +48,6 @@ 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})
@@ -144,7 +143,8 @@ require ZoneMinder::Event;
 
 my $max_image_age = 6/24; # 6 hours
 my $max_swap_age = 24/24; # 24 hours
-my $image_path = IMAGE_PATH;
+# images now live under the event path
+my $image_path = EVENT_PATH;
 
 my $loop = 1;
 my $cleaned = 0;
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 6d63be98b..f9e11e59b 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -176,8 +176,6 @@ void process_configfile( char* configFile) {
       staticConfig.SERVER_ID = atoi(val_ptr);
     else if ( strcasecmp( name_ptr, "ZM_DIR_EVENTS" ) == 0 )
       staticConfig.DIR_EVENTS = std::string(val_ptr);
-    else if ( strcasecmp( name_ptr, "ZM_DIR_IMAGES" ) == 0 )
-      staticConfig.DIR_IMAGES = std::string(val_ptr);
     else if ( strcasecmp( name_ptr, "ZM_DIR_SOUNDS" ) == 0 )
       staticConfig.DIR_SOUNDS = std::string(val_ptr);
     else if ( strcasecmp( name_ptr, "ZM_DIR_EXPORTS" ) == 0 )
diff --git a/src/zm_config.h.in b/src/zm_config.h.in
index 87a0f2db4..9831677f0 100644
--- a/src/zm_config.h.in
+++ b/src/zm_config.h.in
@@ -76,7 +76,6 @@ struct StaticConfig {
   std::string SERVER_NAME;
   unsigned int SERVER_ID;
   std::string DIR_EVENTS;
-  std::string DIR_IMAGES;
   std::string DIR_SOUNDS;
   std::string DIR_EXPORTS;
   std::string PATH_ZMS;
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 22dfa35ba..f1fe2528e 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -845,22 +845,23 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
 
             packet_count += 1;
             //Write the packet to our video store
-            Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)", avp->stream_index, avp->flags & AV_PKT_FLAG_KEY, packetqueue->size() );
+            Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)",
+                avp->stream_index, avp->flags & AV_PKT_FLAG_KEY, packetqueue->size());
             if ( avp->stream_index == mVideoStreamId ) {
               ret = videoStore->writeVideoFramePacket( avp );
               have_video_keyframe = true;
             } else if ( avp->stream_index == mAudioStreamId ) {
               ret = videoStore->writeAudioFramePacket( avp );
             } else {
-              Warning("Unknown stream id in queued packet (%d)", avp->stream_index );
+              Warning("Unknown stream id in queued packet (%d)", avp->stream_index);
               ret = -1;
             }
             if ( ret < 0 ) {
-              //Less than zero and we skipped a frame
+              // Less than zero and we skipped a frame
             }
             delete queued_packet;
           } // end while packets in the packetqueue
-          Debug(2, "Wrote %d queued packets", packet_count );
+          Debug(2, "Wrote %d queued packets", packet_count);
         }
       } // end if ! was recording
 
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 30feecfe8..3e4aff2a4 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2646,7 +2646,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
     } else {
       // check if end of alarm
       if (old_zone_alarmed) {
-        Debug(3, "Preclusive Zone %s alarm Ends. Prevíous score: %d", zone->Label(), old_zone_score);
+        Debug(3, "Preclusive Zone %s alarm Ends. Previous score: %d", zone->Label(), old_zone_score);
         if (old_zone_score > 0) {
           zone->SetExtendAlarmCount(zone->GetExtendAlarmFrames());
         }
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index cb7bac722..fe812d80e 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -350,7 +350,7 @@ VideoStore::~VideoStore() {
 
   if ( oc->pb ) {
 
-    if (audio_out_codec) {
+    if ( audio_out_codec ) {
       // The codec queues data.  We need to send a flush command and out
       // whatever we get. Failures are not fatal.
       AVPacket pkt;
@@ -366,7 +366,7 @@ VideoStore::~VideoStore() {
         ret = avcodec_receive_packet(audio_out_ctx, &pkt);
         if ( ret < 0 ) {
           if ( AVERROR_EOF != ret ) {
-            Error("ERror encoding audio while flushing (%d) (%s)", ret,
+            Error("Error encoding audio while flushing (%d) (%s)", ret,
                 av_err2str(ret));
           }
           break;
@@ -411,7 +411,7 @@ VideoStore::~VideoStore() {
 
     Debug(1,"Writing trailer");
     /* Write the trailer before close */
-    if (int rc = av_write_trailer(oc)) {
+    if ( int rc = av_write_trailer(oc) ) {
       Error("Error writing trailer %s", av_err2str(rc));
     } else {
       Debug(3, "Success Writing trailer");
@@ -421,7 +421,7 @@ VideoStore::~VideoStore() {
     if ( !(out_format->flags & AVFMT_NOFILE) ) {
       /* Close the out file. */
       Debug(2, "Closing");
-      if (int rc = avio_close(oc->pb)) {
+      if ( int rc = avio_close(oc->pb) ) {
         oc->pb = NULL;
         Error("Error closing avio %s", av_err2str(rc));
       }
@@ -510,8 +510,7 @@ bool VideoStore::setup_resampler() {
 #else
   audio_in_codec = avcodec_find_decoder(audio_in_ctx->codec_id);
 #endif
-  ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL);
-  if ( ret < 0 ) {
+  if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL)) < 0 ) {
     Error("Can't open in codec!");
     return false;
   }
@@ -540,11 +539,13 @@ bool VideoStore::setup_resampler() {
   audio_out_ctx = audio_out_stream->codec;
 #endif
   // Some formats (i.e. WAV) do not produce the proper channel layout
-  if ( audio_in_ctx->channel_layout == 0 )
+  if ( audio_in_ctx->channel_layout == 0 ) {
+    Debug(2, "Setting input channel layout to mono");
     audio_in_ctx->channel_layout = av_get_channel_layout("mono");
+  }
 
   /* put sample parameters */
-  audio_out_ctx->bit_rate = audio_in_ctx->bit_rate <= 96000 ? audio_in_ctx->bit_rate : 96000;
+  audio_out_ctx->bit_rate = audio_in_ctx->bit_rate <= 32768 ? audio_in_ctx->bit_rate : 32768;
   audio_out_ctx->sample_rate = audio_in_ctx->sample_rate;
   audio_out_ctx->channels = audio_in_ctx->channels;
   audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
@@ -582,13 +583,12 @@ bool VideoStore::setup_resampler() {
 
   /* check that the encoder supports s16 pcm in */
   if ( !check_sample_fmt(audio_out_codec, audio_out_ctx->sample_fmt) ) {
-    Debug(3, "Encoder does not support sample format %s, setting to FLTP",
+    Debug(2, "Encoder does not support sample format %s, setting to FLTP",
           av_get_sample_fmt_name(audio_out_ctx->sample_fmt));
     audio_out_ctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
   }
 
-  audio_out_ctx->time_base =
-      (AVRational){1, audio_out_ctx->sample_rate};
+  audio_out_ctx->time_base = (AVRational){1, audio_out_ctx->sample_rate};
 
   AVDictionary *opts = NULL;
   if ( (ret = av_dict_set(&opts, "strict", "experimental", 0)) < 0 ) {
@@ -655,6 +655,7 @@ bool VideoStore::setup_resampler() {
     swr_free(&resample_ctx);
     return false;
   }
+  Debug(1,"Success setting up SWRESAMPLE");
 #else
 #if defined(HAVE_LIBAVRESAMPLE)
   // Setup the audio resampler
@@ -884,14 +885,12 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 #if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
 
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    ret = avcodec_send_packet(audio_in_ctx, ipkt);
-    if ( ret < 0 ) {
+    if ( (ret = avcodec_send_packet(audio_in_ctx, ipkt)) < 0 ) {
       Error("avcodec_send_packet fail %s", av_make_error_string(ret).c_str());
       return 0;
     }
 
-    ret = avcodec_receive_frame(audio_in_ctx, in_frame);
-    if (ret < 0) {
+    if ( (ret = avcodec_receive_frame(audio_in_ctx, in_frame)) < 0 ) {
       Error("avcodec_receive_frame fail %s", av_make_error_string(ret).c_str());
       return 0;
     }
@@ -928,17 +927,22 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     Debug(2, "Converting  %d to %d samples", in_frame->nb_samples, out_frame->nb_samples);
     if (
   #if defined(HAVE_LIBSWRESAMPLE)
+#if 0
         (ret = swr_convert(resample_ctx,
             out_frame->data, frame_size,
-            (const uint8_t**)in_frame->data,
-            in_frame->nb_samples))
+            (const uint8_t**)in_frame->data, in_frame->nb_samples
+            ))
+#else
+        (ret = swr_convert_frame(resample_ctx, out_frame, in_frame))
+
+#endif
   #else
     #if defined(HAVE_LIBAVRESAMPLE)
     (ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
                                 0, in_frame->nb_samples))
   #endif
   #endif
-      < 0) {
+      < 0 ) {
       Error("Could not resample frame (error '%s')",
             av_make_error_string(ret).c_str());
       av_frame_unref(in_frame);
@@ -971,7 +975,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     Debug(5, "after init packet");
 
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    if ((ret = avcodec_send_frame(audio_out_ctx, out_frame)) < 0) {
+    if ( (ret = avcodec_send_frame(audio_out_ctx, out_frame)) < 0 ) {
       Error("Could not send frame (error '%s')",
             av_make_error_string(ret).c_str());
       zm_av_packet_unref(&opkt);
@@ -995,14 +999,14 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       return 0;
     }
   #else
-    if ((ret = avcodec_encode_audio2(audio_out_ctx, &opkt, out_frame,
-                                     &data_present)) < 0) {
+    if ( (ret = avcodec_encode_audio2(audio_out_ctx, &opkt, out_frame,
+                                     &data_present)) < 0 ) {
       Error("Could not encode frame (error '%s')",
             av_make_error_string(ret).c_str());
       zm_av_packet_unref(&opkt);
       return 0;
     }
-    if (!data_present) {
+    if ( !data_present ) {
       Debug(2, "Not ready to out a frame yet.");
       zm_av_packet_unref(&opkt);
       return 0;
diff --git a/version b/version
index 7aa332e41..02261bead 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.0
+1.33.1
diff --git a/web/ajax/zone.php b/web/ajax/zone.php
index bfa77a922..12a68f681 100644
--- a/web/ajax/zone.php
+++ b/web/ajax/zone.php
@@ -9,37 +9,6 @@ elseif ( !isset($_REQUEST['zid']) )
     ajaxError( 'No zone id(s) supplied' );
 }
 
-if ( canView( 'Monitors' ) )
-{
-    switch ( $_REQUEST['action'] )
-    {
-        case "zoneImage" :
-        {
-            $wd = getcwd();
-            chdir( ZM_DIR_IMAGES );
-            $hiColor = '0x00ff00';
-
-            $command = getZmuCommand( " -m ".$_REQUEST['mid']." -z" );
-            if ( !isset($_REQUEST['zid']) )
-                $_REQUEST['zid'] = 0;
-            $command .= "'".$_REQUEST['zid'].' '.$hiColor.' '.$_REQUEST['coords']."'";
-            $status = exec( escapeshellcmd($command) );
-            chdir( $wd );
-
-            $monitor = dbFetchOne( 'SELECT * FROM Monitors WHERE Id = ?', NULL, array($_REQUEST['mid']) );
-            $points = coordsToPoints( $_REQUEST['coords'] );
-
-            ajaxResponse( array(
-                'zoneImage' => ZM_DIR_IMAGES.'/Zones'.$monitor['Id'].'.jpg?'.time(),
-                'selfIntersecting' => isSelfIntersecting( $points ),
-                'area' => getPolyArea( $points )
-            ) );
-
-            break;
-        }
-    }
-}
-
 ajaxError( 'Unrecognised action or insufficient permissions' );
 
 ?>
diff --git a/web/api/app/Controller/Component/ImageComponent.php b/web/api/app/Controller/Component/ImageComponent.php
index fc967a2de..2033e0d8c 100644
--- a/web/api/app/Controller/Component/ImageComponent.php
+++ b/web/api/app/Controller/Component/ImageComponent.php
@@ -7,12 +7,10 @@ class ImageComponent extends Component {
 		
 		$captImage = sprintf( "%0".$config['ZM_EVENT_IMAGE_DIGITS']."d-capture.jpg", $frame['Frame']['FrameId'] );
 		$captPath = $eventPath.'/'.$captImage;
-		$thumbCaptPath = $config['ZM_DIR_IMAGES'].'/'.$event['Event']['Id'].'-'.$captImage;
 
 		$analImage = sprintf( "%0".$config['ZM_EVENT_IMAGE_DIGITS']."d-analyse.jpg", $frame['Frame']['FrameId'] );
 		$analPath = $eventPath.'/'.$analImage;
 		$analFile =  $config['ZM_DIR_EVENTS']."/".$analPath;
-		$thumbAnalPath = $config['ZM_DIR_IMAGES'].'/'.$event['Event']['Id'].'-'.$analImage;
 
 		$alarmFrame = $frame['Frame']['Type']=='Alarm';
 		
@@ -31,8 +29,8 @@ class ImageComponent extends Component {
 			    $fraction = sprintf( "%.3f", $scale/100 );
 			$scale = (int)round( $scale );
 			
-			$thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
-			$thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
+			$thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $captPath );
+			$thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $analPath );
 			
 			if ( $isAnalImage )
 			{
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 1d9456cc4..cf8ca8f37 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -318,7 +318,6 @@ class EventsController extends AppController {
           'ZM_WEB_LIST_THUMB_WIDTH',
           'ZM_WEB_LIST_THUMB_HEIGHT',
           'ZM_EVENT_IMAGE_DIGITS',
-          'ZM_DIR_IMAGES',
           $thumbs,
           'ZM_DIR_EVENTS'
         )
diff --git a/web/api/app/Controller/ZonesController.php b/web/api/app/Controller/ZonesController.php
index 74a87f353..4d6564443 100644
--- a/web/api/app/Controller/ZonesController.php
+++ b/web/api/app/Controller/ZonesController.php
@@ -137,33 +137,4 @@ class ZonesController extends AppController {
       return $this->flash(__('The zone could not be deleted. Please, try again.'), array('action' => 'index'));
     }
   }
-
-  public function createZoneImage($id = null) {
-    $this->loadModel('Monitor');
-    $this->Monitor->id = $id;
-    if ( !$this->Monitor->exists() ) {
-      throw new NotFoundException(__('Invalid zone'));
-    }
-
-    $this->loadModel('Config');
-    $zm_dir_images = $this->Config->find('list', array(
-      'conditions' => array('Name' => 'ZM_DIR_IMAGES'),
-      'fields' => array('Name', 'Value')
-    ));
-
-    $zm_dir_images = $zm_dir_images['ZM_DIR_IMAGES'];
-    $zm_path_web = Configure::read('ZM_PATH_WEB');
-    $zm_path_bin = Configure::read('ZM_PATH_BIN');
-    $images_path = "$zm_path_web/$zm_dir_images";
-
-    chdir($images_path);
-
-    $command = escapeshellcmd("$zm_path_bin/zmu -z -m $id");
-    system($command, $status);
-
-    $this->set(array(
-      'status' => $status,
-      '_serialize' => array('status')
-    ));
-  }
 } // end class
diff --git a/web/includes/Event.php b/web/includes/Event.php
index 27d9ae015..a4f389aca 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -414,15 +414,13 @@ class Event {
     if ( ! file_exists($captPath) ) {
       Error( "Capture file does not exist at $captPath" );
     }
-    $thumbCaptPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$captImage;
     
-    //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
+    //echo "CI:$captImage, CP:$captPath, TCP:$captPath<br>";
 
     $analImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId'] );
     $analPath = $eventPath.'/'.$analImage;
 
-    $thumbAnalPath = ZM_DIR_IMAGES.'/'.$this->{'Id'}.'-'.$analImage;
-    //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
+    //echo "AI:$analImage, AP:$analPath, TAP:$analPath<br>";
 
     $alarmFrame = $frame['Type']=='Alarm';
 
@@ -440,8 +438,8 @@ class Event {
         $fraction = sprintf( '%.3f', $scale/SCALE_BASE );
       $scale = (int)round( $scale );
 
-      $thumbCaptPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $thumbCaptPath );
-      $thumbAnalPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $thumbAnalPath );
+      $thumbCaptPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $captPath );
+      $thumbAnalPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $analPath );
 
       if ( $isAnalImage ) {
         $imagePath = $analPath;
diff --git a/web/includes/MontageLayout.php b/web/includes/MontageLayout.php
index 082dbde70..e8530f19a 100644
--- a/web/includes/MontageLayout.php
+++ b/web/includes/MontageLayout.php
@@ -118,13 +118,13 @@ class MontageLayout {
       $sql = 'UPDATE MontageLayouts SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $fields ) ) . ' WHERE Id=?';
       $values = array_map( function($field){return $this->{$field};}, $fields );
       $values[] = $this->{'Id'};
-    dbQuery( $sql, $values );
+      dbQuery($sql, $values);
     } else {
       $sql = 'INSERT INTO MontageLayouts ('.implode( ',', $fields ).') VALUES ('.implode(',',array_map( function(){return '?';}, $fields ) ).')';
       $values = array_map( function($field){return $this->{$field};}, $fields );
-      dbQuery( $sql, $values );
+      dbQuery($sql, $values);
       global $dbConn;
-      $this->{Id} = $dbConn->lastInsertId();
+      $this->{'Id'} = $dbConn->lastInsertId();
     }
   } // end function save
 
diff --git a/web/includes/actions.php b/web/includes/actions.php
deleted file mode 100644
index b170d6a5c..000000000
--- a/web/includes/actions.php
+++ /dev/null
@@ -1,969 +0,0 @@
-<?php
-//
-// ZoneMinder web action file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-
-function getAffectedIds( $name ) {
-  $names = $name.'s';
-  $ids = array();
-	if ( isset($_REQUEST[$names]) ) {
-		if ( is_array($_REQUEST[$names]) ) {
-			$ids = $_REQUEST[$names];
-		} else {
-			$ids = array($_REQUEST[$names]);
-		}
-	} else if ( isset($_REQUEST[$name]) ) {
-		if ( is_array($_REQUEST[$name]) ) {
-			$ids = $_REQUEST[$name];
-		} else {
-			$ids = array($_REQUEST[$name]);
-		}
-	}
-	return $ids;
-}
-
-
-if ( empty($action) ) {
-  return;
-}
-if ( $action == 'login' && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == 'remote' || isset($_REQUEST['password']) ) ) {
-
-  $refreshParent = true;
-  // User login is automatically performed in includes/auth.php So we don't need to perform a login here,
-  // just handle redirects.  This is the action that comes from the login view, so the logical thing to
-  // do on successful auth is redirect to console, otherwise loop back to login.
-  if ( !$user ) {
-    $view = 'login';
-  } else {
-    $view = 'console';
-    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
-  }
-} else if ( $action == 'logout' ) {
-  userLogout();
-  $refreshParent = true;
-  $view = 'none';
-} else if ( $action == 'bandwidth' && isset($_REQUEST['newBandwidth']) ) {
-  $_COOKIE['zmBandwidth'] = validStr($_REQUEST['newBandwidth']);
-  setcookie('zmBandwidth', validStr($_REQUEST['newBandwidth']), time()+3600*24*30*12*10);
-  $refreshParent = true;
-}
-
-// Event scope actions, view permissions only required
-if ( canView('Events') ) {
-
-  if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
-    if ( $action == 'addterm' ) {
-      $_REQUEST['filter'] = addFilterTerm($_REQUEST['filter'], $_REQUEST['line']);
-    } elseif ( $action == 'delterm' ) {
-      $_REQUEST['filter'] = delFilterTerm($_REQUEST['filter'], $_REQUEST['line']);
-    } else if ( canEdit('Events') ) {
-      if ( $action == 'delete' ) {
-        if ( ! empty($_REQUEST['Id']) ) {
-          dbQuery('DELETE FROM Filters WHERE Id=?', array($_REQUEST['Id']));
-        }
-      } else if ( ( $action == 'Save' ) or ( $action == 'SaveAs' ) or ( $action == 'execute' ) ) {
-       # or ( $action == 'submit' ) ) {
-
-        $sql = '';
-        $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
-        $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
-        $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
-        if ( $action == 'execute' ) {
-          $tempFilterName = '_TempFilter'.time();
-          $sql .= ' Name = \''.$tempFilterName.'\'';
-        } else {
-          $sql .= ' Name = '.dbEscape($_REQUEST['filter']['Name']);
-        }
-        $sql .= ', Query = '.dbEscape(jsonEncode($_REQUEST['filter']['Query']));
-        $sql .= ', AutoArchive = '.(!empty($_REQUEST['filter']['AutoArchive']) ? 1 : 0);
-        $sql .= ', AutoVideo = '. ( !empty($_REQUEST['filter']['AutoVideo']) ? 1 : 0);
-        $sql .= ', AutoUpload = '. ( !empty($_REQUEST['filter']['AutoUpload']) ? 1 : 0);
-        $sql .= ', AutoEmail = '. ( !empty($_REQUEST['filter']['AutoEmail']) ? 1 : 0);
-        $sql .= ', AutoMessage = '. ( !empty($_REQUEST['filter']['AutoMessage']) ? 1 : 0);
-        $sql .= ', AutoExecute = '. ( !empty($_REQUEST['filter']['AutoExecute']) ? 1 : 0);
-        $sql .= ', AutoExecuteCmd = '.dbEscape($_REQUEST['filter']['AutoExecuteCmd']);
-        $sql .= ', AutoDelete = '. ( !empty($_REQUEST['filter']['AutoDelete']) ? 1 : 0);
-        if ( !empty($_REQUEST['filter']['AutoMove']) ? 1 : 0) {
-          $sql .= ', AutoMove = 1, AutoMoveTo='. validInt($_REQUEST['filter']['AutoMoveTo']);
-        } else {
-          $sql .= ', AutoMove = 0'; 
-        }
-        $sql .= ', UpdateDiskSpace = '. ( !empty($_REQUEST['filter']['UpdateDiskSpace']) ? 1 : 0);
-        $sql .= ', Background = '. ( !empty($_REQUEST['filter']['Background']) ? 1 : 0);
-        $sql .= ', Concurrent  = '. ( !empty($_REQUEST['filter']['Concurrent']) ? 1 : 0);
-
-        if ( $_REQUEST['Id'] and ( $action == 'Save' ) ) {
-          dbQuery('UPDATE Filters SET ' . $sql. ' WHERE Id=?', array($_REQUEST['Id']));
-        } else {
-          dbQuery('INSERT INTO Filters SET' . $sql);
-          $_REQUEST['Id'] = dbInsertId();
-        }
-        if ( $action == 'execute' ) {
-          executeFilter( $tempFilterName );
-        }
-
-      } // end if save or execute
-    } // end if canEdit(Events)
-    return;
-  } // end if object == filter
-    else {
-
-    // Event scope actions, edit permissions required
-    if ( canEdit('Events') ) {
-      if ( ($action == 'rename') && isset($_REQUEST['eventName']) && !empty($_REQUEST['eid']) ) {
-        dbQuery('UPDATE Events SET Name=? WHERE Id=?', array($_REQUEST['eventName'], $_REQUEST['eid']));
-      } else if ( $action == 'eventdetail' ) {
-        if ( !empty($_REQUEST['eid']) ) {
-          dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
-            array($_REQUEST['newEvent']['Cause'], $_REQUEST['newEvent']['Notes'], $_REQUEST['eid']) );
-        } else {
-					$dbConn->beginTransaction();
-          foreach( getAffectedIds('markEid') as $markEid ) {
-            dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
-              array($_REQUEST['newEvent']['Cause'], $_REQUEST['newEvent']['Notes'], $markEid) );
-          }
-					$dbConn->commit();
-        }
-        $refreshParent = true;
-        $closePopup = true;
-      } elseif ( $action == 'archive' || $action == 'unarchive' ) {
-        $archiveVal = ($action == 'archive')?1:0;
-        if ( !empty($_REQUEST['eid']) ) {
-          dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array($archiveVal, $_REQUEST['eid']));
-        } else {
-					$dbConn->beginTransaction();
-          foreach( getAffectedIds('markEid') as $markEid ) {
-            dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array($archiveVal, $markEid));
-          }
-					$dbConn->commit();
-          $refreshParent = true;
-        }
-      } elseif ( $action == 'delete' ) {
-				$dbConn->beginTransaction();
-        foreach( getAffectedIds('eids') as $markEid ) {
-          deleteEvent($markEid);
-        }
-				$dbConn->commit();
-        $refreshParent = true;
-      }
-    } // end if canEdit(Events)
-  } // end if filter or something else
-} // end canView(Events)
-
-// Monitor control actions, require a monitor id and control view permissions for that monitor
-if ( !empty($_REQUEST['mid']) && canView('Control', $_REQUEST['mid']) ) {
-  require_once('control_functions.php');
-  require_once('Monitor.php');
-  $mid = validInt($_REQUEST['mid']);
-  if ( $action == 'control' ) {
-    $monitor = new Monitor($mid);
-
-    $ctrlCommand = buildControlCommand($monitor);
-    sendControlCommand($monitor->Id(), $ctrlCommand);
-  } else if ( $action == 'settings' ) {
-    $args = ' -m ' . escapeshellarg($mid);
-    $args .= ' -B' . escapeshellarg($_REQUEST['newBrightness']);
-    $args .= ' -C' . escapeshellarg($_REQUEST['newContrast']);
-    $args .= ' -H' . escapeshellarg($_REQUEST['newHue']);
-    $args .= ' -O' . escapeshellarg($_REQUEST['newColour']);
-
-    $zmuCommand = getZmuCommand($args);
-
-    $zmuOutput = exec($zmuCommand);
-    list($brightness, $contrast, $hue, $colour) = explode(' ', $zmuOutput);
-    dbQuery(
-      'UPDATE Monitors SET Brightness = ?, Contrast = ?, Hue = ?, Colour = ? WHERE Id = ?',
-      array($brightness, $contrast, $hue, $colour, $mid));
-  }
-}
-
-// Control capability actions, require control edit permissions
-if ( canEdit('Control') ) {
-  if ( $action == 'controlcap' ) {
-    require_once('Control.php');
-    $Control = new Control( !empty($_REQUEST['cid']) ? $_REQUEST['cid'] : null );
-
-    //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns );
-    $Control->save($_REQUEST['newControl']);
-    $refreshParent = true;
-    $view = 'none';
-  } elseif ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markCids']) ) {
-      foreach( $_REQUEST['markCids'] as $markCid ) {
-        dbQuery('DELETE FROM Controls WHERE Id = ?', array($markCid));
-        dbQuery('UPDATE Monitors SET Controllable = 0, ControlId = 0 WHERE ControlId = ?', array($markCid));
-        $refreshParent = true;
-      }
-    }
-  } // end if action
-} // end if canEdit Controls
-
-if ( isset($_REQUEST['object']) and $_REQUEST['object'] == 'Monitor' ) {
-  if ( $action == 'save' ) {
-    foreach ( $_REQUEST['mids'] as $mid ) {
-      $mid = ValidInt($mid);
-      if ( ! canEdit('Monitors', $mid) ) {
-        Warning("Cannot edit monitor $mid");
-        continue;
-      }
-      $Monitor = new Monitor($mid);
-      if ( $Monitor->Type() != 'WebSite' ) {
-        $Monitor->zmaControl('stop');
-        $Monitor->zmcControl('stop');
-      }
-      $Monitor->save($_REQUEST['newMonitor']);
-      if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
-        $Monitor->zmcControl('start');
-        if ( $Monitor->Enabled() ) {
-          $Monitor->zmaControl('start');
-        }
-      }
-    } // end foreach mid
-    $refreshParent = true;
-  } // end if action == save
-} // end if object is Monitor
-
-// Monitor edit actions, require a monitor id and edit permissions for that monitor
-if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
-  $mid = validInt($_REQUEST['mid']);
-  if ( $action == 'function' ) {
-    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
-
-    $newFunction = validStr($_REQUEST['newFunction']);
-    # Because we use a checkbox, it won't get passed in the request. So not being in _REQUEST means 0
-    $newEnabled = ( !isset($_REQUEST['newEnabled']) or $_REQUEST['newEnabled'] != '1' ) ? '0' : '1';
-    $oldFunction = $monitor['Function'];
-    $oldEnabled = $monitor['Enabled'];
-    if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled ) {
-      dbQuery('UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?',
-        array($newFunction, $newEnabled, $mid));
-
-      $monitor['Function'] = $newFunction;
-      $monitor['Enabled'] = $newEnabled;
-      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
-        $restart = ($oldFunction == 'None') || ($newFunction == 'None') || ($newEnabled != $oldEnabled);
-        zmaControl($monitor, 'stop');
-        zmcControl($monitor, $restart?'restart':'');
-        zmaControl($monitor, 'start');
-      }
-      $refreshParent = true;
-    }
-  } else if ( $action == 'zone' && isset($_REQUEST['zid']) ) {
-    $zid = validInt($_REQUEST['zid']);
-    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
-
-    if ( !empty($zid) ) {
-      $zone = dbFetchOne('SELECT * FROM Zones WHERE MonitorId=? AND Id=?', NULL, array($mid, $zid));
-    } else {
-      $zone = array();
-    }
-
-    if ( $_REQUEST['newZone']['Units'] == 'Percent' ) {
-      $_REQUEST['newZone']['MinAlarmPixels'] = intval(($_REQUEST['newZone']['MinAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
-      $_REQUEST['newZone']['MaxAlarmPixels'] = intval(($_REQUEST['newZone']['MaxAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MinFilterPixels']) )
-        $_REQUEST['newZone']['MinFilterPixels'] = intval(($_REQUEST['newZone']['MinFilterPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MaxFilterPixels']) )
-        $_REQUEST['newZone']['MaxFilterPixels'] = intval(($_REQUEST['newZone']['MaxFilterPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MinBlobPixels']) )
-        $_REQUEST['newZone']['MinBlobPixels'] = intval(($_REQUEST['newZone']['MinBlobPixels']*$_REQUEST['newZone']['Area'])/100);
-      if ( isset($_REQUEST['newZone']['MaxBlobPixels']) )
-        $_REQUEST['newZone']['MaxBlobPixels'] = intval(($_REQUEST['newZone']['MaxBlobPixels']*$_REQUEST['newZone']['Area'])/100);
-    }
-
-    unset( $_REQUEST['newZone']['Points'] );
-    $types = array();
-    $changes = getFormChanges($zone, $_REQUEST['newZone'], $types);
-
-    if ( count($changes) ) {
-      if ( $zid > 0 ) {
-        dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?', array($mid, $zid));
-      } else {
-        dbQuery('INSERT INTO Zones SET MonitorId=?, '.implode(', ', $changes), array($mid));
-      }
-      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
-        if ( $_REQUEST['newZone']['Type'] == 'Privacy' ) {
-          zmaControl($monitor, 'stop');
-          zmcControl($monitor, 'restart');
-          zmaControl($monitor, 'start');
-        } else {
-          zmaControl($monitor, 'restart');
-        }
-      }
-      if ( ($_REQUEST['newZone']['Type'] == 'Privacy') && $monitor['Controllable'] ) {
-        require_once('control_functions.php');
-        sendControlCommand($mid, 'quit');
-      }
-      $refreshParent = true;
-    }
-    $view = 'none';
-  } elseif ( $action == 'plugin' && isset($_REQUEST['pl']) ) {
-    $sql = 'SELECT * FROM PluginsConfig WHERE MonitorId=? AND ZoneId=? AND pluginName=?';
-    $pconfs=dbFetchAll($sql, NULL, array($mid, $_REQUEST['zid'], $_REQUEST['pl']));
-    $changes = 0;
-    foreach ( $pconfs as $pconf ) {
-      $value = $_REQUEST['pluginOpt'][$pconf['Name']];
-      if ( array_key_exists($pconf['Name'], $_REQUEST['pluginOpt']) && ($pconf['Value'] != $value) ) {
-        dbQuery('UPDATE PluginsConfig SET Value=? WHERE id=?', array($value, $pconf['Id']));
-        $changes++;
-      }
-    }
-    if ( $changes > 0 ) {
-      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
-        zmaControl($mid, 'restart');
-      }
-      $refreshParent = true;
-    }
-    $view = 'none';
-  } elseif ( ($action == 'sequence') && isset($_REQUEST['smid']) ) {
-    $smid = validInt($_REQUEST['smid']);
-    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id = ?', NULL, array($mid));
-    $smonitor = dbFetchOne('SELECT * FROM Monitors WHERE Id = ?', NULL, array($smid));
-
-    dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($smonitor['Sequence'], $monitor['Id']));
-    dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($monitor['Sequence'], $smonitor['Id']));
-
-    $refreshParent = true;
-    fixSequences();
-  } elseif ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markZids']) ) {
-      $deletedZid = 0;
-      foreach ( $_REQUEST['markZids'] as $markZid ) {
-        $zone = dbFetchOne('SELECT * FROM Zones WHERE Id=?', NULL, array($markZid));
-        dbQuery('DELETE FROM Zones WHERE MonitorId=? AND Id=?', array($mid, $markZid));
-        $deletedZid = 1;
-      }
-      if ( $deletedZid ) {
-        if ( daemonCheck() && $monitor['Type'] != 'WebSite' ) {
-          if ( $zone['Type'] == 'Privacy' ) {
-            zmaControl($mid, 'stop');
-            zmcControl($mid, 'restart');
-            zmaControl($mid, 'start');
-          } else {
-            zmaControl($mid, 'restart');
-          }
-        } // end if daemonCheck()
-        $refreshParent = true;
-      } // end if deletedzid
-    } // end if isset($_REQUEST['markZids'])
-  } // end if action 
-} // end if $mid and canEdit($mid)
-
-// Monitor edit actions, monitor id derived, require edit permissions for that monitor
-if ( canEdit('Monitors') ) {
-  if ( $action == 'monitor' ) {
-    $mid = 0;
-    if ( !empty($_REQUEST['mid']) ) {
-      $mid = validInt($_REQUEST['mid']);
-      $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
-
-      if ( ZM_OPT_X10 ) {
-        $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
-        if ( !$x10Monitor )
-          $x10Monitor = array();
-      }
-    } else {
-      $monitor = array();
-      if ( ZM_OPT_X10 ) {
-        $x10Monitor = array();
-      }
-    }
-    $Monitor = new Monitor($monitor);
-
-    // Define a field type for anything that's not simple text equivalent
-    $types = array(
-        'Triggers' => 'set',
-        'Controllable' => 'toggle',
-        'TrackMotion' => 'toggle',
-        'Enabled' => 'toggle',
-        'DoNativeMotDet' => 'toggle',
-        'Exif' => 'toggle',
-        'RTSPDescribe' => 'toggle',
-        'RecordAudio' => 'toggle',
-        'Method' => 'raw',
-        );
-
-    if ( $_REQUEST['newMonitor']['ServerId'] == 'auto' ) {
-      $_REQUEST['newMonitor']['ServerId'] = dbFetchOne(
-        'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
-      Logger::Debug('Auto selecting server: Got ' . $_REQUEST['newMonitor']['ServerId'] );
-      if ( ( ! $_REQUEST['newMonitor'] ) and defined('ZM_SERVER_ID') ) {
-        $_REQUEST['newMonitor']['ServerId'] = ZM_SERVER_ID;
-        Logger::Debug('Auto selecting server to ' . ZM_SERVER_ID);
-      }
-    }
-
-    $columns = getTableColumns('Monitors');
-    $changes = getFormChanges($monitor, $_REQUEST['newMonitor'], $types, $columns);
-
-    if ( count($changes) ) {
-      if ( $mid ) {
-
-        # If we change anything that changes the shared mem size, zma can complain.  So let's stop first.
-        if ( $monitor['Type'] != 'WebSite' ) {
-          zmaControl($monitor, 'stop');
-          zmcControl($monitor, 'stop');
-        }
-        dbQuery('UPDATE Monitors SET '.implode(', ', $changes).' WHERE Id=?', array($mid));
-        // Groups will be added below
-        if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
-          $OldStorage = new Storage($monitor['StorageId']);
-          $saferOldName = basename($monitor['Name']);
-          if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
-            unlink($OldStorage->Path().'/'.$saferOldName);
-
-          $NewStorage = new Storage($_REQUEST['newMonitor']['StorageId']);
-          if ( ! file_exists($NewStorage->Path().'/'.$mid) )
-            mkdir($NewStorage->Path().'/'.$mid, 0755);
-          $saferNewName = basename($_REQUEST['newMonitor']['Name']);
-          symlink($mid, $NewStorage->Path().'/'.$saferNewName);
-        }
-        if ( isset($changes['Width']) || isset($changes['Height']) ) {
-          $newW = $_REQUEST['newMonitor']['Width'];
-          $newH = $_REQUEST['newMonitor']['Height'];
-          $newA = $newW * $newH;
-          $oldW = $monitor['Width'];
-          $oldH = $monitor['Height'];
-          $oldA = $oldW * $oldH;
-
-          $zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId=?', NULL, array($mid));
-          foreach ( $zones as $zone ) {
-            $newZone = $zone;
-            $points = coordsToPoints($zone['Coords']);
-            for ( $i = 0; $i < count($points); $i++ ) {
-              $points[$i]['x'] = intval(($points[$i]['x']*($newW-1))/($oldW-1));
-              $points[$i]['y'] = intval(($points[$i]['y']*($newH-1))/($oldH-1));
-            }
-            $newZone['Coords'] = pointsToCoords($points);
-            $newZone['Area'] = intval(round(($zone['Area']*$newA)/$oldA));
-            $newZone['MinAlarmPixels'] = intval(round(($newZone['MinAlarmPixels']*$newA)/$oldA));
-            $newZone['MaxAlarmPixels'] = intval(round(($newZone['MaxAlarmPixels']*$newA)/$oldA));
-            $newZone['MinFilterPixels'] = intval(round(($newZone['MinFilterPixels']*$newA)/$oldA));
-            $newZone['MaxFilterPixels'] = intval(round(($newZone['MaxFilterPixels']*$newA)/$oldA));
-            $newZone['MinBlobPixels'] = intval(round(($newZone['MinBlobPixels']*$newA)/$oldA));
-            $newZone['MaxBlobPixels'] = intval(round(($newZone['MaxBlobPixels']*$newA)/$oldA));
-
-            $changes = getFormChanges($zone, $newZone, $types);
-
-            if ( count($changes) ) {
-              dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?',
-                array($mid, $zone['Id']));
-            }
-          } // end foreach zone
-        } // end if width and height
-        $restart = true;
-      } else if ( ! $user['MonitorIds'] ) {
-        // Can only create new monitors if we are not restricted to specific monitors
-# FIXME This is actually a race condition. Should lock the table.
-        $maxSeq = dbFetchOne('SELECT MAX(Sequence) AS MaxSequence FROM Monitors', 'MaxSequence');
-        $changes[] = 'Sequence = '.($maxSeq+1);
-
-        $sql = 'INSERT INTO Monitors SET '.implode(', ', $changes);
-        if ( dbQuery($sql) ) {
-          $mid = dbInsertId();
-          $zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
-          dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100)  ) );
-          //$view = 'none';
-          $Storage = new Storage($_REQUEST['newMonitor']['StorageId']);
-          mkdir($Storage->Path().'/'.$mid, 0755);
-          $saferName = basename($_REQUEST['newMonitor']['Name']);
-          symlink($mid, $Storage->Path().'/'.$saferName);
-  
-        } else {
-          Error('Error saving new Monitor.');
-          $error_message = dbError($sql);
-          return;
-        }
-      } else {
-        Error('Users with Monitors restrictions cannot create new monitors.');
-        return;
-      }
-
-      $restart = true;
-    } else {
-      Logger::Debug('No action due to no changes to Monitor');
-    } # end if count(changes)
-
-    if (
-      ( !isset($_POST['newMonitor']['GroupIds']) )
-      or
-      ( count($_POST['newMonitor']['GroupIds']) != count($Monitor->GroupIds()) )
-      or 
-      array_diff($_POST['newMonitor']['GroupIds'], $Monitor->GroupIds())
-    ) {
-      if ( $Monitor->Id() )
-        dbQuery('DELETE FROM Groups_Monitors WHERE MonitorId=?', array($mid));
-
-      if ( isset($_POST['newMonitor']['GroupIds']) ) {
-        foreach ( $_POST['newMonitor']['GroupIds'] as $group_id ) {
-          dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
-        }
-      }
-    } // end if there has been a change of groups
-
-    if ( ZM_OPT_X10 ) {
-      $x10Changes = getFormChanges($x10Monitor, $_REQUEST['newX10Monitor']);
-
-      if ( count($x10Changes) ) {
-        if ( $x10Monitor && isset($_REQUEST['newX10Monitor']) ) {
-          dbQuery('UPDATE TriggersX10 SET '.implode(', ', $x10Changes).' WHERE MonitorId=?', array($mid));
-        } elseif ( !$user['MonitorIds'] ) {
-          if ( !$x10Monitor ) {
-            dbQuery('INSERT INTO TriggersX10 SET MonitorId = ?, '.implode(', ', $x10Changes), array($mid));
-          } else {
-            dbQuery('DELETE FROM TriggersX10 WHERE MonitorId = ?', array($mid));
-          }
-        }
-        $restart = true;
-      } # end if has x10Changes
-    } # end if ZM_OPT_X10
-
-    if ( $restart ) {
-      
-      $new_monitor = new Monitor($mid);
-      //fixDevices();
-
-      if ( $new_monitor->Type() != 'WebSite' ) {
-        $new_monitor->zmcControl('start');
-        $new_monitor->zmaControl('start');
-      }
-
-      if ( $new_monitor->Controllable() ) {
-        require_once('control_functions.php');
-        sendControlCommand($mid, 'quit');
-      } 
-      // really should thump zmwatch and maybe zmtrigger too.
-      //daemonControl( 'restart', 'zmwatch.pl' );
-      $refreshParent = true;
-    } // end if restart
-    $view = 'none';
-  } elseif ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markMids']) && !$user['MonitorIds'] ) {
-      require_once('Monitor.php');
-      foreach ( $_REQUEST['markMids'] as $markMid ) {
-        if ( canEdit('Monitors', $markMid) ) {
-          // This could be faster as a select all
-          if ( $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id = ?', NULL, array($markMid)) ) {
-            $Monitor = new Monitor($monitor);
-            $Monitor->delete();
-          } // end if monitor found in db
-        } // end if canedit this monitor
-      } // end foreach monitor in MarkMid
-    } // markMids is set and we aren't limited to specific monitors
-  } // end if action == Delete
-}
-
-// Device view actions
-if ( canEdit('Devices') ) {
-  if ( $action == 'device' ) {
-    if ( !empty($_REQUEST['command']) ) {
-      setDeviceStatusX10($_REQUEST['key'], $_REQUEST['command']);
-    } else if ( isset($_REQUEST['newDevice']) ) {
-      if ( isset($_REQUEST['did']) ) {
-        dbQuery('UPDATE Devices SET Name=?, KeyString=? WHERE Id=?',
-          array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString'], $_REQUEST['did']) );
-      } else {
-        dbQuery('INSERT INTO Devices SET Name=?, KeyString=?',
-          array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString']) );
-      }
-      $refreshParent = true;
-      $view = 'none';
-    }
-  } elseif ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markDids']) ) {
-      foreach( $_REQUEST['markDids'] as $markDid ) {
-        dbQuery('DELETE FROM Devices WHERE Id=?', array($markDid));
-        $refreshParent = true;
-      }
-    }
-  } // end if action
-} // end if canedit devices
-
-// Group view actions
-if ( canView('Groups') && ($action == 'setgroup') ) {
-  if ( !empty($_REQUEST['gid']) ) {
-    setcookie('zmGroup', validInt($_REQUEST['gid']), time()+3600*24*30*12*10);
-  } else {
-    setcookie('zmGroup', '', time()-3600*24*2);
-  }
-  $refreshParent = true;
-}
-
-// Group edit actions
-# Should probably verify that each monitor id is a valid monitor, that we have access to.
-# However at the moment, you have to have System permissions to do this
-if ( canEdit('Groups') ) {
-  if ( $action == 'group' ) {
-    $monitors = empty($_POST['newGroup']['MonitorIds']) ? '' : implode(',', $_POST['newGroup']['MonitorIds']);
-    $group_id = null;
-    if ( !empty($_POST['gid']) ) {
-      $group_id = $_POST['gid'];
-      dbQuery(
-        'UPDATE Groups SET Name=?, ParentId=? WHERE Id=?',
-        array(
-          $_POST['newGroup']['Name'],
-          ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-          $group_id,
-        )
-      );
-      dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($group_id));
-    } else {
-      dbQuery(
-        'INSERT INTO Groups (Name,ParentId) VALUES (?,?)',
-        array(
-          $_POST['newGroup']['Name'],
-          ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-        )
-      );
-      $group_id = dbInsertId();
-    }
-    if ( $group_id ) {
-      foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
-        dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
-      }
-    }
-    $view = 'none';
-    $refreshParent = true;
-  } else if ( $action == 'delete' ) {
-    if ( !empty($_REQUEST['gid']) ) {
-      foreach ( Group::find(array('Id'=>$_REQUEST['gid'])) as $Group ) {
-        $Group->delete();
-      }
-    }
-    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=groups';
-    $refreshParent = true;
-  } # end if action
-} // end if can edit groups
-
-// System edit actions
-if ( canEdit('System') ) {
-  if ( isset($_REQUEST['object']) ) {
-    if ( $_REQUEST['object'] == 'MontageLayout' ) {
-      require_once('MontageLayout.php');
-      if ( $action == 'Save' ) {
-        $Layout = null;
-        if ( $_REQUEST['Name'] != '' ) {
-          $Layout = new MontageLayout();
-          $Layout->Name($_REQUEST['Name']);
-        } else {
-          $Layout = new MontageLayout($_REQUEST['zmMontageLayout']);
-        }
-        $Layout->Positions($_REQUEST['Positions']);
-        $Layout->save();
-        session_start();
-        $_SESSION['zmMontageLayout'] = $Layout->Id();
-        setcookie('zmMontageLayout', $Layout->Id(), 1);
-        session_write_close();
-        $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=montage';
-      } // end if save
-
-    } else if ( $_REQUEST['object'] == 'server' ) {
-
-      if ( $action == 'Save' ) {
-        if ( !empty($_REQUEST['id']) ) {
-          $dbServer = dbFetchOne(
-            'SELECT * FROM Servers WHERE Id=?',
-            NULL,
-            array($_REQUEST['id']) );
-        } else {
-          $dbServer = array();
-        }
-
-        $types = array();
-        $changes = getFormChanges($dbServer, $_REQUEST['newServer'], $types);
-
-        if ( count($changes) ) {
-          if ( !empty($_REQUEST['id']) ) {
-            dbQuery('UPDATE Servers SET '.implode(', ', $changes).' WHERE Id = ?',
-              array($_REQUEST['id']) );
-          } else {
-            dbQuery('INSERT INTO Servers SET '.implode(', ', $changes));
-          }
-          $refreshParent = true;
-        }
-        $view = 'none';
-      } else if ( $action == 'delete' ) {
-        if ( !empty($_REQUEST['markIds']) ) {
-          foreach( $_REQUEST['markIds'] as $Id )
-            dbQuery('DELETE FROM Servers WHERE Id=?', array($Id));
-        }
-        $refreshParent = true;
-      } else {
-        Error("Unknown action $action in saving Server");
-      }
-    } else if ( $_REQUEST['object'] == 'storage' ) {
-      if ( $action == 'Save' ) {
-        if ( !empty($_REQUEST['id']) )
-          $dbStorage = dbFetchOne('SELECT * FROM Storage WHERE Id=?', NULL, array($_REQUEST['id']));
-        else
-          $dbStorage = array();
-
-        $types = array();
-        $changes = getFormChanges($dbStorage, $_REQUEST['newStorage'], $types);
-
-        if ( count($changes) ) {
-          if ( !empty($_REQUEST['id']) ) {
-            dbQuery('UPDATE Storage SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['id']));
-          } else {
-            dbQuery('INSERT INTO Storage set '.implode(', ', $changes));
-          }
-          $refreshParent = true;
-        }
-        $view = 'none';
-      } else if ( $action == 'delete' ) {
-        if ( !empty($_REQUEST['markIds']) ) {
-          foreach( $_REQUEST['markIds'] as $Id )
-            dbQuery('DELETE FROM Storage WHERE Id=?', array($Id));
-        }
-        $refreshParent = true;
-      } else {
-        Error("Unknown action $action in saving Storage");
-      }
-    } # end if isset($_REQUEST['object'] )
-
-  } else if ( $action == 'version' && isset($_REQUEST['option']) ) {
-    $option = $_REQUEST['option'];
-    switch( $option ) {
-      case 'go' :
-        {
-          // Ignore this, the caller will open the page itself
-          break;
-        }
-      case 'ignore' :
-        {
-          dbQuery("UPDATE Config SET Value = '".ZM_DYN_LAST_VERSION."' WHERE Name = 'ZM_DYN_CURR_VERSION'");
-          break;
-        }
-      case 'hour' :
-      case 'day' :
-      case 'week' :
-        {
-          $nextReminder = time();
-          if ( $option == 'hour' ) {
-            $nextReminder += 60*60;
-          } elseif ( $option == 'day' ) {
-            $nextReminder += 24*60*60;
-          } elseif ( $option == 'week' ) {
-            $nextReminder += 7*24*60*60;
-          }
-          dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
-          break;
-        }
-      case 'never' :
-        {
-          dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_CHECK_FOR_UPDATES'");
-          break;
-        }
-    }
-  }
-  if ( $action == 'donate' && isset($_REQUEST['option']) ) {
-    $option = $_REQUEST['option'];
-    switch( $option ) {
-      case 'go' :
-        {
-          // Ignore this, the caller will open the page itself
-          break;
-        }
-      case 'hour' :
-      case 'day' :
-      case 'week' :
-      case 'month' :
-        {
-          $nextReminder = time();
-          if ( $option == 'hour' ) {
-            $nextReminder += 60*60;
-          } elseif ( $option == 'day' ) {
-            $nextReminder += 24*60*60;
-          } elseif ( $option == 'week' ) {
-            $nextReminder += 7*24*60*60;
-          } elseif ( $option == 'month' ) {
-            $nextReminder += 30*24*60*60;
-          }
-          dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
-          break;
-        }
-      case 'never' :
-      case 'already' :
-        {
-          dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_DYN_SHOW_DONATE_REMINDER'");
-          break;
-        }
-    } // end switch option
-  }
-  if ( ($action == 'privacy') && isset($_REQUEST['option']) ) {
-    switch( $_REQUEST['option'] ) {
-      case 'decline' :
-        {
-          dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_SHOW_PRIVACY'");
-          dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_TELEMETRY_DATA'");
-          $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
-          break;
-        }
-      case 'accept' :
-        {
-          dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_SHOW_PRIVACY'");
-          dbQuery("UPDATE Config SET Value = '1' WHERE Name = 'ZM_TELEMETRY_DATA'");
-          $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
-          break;
-        }
-      default: # Enable the privacy statement if we somehow submit something other than accept or decline
-          dbQuery("UPDATE Config SET Value = '1' WHERE Name = 'ZM_SHOW_PRIVACY'");
-    } // end switch option
-    return;
-  }
-  if ( $action == 'options' && isset($_REQUEST['tab']) ) {
-    $config = array();
-    $configCat = array();
-    $configCats = array();
-
-    $result = $dbConn->query('SELECT * FROM Config ORDER BY Id ASC');
-    if ( !$result )
-      echo mysql_error();
-    while( $row = dbFetchNext($result) ) {
-      $config[$row['Name']] = $row;
-      if ( !($configCat = &$configCats[$row['Category']]) ) {
-        $configCats[$row['Category']] = array();
-        $configCat = &$configCats[$row['Category']];
-      }
-      $configCat[$row['Name']] = $row;
-    }
-
-    $configCat = $configCats[$_REQUEST['tab']];
-    $changed = false;
-    foreach ( $configCat as $name=>$value ) {
-      unset($newValue);
-      if ( $value['Type'] == 'boolean' && empty($_REQUEST['newConfig'][$name]) ) {
-        $newValue = 0;
-      } else if ( isset($_REQUEST['newConfig'][$name]) ) {
-        $newValue = preg_replace("/\r\n/", "\n", stripslashes($_REQUEST['newConfig'][$name]));
-      }
-
-      if ( isset($newValue) && ($newValue != $value['Value']) ) {
-        dbQuery('UPDATE Config SET Value=? WHERE Name=?', array($newValue, $name));
-        $changed = true;
-      }
-    }
-    if ( $changed ) {
-      switch( $_REQUEST['tab'] ) {
-        case 'system' :
-        case 'config' :
-          $restartWarning = true;
-          break;
-        case 'web' :
-        case 'tools' :
-          break;
-        case 'logging' :
-        case 'network' :
-        case 'mail' :
-        case 'upload' :
-          $restartWarning = true;
-          break;
-        case 'highband' :
-        case 'medband' :
-        case 'lowband' :
-          break;
-      }
-      $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=options&tab='.$_REQUEST['tab'];
-    }
-    loadConfig(false);
-    return;
-  } elseif ( $action == 'user' ) {
-    if ( !empty($_REQUEST['uid']) )
-      $dbUser = dbFetchOne('SELECT * FROM Users WHERE Id=?', NULL, array($_REQUEST['uid']));
-    else
-      $dbUser = array();
-
-    $types = array();
-    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
-
-    if ( $_REQUEST['newUser']['Password'] )
-      $changes['Password'] = 'Password = password('.dbEscape($_REQUEST['newUser']['Password']).')';
-    else
-      unset($changes['Password']);
-
-    if ( count($changes) ) {
-      if ( !empty($_REQUEST['uid']) ) {
-        dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
-        # If we are updating the logged in user, then update our session user data.
-        if ( $user and ( $dbUser['Username'] == $user['Username'] ) )
-          userLogin($dbUser['Username'], $dbUser['Password']);
-      } else {
-        dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
-      }
-      $refreshParent = true;
-    }
-    $view = 'none';
-  } elseif ( $action == 'state' ) {
-    if ( !empty($_REQUEST['runState']) ) {
-      //if ( $cookies ) session_write_close();
-      packageControl($_REQUEST['runState']);
-      $refreshParent = true;
-    }
-  } elseif ( $action == 'save' ) {
-    if ( !empty($_REQUEST['runState']) || !empty($_REQUEST['newState']) ) {
-      $sql = 'SELECT Id,Function,Enabled FROM Monitors ORDER BY Id';
-      $definitions = array();
-      foreach( dbFetchAll($sql) as $monitor ) {
-        $definitions[] = $monitor['Id'].':'.$monitor['Function'].':'.$monitor['Enabled'];
-      }
-      $definition = join(',', $definitions);
-      if ( $_REQUEST['newState'] )
-        $_REQUEST['runState'] = $_REQUEST['newState'];
-      dbQuery('REPLACE INTO States SET Name=?, Definition=?', array($_REQUEST['runState'],$definition));
-    }
-  } elseif ( $action == 'delete' ) {
-    if ( isset($_REQUEST['runState']) )
-      dbQuery('DELETE FROM States WHERE Name=?', array($_REQUEST['runState']));
-
-    if ( isset($_REQUEST['markUids']) ) {
-      foreach( $_REQUEST['markUids'] as $markUid )
-        dbQuery('DELETE FROM Users WHERE Id = ?', array($markUid));
-      if ( $markUid == $user['Id'] )
-        userLogout();
-    }
-  }
-} else {
-  if ( ZM_USER_SELF_EDIT && $action == 'user' ) {
-    $uid = $user['Id'];
-
-    $dbUser = dbFetchOne('SELECT Id, Password, Language FROM Users WHERE Id = ?', NULL, array($uid));
-
-    $types = array();
-    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
-
-    if ( !empty($_REQUEST['newUser']['Password']) )
-      $changes['Password'] = 'Password = password('.dbEscape($_REQUEST['newUser']['Password']).')';
-    else
-      unset($changes['Password']);
-    if ( count($changes) ) {
-      dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
-      $refreshParent = true;
-    }
-    $view = 'none';
-  }
-}
-
-if ( $action == 'reset' ) {
-  session_start();
-  $_SESSION['zmEventResetTime'] = strftime(STRF_FMT_DATETIME_DB);
-  setcookie('zmEventResetTime', $_SESSION['zmEventResetTime'], time()+3600*24*30*12*10);
-  session_write_close();
-}
-
-?>
diff --git a/web/includes/actions/bandwidth.php b/web/includes/actions/bandwidth.php
new file mode 100644
index 000000000..8a9056cd2
--- /dev/null
+++ b/web/includes/actions/bandwidth.php
@@ -0,0 +1,27 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+if ( $action == 'bandwidth' && isset($_REQUEST['newBandwidth']) ) {
+  $_COOKIE['zmBandwidth'] = validStr($_REQUEST['newBandwidth']);
+  setcookie('zmBandwidth', validStr($_REQUEST['newBandwidth']), time()+3600*24*30*12*10);
+  $refreshParent = true;
+}
+?>
diff --git a/web/includes/actions/console.php b/web/includes/actions/console.php
new file mode 100644
index 000000000..5f02d655a
--- /dev/null
+++ b/web/includes/actions/console.php
@@ -0,0 +1,40 @@
+<?php
+//
+// ZoneMinder web action file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( $action == 'delete' ) {
+  if ( ! canEdit('Monitors') ) {
+    Warning("No permission to delete monitors");
+    return;
+  }
+
+  if ( isset($_REQUEST['markMids']) && !$user['MonitorIds'] ) {
+    require_once('Monitor.php');
+    foreach ( $_REQUEST['markMids'] as $markMid ) {
+      if ( canEdit('Monitors', $markMid) ) {
+        // This could be faster as a select all
+        if ( $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id = ?', NULL, array($markMid)) ) {
+          $Monitor = new Monitor($monitor);
+          $Monitor->delete();
+        } // end if monitor found in db
+      } // end if canedit this monitor
+    } // end foreach monitor in MarkMid
+  } // markMids is set and we aren't limited to specific monitors
+} // end if action == Delete
+?>
diff --git a/web/includes/actions/control.php b/web/includes/actions/control.php
new file mode 100644
index 000000000..d3a75a751
--- /dev/null
+++ b/web/includes/actions/control.php
@@ -0,0 +1,40 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Monitor control actions, require a monitor id and control view permissions for that monitor
+if ( empty($_REQUEST['mid']) ) {
+  Warning("Settings requires a monitor id");
+  return;
+}
+if ( ! canView('Control', $_REQUEST['mid']) ) {
+  Warning("Settings requires the Control permission");
+  return;
+}
+
+require_once('control_functions.php');
+require_once('Monitor.php');
+$mid = validInt($_REQUEST['mid']);
+if ( $action == 'control' ) {
+  $monitor = new Monitor($mid);
+
+  $ctrlCommand = buildControlCommand($monitor);
+  sendControlCommand($monitor->Id(), $ctrlCommand);
+}
+?>
diff --git a/web/includes/actions/controlcap.php b/web/includes/actions/controlcap.php
new file mode 100644
index 000000000..ec21e0dcd
--- /dev/null
+++ b/web/includes/actions/controlcap.php
@@ -0,0 +1,36 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+if ( !canEdit('Control') ) {
+  Warning("Need Control permissions to edit control capabilities");
+  return;
+} // end if !canEdit Controls
+
+if ( $action == 'controlcap' ) {
+  require_once('Control.php');
+  $Control = new Control( !empty($_REQUEST['cid']) ? $_REQUEST['cid'] : null );
+
+  //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns );
+  $Control->save($_REQUEST['newControl']);
+  $refreshParent = true;
+  $view = 'none';
+} // end if action
+?>
diff --git a/web/includes/actions/controlcaps.php b/web/includes/actions/controlcaps.php
new file mode 100644
index 000000000..f67a37dad
--- /dev/null
+++ b/web/includes/actions/controlcaps.php
@@ -0,0 +1,37 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+if ( !canEdit('Control') ) {
+  Warning("Need Control permissions to edit control capabilities");
+  return;
+} // end if !canEdit Controls
+}
+
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['markCids']) ) {
+    foreach( $_REQUEST['markCids'] as $markCid ) {
+      dbQuery('DELETE FROM Controls WHERE Id = ?', array($markCid));
+      dbQuery('UPDATE Monitors SET Controllable = 0, ControlId = 0 WHERE ControlId = ?', array($markCid));
+      $refreshParent = true;
+    }
+  }
+} // end if action
+?>
diff --git a/web/includes/actions/device.php b/web/includes/actions/device.php
new file mode 100644
index 000000000..a9d1f9e5a
--- /dev/null
+++ b/web/includes/actions/device.php
@@ -0,0 +1,45 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Device view actions
+if ( !canEdit('Devices') ) {
+  Warning("No devices permission in editing device");
+  return;
+} // end if !canEdit(Devices)
+
+if ( $action == 'device' ) {
+  if ( !empty($_REQUEST['command']) ) {
+    setDeviceStatusX10($_REQUEST['key'], $_REQUEST['command']);
+  } else if ( isset($_REQUEST['newDevice']) ) {
+    if ( isset($_REQUEST['did']) ) {
+      dbQuery('UPDATE Devices SET Name=?, KeyString=? WHERE Id=?',
+        array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString'], $_REQUEST['did']) );
+    } else {
+      dbQuery('INSERT INTO Devices SET Name=?, KeyString=?',
+        array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString']) );
+    }
+    $refreshParent = true;
+    $view = 'none';
+  }
+} else {
+  Error("Unknown action in device");
+} // end if action
+
+?>
diff --git a/web/includes/actions/devices.php b/web/includes/actions/devices.php
new file mode 100644
index 000000000..4cb5d43a3
--- /dev/null
+++ b/web/includes/actions/devices.php
@@ -0,0 +1,35 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Device view actions
+if ( !canEdit('Devices') ) {
+  Warning("No devices permission in editing device");
+  return;
+} // end if !canEdit(Devices)
+
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['markDids']) ) {
+    foreach( $_REQUEST['markDids'] as $markDid ) {
+      dbQuery('DELETE FROM Devices WHERE Id=?', array($markDid));
+      $refreshParent = true;
+    }
+  }
+} // end if action
+?>
diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
new file mode 100644
index 000000000..74361c4e5
--- /dev/null
+++ b/web/includes/actions/donate.php
@@ -0,0 +1,54 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !canEdit('System') ) {
+  Warning("Need System permissions to update donation");
+  return;
+}
+
+if ( $action == 'donate' && isset($_REQUEST['option']) ) {
+  $option = $_REQUEST['option'];
+  switch( $option ) {
+    case 'go' :
+        // Ignore this, the caller will open the page itself
+        break;
+    case 'hour' :
+    case 'day' :
+    case 'week' :
+    case 'month' :
+        $nextReminder = time();
+        if ( $option == 'hour' ) {
+          $nextReminder += 60*60;
+        } elseif ( $option == 'day' ) {
+          $nextReminder += 24*60*60;
+        } elseif ( $option == 'week' ) {
+          $nextReminder += 7*24*60*60;
+        } elseif ( $option == 'month' ) {
+          $nextReminder += 30*24*60*60;
+        }
+        dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
+        break;
+    case 'never' :
+    case 'already' :
+        dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_DYN_SHOW_DONATE_REMINDER'");
+        break;
+  } // end switch option
+}
+?>
diff --git a/web/includes/actions/event.php b/web/includes/actions/event.php
new file mode 100644
index 000000000..89a2694c8
--- /dev/null
+++ b/web/includes/actions/event.php
@@ -0,0 +1,51 @@
+<?php
+//
+// ZoneMinder web action
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// If there is an action on an event, then we must have an id.
+if ( !empty($_REQUEST['eid']) ) {
+  Warning("No eid in action on event view");
+  return;
+}
+
+// Event scope actions, view permissions only required
+if ( canEdit('Events') ) {
+
+  if ( ($action == 'rename') && isset($_REQUEST['eventName']) ) {
+    dbQuery('UPDATE Events SET Name=? WHERE Id=?', array($_REQUEST['eventName'], $_REQUEST['eid']));
+  } else if ( $action == 'eventdetail' ) {
+      dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
+        array(
+          $_REQUEST['newEvent']['Cause'],
+          $_REQUEST['newEvent']['Notes'],
+          $_REQUEST['eid']
+        )
+      );
+    $refreshParent = true;
+    $closePopup = true;
+  } else if ( $action == 'archive' ) {
+      dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $_REQUEST['eid']));
+  } else if ( $action == 'unarchive' ) {
+      dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(0, $_REQUEST['eid']));
+  } else if ( $action == 'delete' ) {
+    deleteEvent($_REQUEST['eid']);
+    $refreshParent = true;
+  }
+} // end if canEdit(Events)
+?>
diff --git a/web/includes/actions/eventdetail.php b/web/includes/actions/eventdetail.php
new file mode 100644
index 000000000..561c2cb78
--- /dev/null
+++ b/web/includes/actions/eventdetail.php
@@ -0,0 +1,47 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !isset($_REQUEST['markEids']) ) {
+  Warning('Events actions require eids');
+  return;
+}
+
+// Event scope actions, view permissions only required
+if ( !canEdit('Events') ) {
+  Warning("Events actions require Edit permissions");
+  return;
+} // end if ! canEdit(Events)
+
+if ( $action == 'eventdetail' ) {
+  $dbConn->beginTransaction();
+  foreach ( $_REQUEST['markEids'] as $markEid ) {
+    dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
+      array(
+        $_REQUEST['newEvent']['Cause'],
+        $_REQUEST['newEvent']['Notes'],
+        $markEid
+      )
+    );
+  }
+  $dbConn->commit();
+  $refreshParent = true;
+  $closePopup = true;
+}
+?>
diff --git a/web/includes/actions/events.php b/web/includes/actions/events.php
new file mode 100644
index 000000000..2ed334d9c
--- /dev/null
+++ b/web/includes/actions/events.php
@@ -0,0 +1,54 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !isset($_REQUEST['eids']) ) {
+  Warning('Events actions require eids');
+  return;
+}
+
+// Event scope actions, view permissions only required
+if ( !canEdit('Events') ) {
+  Warning("Events actions require Edit permissions");
+  return;
+} // end if ! canEdit(Events)
+
+if ( $action == 'archive' ) {
+  $dbConn->beginTransaction();
+  foreach( getAffectedIds('markEid') as $markEid ) {
+    dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $markEid));
+  }
+  $dbConn->commit();
+  $refreshParent = true;
+} else if ( $action == 'unarchive' ) {
+  $dbConn->beginTransaction();
+  foreach( getAffectedIds('markEid') as $markEid ) {
+    dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(0, $markEid));
+  }
+  $dbConn->commit();
+  $refreshParent = true;
+} else if ( $action == 'delete' ) {
+  $dbConn->beginTransaction();
+  foreach ( getAffectedIds('markEid') as $markEid ) {
+    deleteEvent($markEid);
+  }
+  $dbConn->commit();
+  $refreshParent = true;
+}
+?>
diff --git a/web/includes/actions/filters.php b/web/includes/actions/filters.php
new file mode 100644
index 000000000..4067bdf9c
--- /dev/null
+++ b/web/includes/actions/filters.php
@@ -0,0 +1,81 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Event scope actions, view permissions only required
+if ( canView('Events') ) {
+
+  if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
+    if ( $action == 'addterm' ) {
+      $_REQUEST['filter'] = addFilterTerm($_REQUEST['filter'], $_REQUEST['line']);
+    } elseif ( $action == 'delterm' ) {
+      $_REQUEST['filter'] = delFilterTerm($_REQUEST['filter'], $_REQUEST['line']);
+    } else if ( canEdit('Events') ) {
+      if ( $action == 'delete' ) {
+        if ( ! empty($_REQUEST['Id']) ) {
+          dbQuery('DELETE FROM Filters WHERE Id=?', array($_REQUEST['Id']));
+        }
+      } else if ( ( $action == 'Save' ) or ( $action == 'SaveAs' ) or ( $action == 'execute' ) ) {
+       # or ( $action == 'submit' ) ) {
+
+        $sql = '';
+        $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
+        $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
+        $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
+        if ( $action == 'execute' ) {
+          $tempFilterName = '_TempFilter'.time();
+          $sql .= ' Name = \''.$tempFilterName.'\'';
+        } else {
+          $sql .= ' Name = '.dbEscape($_REQUEST['filter']['Name']);
+        }
+        $sql .= ', Query = '.dbEscape(jsonEncode($_REQUEST['filter']['Query']));
+        $sql .= ', AutoArchive = '.(!empty($_REQUEST['filter']['AutoArchive']) ? 1 : 0);
+        $sql .= ', AutoVideo = '. ( !empty($_REQUEST['filter']['AutoVideo']) ? 1 : 0);
+        $sql .= ', AutoUpload = '. ( !empty($_REQUEST['filter']['AutoUpload']) ? 1 : 0);
+        $sql .= ', AutoEmail = '. ( !empty($_REQUEST['filter']['AutoEmail']) ? 1 : 0);
+        $sql .= ', AutoMessage = '. ( !empty($_REQUEST['filter']['AutoMessage']) ? 1 : 0);
+        $sql .= ', AutoExecute = '. ( !empty($_REQUEST['filter']['AutoExecute']) ? 1 : 0);
+        $sql .= ', AutoExecuteCmd = '.dbEscape($_REQUEST['filter']['AutoExecuteCmd']);
+        $sql .= ', AutoDelete = '. ( !empty($_REQUEST['filter']['AutoDelete']) ? 1 : 0);
+        if ( !empty($_REQUEST['filter']['AutoMove']) ? 1 : 0) {
+          $sql .= ', AutoMove = 1, AutoMoveTo='. validInt($_REQUEST['filter']['AutoMoveTo']);
+        } else {
+          $sql .= ', AutoMove = 0'; 
+        }
+        $sql .= ', UpdateDiskSpace = '. ( !empty($_REQUEST['filter']['UpdateDiskSpace']) ? 1 : 0);
+        $sql .= ', Background = '. ( !empty($_REQUEST['filter']['Background']) ? 1 : 0);
+        $sql .= ', Concurrent  = '. ( !empty($_REQUEST['filter']['Concurrent']) ? 1 : 0);
+
+        if ( $_REQUEST['Id'] and ( $action == 'Save' ) ) {
+          dbQuery('UPDATE Filters SET ' . $sql. ' WHERE Id=?', array($_REQUEST['Id']));
+        } else {
+          dbQuery('INSERT INTO Filters SET' . $sql);
+          $_REQUEST['Id'] = dbInsertId();
+        }
+        if ( $action == 'execute' ) {
+          executeFilter( $tempFilterName );
+        }
+
+      } // end if save or execute
+    } // end if canEdit(Events)
+    return;
+  } // end if object == filter
+} // end canView(Events)
+
+?>
diff --git a/web/includes/actions/function.php b/web/includes/actions/function.php
new file mode 100644
index 000000000..8fcd411b6
--- /dev/null
+++ b/web/includes/actions/function.php
@@ -0,0 +1,49 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+// Monitor edit actions, require a monitor id and edit permissions for that monitor
+if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
+  $mid = validInt($_REQUEST['mid']);
+  if ( $action == 'function' ) {
+    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
+
+    $newFunction = validStr($_REQUEST['newFunction']);
+    # Because we use a checkbox, it won't get passed in the request. So not being in _REQUEST means 0
+    $newEnabled = ( !isset($_REQUEST['newEnabled']) or $_REQUEST['newEnabled'] != '1' ) ? '0' : '1';
+    $oldFunction = $monitor['Function'];
+    $oldEnabled = $monitor['Enabled'];
+    if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled ) {
+      dbQuery('UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?',
+        array($newFunction, $newEnabled, $mid));
+
+      $monitor['Function'] = $newFunction;
+      $monitor['Enabled'] = $newEnabled;
+      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
+        $restart = ($oldFunction == 'None') || ($newFunction == 'None') || ($newEnabled != $oldEnabled);
+        zmaControl($monitor, 'stop');
+        zmcControl($monitor, $restart?'restart':'');
+        zmaControl($monitor, 'start');
+      }
+      $refreshParent = true;
+    }
+  } // end if action 
+} // end if $mid and canEdit($mid)
+?>
diff --git a/web/includes/actions/group.php b/web/includes/actions/group.php
new file mode 100644
index 000000000..36a3f8faa
--- /dev/null
+++ b/web/includes/actions/group.php
@@ -0,0 +1,61 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Group edit actions
+# Should probably verify that each monitor id is a valid monitor, that we have access to.
+# However at the moment, you have to have System permissions to do this
+if ( ! canEdit('Groups') ) {
+  Warning("Need group edit permissions to edit groups");
+  return;
+}
+
+if ( $action == 'Save' ) {
+  $monitors = empty($_POST['newGroup']['MonitorIds']) ? '' : implode(',', $_POST['newGroup']['MonitorIds']);
+  $group_id = null;
+  if ( !empty($_POST['gid']) ) {
+    $group_id = $_POST['gid'];
+    dbQuery(
+      'UPDATE Groups SET Name=?, ParentId=? WHERE Id=?',
+      array(
+        $_POST['newGroup']['Name'],
+        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
+        $group_id,
+      )
+    );
+    dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($group_id));
+  } else {
+    dbQuery(
+      'INSERT INTO Groups (Name,ParentId) VALUES (?,?)',
+      array(
+        $_POST['newGroup']['Name'],
+        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
+      )
+    );
+    $group_id = dbInsertId();
+  }
+  if ( $group_id ) {
+    foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
+      dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
+    }
+  }
+  $view = 'none';
+  $refreshParent = true;
+} 
+?>
diff --git a/web/includes/actions/groups.php b/web/includes/actions/groups.php
new file mode 100644
index 000000000..200f65f99
--- /dev/null
+++ b/web/includes/actions/groups.php
@@ -0,0 +1,49 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Group view actions
+if ( ($action == 'setgroup') && canView('Groups')) {
+  if ( !empty($_REQUEST['gid']) ) {
+    setcookie('zmGroup', validInt($_REQUEST['gid']), time()+3600*24*30*12*10);
+  } else {
+    setcookie('zmGroup', '', time()-3600*24*2);
+  }
+  $refreshParent = true;
+  return;
+}
+
+// Group edit actions
+# Should probably verify that each monitor id is a valid monitor, that we have access to.
+# However at the moment, you have to have System permissions to do this
+if ( ! canEdit('Groups') ) {
+  Warning("Need group edit permissions to edit groups");
+  return;
+}
+
+if ( $action == 'delete' ) {
+  if ( !empty($_REQUEST['gid']) ) {
+    foreach ( Group::find(array('Id'=>$_REQUEST['gid'])) as $Group ) {
+      $Group->delete();
+    }
+  }
+  $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=groups';
+  $refreshParent = true;
+} # end if action
+?>
diff --git a/web/includes/actions/login.php b/web/includes/actions/login.php
new file mode 100644
index 000000000..a6e78632d
--- /dev/null
+++ b/web/includes/actions/login.php
@@ -0,0 +1,35 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+if ( $action == 'login' && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == 'remote' || isset($_REQUEST['password']) ) ) {
+
+  $refreshParent = true;
+  // User login is automatically performed in includes/auth.php So we don't need to perform a login here,
+  // just handle redirects.  This is the action that comes from the login view, so the logical thing to
+  // do on successful auth is redirect to console, otherwise loop back to login.
+  if ( !$user ) {
+    $view = 'login';
+  } else {
+    $view = 'console';
+    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
+  }
+}
+?>
diff --git a/web/includes/actions/logout.php b/web/includes/actions/logout.php
new file mode 100644
index 000000000..140b04670
--- /dev/null
+++ b/web/includes/actions/logout.php
@@ -0,0 +1,27 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+if ( $action == 'logout' ) {
+  userLogout();
+  $refreshParent = true;
+  $view = 'none';
+}
+?>
diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
new file mode 100644
index 000000000..2e73e4184
--- /dev/null
+++ b/web/includes/actions/monitor.php
@@ -0,0 +1,243 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// I think this is saving a Monitor from ajax...
+
+if ( isset($_REQUEST['object']) and $_REQUEST['object'] == 'Monitor' ) {
+  if ( $action == 'save' ) {
+    foreach ( $_REQUEST['mids'] as $mid ) {
+      $mid = ValidInt($mid);
+      if ( ! canEdit('Monitors', $mid) ) {
+        Warning("Cannot edit monitor $mid");
+        continue;
+      }
+      $Monitor = new Monitor($mid);
+      if ( $Monitor->Type() != 'WebSite' ) {
+        $Monitor->zmaControl('stop');
+        $Monitor->zmcControl('stop');
+      }
+      $Monitor->save($_REQUEST['newMonitor']);
+      if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
+        $Monitor->zmcControl('start');
+        if ( $Monitor->Enabled() ) {
+          $Monitor->zmaControl('start');
+        }
+      }
+    } // end foreach mid
+    $refreshParent = true;
+  } // end if action == save
+} // end if object is Monitor
+
+// Monitor edit actions, monitor id derived, require edit permissions for that monitor
+if ( ! canEdit('Monitors') ) {
+  Warning("Monitor actions require Monitors Permissions");
+  return;
+}
+
+if ( $action == 'monitor' ) {
+  $mid = 0;
+  if ( !empty($_REQUEST['mid']) ) {
+    $mid = validInt($_REQUEST['mid']);
+    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
+
+    if ( ZM_OPT_X10 ) {
+      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
+      if ( !$x10Monitor )
+        $x10Monitor = array();
+    }
+  } else {
+    $monitor = array();
+    if ( ZM_OPT_X10 ) {
+      $x10Monitor = array();
+    }
+  }
+  $Monitor = new Monitor($monitor);
+
+  // Define a field type for anything that's not simple text equivalent
+  $types = array(
+      'Triggers' => 'set',
+      'Controllable' => 'toggle',
+      'TrackMotion' => 'toggle',
+      'Enabled' => 'toggle',
+      'DoNativeMotDet' => 'toggle',
+      'Exif' => 'toggle',
+      'RTSPDescribe' => 'toggle',
+      'RecordAudio' => 'toggle',
+      'Method' => 'raw',
+      );
+
+  if ( $_REQUEST['newMonitor']['ServerId'] == 'auto' ) {
+    $_REQUEST['newMonitor']['ServerId'] = dbFetchOne(
+      'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
+    Logger::Debug('Auto selecting server: Got ' . $_REQUEST['newMonitor']['ServerId'] );
+    if ( ( ! $_REQUEST['newMonitor'] ) and defined('ZM_SERVER_ID') ) {
+      $_REQUEST['newMonitor']['ServerId'] = ZM_SERVER_ID;
+      Logger::Debug('Auto selecting server to ' . ZM_SERVER_ID);
+    }
+  }
+
+  $columns = getTableColumns('Monitors');
+  $changes = getFormChanges($monitor, $_REQUEST['newMonitor'], $types, $columns);
+
+  if ( count($changes) ) {
+    if ( $mid ) {
+
+      # If we change anything that changes the shared mem size, zma can complain.  So let's stop first.
+      if ( $monitor['Type'] != 'WebSite' ) {
+        zmaControl($monitor, 'stop');
+        zmcControl($monitor, 'stop');
+      }
+      dbQuery('UPDATE Monitors SET '.implode(', ', $changes).' WHERE Id=?', array($mid));
+      // Groups will be added below
+      if ( isset($changes['Name']) or isset($changes['StorageId']) ) {
+        $OldStorage = new Storage($monitor['StorageId']);
+        $saferOldName = basename($monitor['Name']);
+        if ( file_exists($OldStorage->Path().'/'.$saferOldName) )
+          unlink($OldStorage->Path().'/'.$saferOldName);
+
+        $NewStorage = new Storage($_REQUEST['newMonitor']['StorageId']);
+        if ( ! file_exists($NewStorage->Path().'/'.$mid) )
+          mkdir($NewStorage->Path().'/'.$mid, 0755);
+        $saferNewName = basename($_REQUEST['newMonitor']['Name']);
+        symlink($mid, $NewStorage->Path().'/'.$saferNewName);
+      }
+      if ( isset($changes['Width']) || isset($changes['Height']) ) {
+        $newW = $_REQUEST['newMonitor']['Width'];
+        $newH = $_REQUEST['newMonitor']['Height'];
+        $newA = $newW * $newH;
+        $oldW = $monitor['Width'];
+        $oldH = $monitor['Height'];
+        $oldA = $oldW * $oldH;
+
+        $zones = dbFetchAll('SELECT * FROM Zones WHERE MonitorId=?', NULL, array($mid));
+        foreach ( $zones as $zone ) {
+          $newZone = $zone;
+          $points = coordsToPoints($zone['Coords']);
+          for ( $i = 0; $i < count($points); $i++ ) {
+            $points[$i]['x'] = intval(($points[$i]['x']*($newW-1))/($oldW-1));
+            $points[$i]['y'] = intval(($points[$i]['y']*($newH-1))/($oldH-1));
+          }
+          $newZone['Coords'] = pointsToCoords($points);
+          $newZone['Area'] = intval(round(($zone['Area']*$newA)/$oldA));
+          $newZone['MinAlarmPixels'] = intval(round(($newZone['MinAlarmPixels']*$newA)/$oldA));
+          $newZone['MaxAlarmPixels'] = intval(round(($newZone['MaxAlarmPixels']*$newA)/$oldA));
+          $newZone['MinFilterPixels'] = intval(round(($newZone['MinFilterPixels']*$newA)/$oldA));
+          $newZone['MaxFilterPixels'] = intval(round(($newZone['MaxFilterPixels']*$newA)/$oldA));
+          $newZone['MinBlobPixels'] = intval(round(($newZone['MinBlobPixels']*$newA)/$oldA));
+          $newZone['MaxBlobPixels'] = intval(round(($newZone['MaxBlobPixels']*$newA)/$oldA));
+
+          $changes = getFormChanges($zone, $newZone, $types);
+
+          if ( count($changes) ) {
+            dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?',
+              array($mid, $zone['Id']));
+          }
+        } // end foreach zone
+      } // end if width and height
+      $restart = true;
+    } else if ( ! $user['MonitorIds'] ) {
+      // Can only create new monitors if we are not restricted to specific monitors
+# FIXME This is actually a race condition. Should lock the table.
+      $maxSeq = dbFetchOne('SELECT MAX(Sequence) AS MaxSequence FROM Monitors', 'MaxSequence');
+      $changes[] = 'Sequence = '.($maxSeq+1);
+
+      $sql = 'INSERT INTO Monitors SET '.implode(', ', $changes);
+      if ( dbQuery($sql) ) {
+        $mid = dbInsertId();
+        $zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
+        dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100)  ) );
+        //$view = 'none';
+        $Storage = new Storage($_REQUEST['newMonitor']['StorageId']);
+        mkdir($Storage->Path().'/'.$mid, 0755);
+        $saferName = basename($_REQUEST['newMonitor']['Name']);
+        symlink($mid, $Storage->Path().'/'.$saferName);
+
+      } else {
+        Error('Error saving new Monitor.');
+        $error_message = dbError($sql);
+        return;
+      }
+    } else {
+      Error('Users with Monitors restrictions cannot create new monitors.');
+      return;
+    }
+
+    $restart = true;
+  } else {
+    Logger::Debug('No action due to no changes to Monitor');
+  } # end if count(changes)
+
+  if (
+    ( !isset($_POST['newMonitor']['GroupIds']) )
+    or
+    ( count($_POST['newMonitor']['GroupIds']) != count($Monitor->GroupIds()) )
+    or 
+    array_diff($_POST['newMonitor']['GroupIds'], $Monitor->GroupIds())
+  ) {
+    if ( $Monitor->Id() )
+      dbQuery('DELETE FROM Groups_Monitors WHERE MonitorId=?', array($mid));
+
+    if ( isset($_POST['newMonitor']['GroupIds']) ) {
+      foreach ( $_POST['newMonitor']['GroupIds'] as $group_id ) {
+        dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
+      }
+    }
+  } // end if there has been a change of groups
+
+  if ( ZM_OPT_X10 ) {
+    $x10Changes = getFormChanges($x10Monitor, $_REQUEST['newX10Monitor']);
+
+    if ( count($x10Changes) ) {
+      if ( $x10Monitor && isset($_REQUEST['newX10Monitor']) ) {
+        dbQuery('UPDATE TriggersX10 SET '.implode(', ', $x10Changes).' WHERE MonitorId=?', array($mid));
+      } elseif ( !$user['MonitorIds'] ) {
+        if ( !$x10Monitor ) {
+          dbQuery('INSERT INTO TriggersX10 SET MonitorId = ?, '.implode(', ', $x10Changes), array($mid));
+        } else {
+          dbQuery('DELETE FROM TriggersX10 WHERE MonitorId = ?', array($mid));
+        }
+      }
+      $restart = true;
+    } # end if has x10Changes
+  } # end if ZM_OPT_X10
+
+  if ( $restart ) {
+    
+    $new_monitor = new Monitor($mid);
+    //fixDevices();
+
+    if ( $new_monitor->Type() != 'WebSite' ) {
+      $new_monitor->zmcControl('start');
+      $new_monitor->zmaControl('start');
+    }
+
+    if ( $new_monitor->Controllable() ) {
+      require_once('includes/control_functions.php');
+      sendControlCommand($mid, 'quit');
+    }
+    // really should thump zmwatch and maybe zmtrigger too.
+    //daemonControl( 'restart', 'zmwatch.pl' );
+    $refreshParent = true;
+  } // end if restart
+  $view = 'none';
+} else {
+  Warning("Unknown action $action in Monitor");
+} // end if action == Delete
+?>
diff --git a/web/includes/actions/montage.php b/web/includes/actions/montage.php
new file mode 100644
index 000000000..7182ba2dc
--- /dev/null
+++ b/web/includes/actions/montage.php
@@ -0,0 +1,48 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( isset($_REQUEST['object']) ) {
+  if ( $_REQUEST['object'] == 'MontageLayout' ) {
+    // System edit actions
+    if ( ! canEdit('System') ) {
+      Warning("Need System permissions to edit layouts");
+      return;
+    }
+    require_once('includes/MontageLayout.php');
+    if ( $action == 'Save' ) {
+      $Layout = null;
+      if ( $_REQUEST['Name'] != '' ) {
+        $Layout = new MontageLayout();
+        $Layout->Name($_REQUEST['Name']);
+      } else {
+        $Layout = new MontageLayout($_REQUEST['zmMontageLayout']);
+      }
+      $Layout->Positions($_REQUEST['Positions']);
+      $Layout->save();
+      session_start();
+      $_SESSION['zmMontageLayout'] = $Layout->Id();
+      setcookie('zmMontageLayout', $Layout->Id(), 1);
+      session_write_close();
+      $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=montage';
+    } // end if save
+
+  } # end if isset($_REQUEST['object'] )
+} # end if isset($_REQUEST['object'] )
+?>
diff --git a/web/includes/actions/options.php b/web/includes/actions/options.php
new file mode 100644
index 000000000..263a592f8
--- /dev/null
+++ b/web/includes/actions/options.php
@@ -0,0 +1,98 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// System edit actions
+if ( !canEdit('System') ) {
+  Warning("Must have System permissions to perform options actions");
+  return;
+}
+
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['object']) ) {
+    if ( $_REQUEST['object'] == 'server' ) {
+      if ( !empty($_REQUEST['markIds']) ) {
+        foreach( $_REQUEST['markIds'] as $Id )
+          dbQuery('DELETE FROM Servers WHERE Id=?', array($Id));
+      }
+      $refreshParent = true;
+    } else if ( $_REQUEST['object'] == 'storage' ) {
+      if ( !empty($_REQUEST['markIds']) ) {
+        foreach( $_REQUEST['markIds'] as $Id )
+          dbQuery('DELETE FROM Storage WHERE Id=?', array($Id));
+      }
+      $refreshParent = true;
+    } # end if isset($_REQUEST['object'] )
+  } else if ( isset($_REQUEST['markUids']) ) {
+    // deletes users
+    foreach( $_REQUEST['markUids'] as $markUid )
+      dbQuery('DELETE FROM Users WHERE Id = ?', array($markUid));
+    if ( $markUid == $user['Id'] )
+      userLogout();
+  }
+
+} else if ( $action == 'options' && isset($_REQUEST['tab']) ) {
+
+  $result = dbQuery('SELECT Name,Value,Type FROM Config WHERE Category=? ORDER BY Id ASC', array($_REQUEST['tab']));
+  if ( !$result ) {
+    echo mysql_error();
+    return;
+  }
+
+  $changed = false;
+  while( $config = dbFetchNext($result) ) {
+    unset($newValue);
+    if ( $config['Type'] == 'boolean' && empty($_REQUEST['newConfig'][$config['Name']]) ) {
+      $newValue = 0;
+    } else if ( isset($_REQUEST['newConfig'][$config['Name']]) ) {
+      $newValue = preg_replace("/\r\n/", "\n", stripslashes($_REQUEST['newConfig'][$config['Name']]));
+    }
+
+    if ( isset($newValue) && ($newValue != $config['Value']) ) {
+      dbQuery('UPDATE Config SET Value=? WHERE Name=?', array($newValue, $config['Name']));
+      $changed = true;
+    }
+  }
+  if ( $changed ) {
+    switch( $_REQUEST['tab'] ) {
+    case 'system' :
+    case 'config' :
+      $restartWarning = true;
+      break;
+    case 'web' :
+    case 'tools' :
+      break;
+    case 'logging' :
+    case 'network' :
+    case 'mail' :
+    case 'upload' :
+      $restartWarning = true;
+      break;
+    case 'highband' :
+    case 'medband' :
+    case 'lowband' :
+      break;
+    }
+    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=options&tab='.$_REQUEST['tab'];
+  }
+  loadConfig(false);
+  return;
+} // end if object vs action
+
+?>
diff --git a/web/includes/actions/privacy.php b/web/includes/actions/privacy.php
new file mode 100644
index 000000000..94fce81cd
--- /dev/null
+++ b/web/includes/actions/privacy.php
@@ -0,0 +1,41 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !canEdit('System') ) {
+  Warning("Need System permissions to update privacy");
+  return;
+}
+
+if ( ($action == 'privacy') && isset($_REQUEST['option']) ) {
+  switch( $_REQUEST['option'] ) {
+  case 'decline' :
+    dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_SHOW_PRIVACY'");
+    dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_TELEMETRY_DATA'");
+    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
+    break;
+  case 'accept' :
+    dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_SHOW_PRIVACY'");
+    dbQuery("UPDATE Config SET Value = '1' WHERE Name = 'ZM_TELEMETRY_DATA'");
+    $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=console';
+    break;
+  default: # Enable the privacy statement if we somehow submit something other than accept or decline
+    dbQuery("UPDATE Config SET Value = '1' WHERE Name = 'ZM_SHOW_PRIVACY'");
+  } // end switch option
+?>
diff --git a/web/includes/actions/server.php b/web/includes/actions/server.php
new file mode 100644
index 000000000..d991fd228
--- /dev/null
+++ b/web/includes/actions/server.php
@@ -0,0 +1,53 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// System edit actions
+if ( ! canEdit('System') ) {
+  Warning("Need System permissions to add servers");
+  return;
+}
+
+if ( $action == 'Save' ) {
+  if ( !empty($_REQUEST['id']) ) {
+    $dbServer = dbFetchOne(
+      'SELECT * FROM Servers WHERE Id=?',
+      NULL,
+      array($_REQUEST['id']) );
+  } else {
+    $dbServer = array();
+  }
+
+  $types = array();
+  $changes = getFormChanges($dbServer, $_REQUEST['newServer'], $types);
+
+  if ( count($changes) ) {
+    if ( !empty($_REQUEST['id']) ) {
+      dbQuery('UPDATE Servers SET '.implode(', ', $changes).' WHERE Id = ?',
+        array($_REQUEST['id']) );
+    } else {
+      dbQuery('INSERT INTO Servers SET '.implode(', ', $changes));
+    }
+    $refreshParent = true;
+  }
+  $view = 'none';
+} else {
+  Error("Unknown action $action in saving Server");
+}
+?>
diff --git a/web/includes/actions/settings.php b/web/includes/actions/settings.php
new file mode 100644
index 000000000..872dae95e
--- /dev/null
+++ b/web/includes/actions/settings.php
@@ -0,0 +1,50 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+
+// Monitor control actions, require a monitor id and control view permissions for that monitor
+if ( empty($_REQUEST['mid']) ) {
+  Warning("Settings requires a monitor id");
+  return;
+}
+if ( ! canView('Control', $_REQUEST['mid']) ) {
+  Warning("Settings requires the Control permission");
+  return;
+}
+
+require_once('control_functions.php');
+require_once('Monitor.php');
+$mid = validInt($_REQUEST['mid']);
+if ( $action == 'settings' ) {
+  $args = ' -m ' . escapeshellarg($mid);
+  $args .= ' -B' . escapeshellarg($_REQUEST['newBrightness']);
+  $args .= ' -C' . escapeshellarg($_REQUEST['newContrast']);
+  $args .= ' -H' . escapeshellarg($_REQUEST['newHue']);
+  $args .= ' -O' . escapeshellarg($_REQUEST['newColour']);
+
+  $zmuCommand = getZmuCommand($args);
+
+  $zmuOutput = exec($zmuCommand);
+  list($brightness, $contrast, $hue, $colour) = explode(' ', $zmuOutput);
+  dbQuery(
+    'UPDATE Monitors SET Brightness = ?, Contrast = ?, Hue = ?, Colour = ? WHERE Id = ?',
+    array($brightness, $contrast, $hue, $colour, $mid));
+}
+?>
diff --git a/web/includes/actions/state.php b/web/includes/actions/state.php
new file mode 100644
index 000000000..70666145e
--- /dev/null
+++ b/web/includes/actions/state.php
@@ -0,0 +1,48 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// System edit actions
+if ( !canEdit('System') ) {
+  Warning("Need System Permission to edit states");
+  return;
+}
+if ( $action == 'state' ) {
+  if ( !empty($_REQUEST['runState']) ) {
+    //if ( $cookies ) session_write_close();
+    packageControl($_REQUEST['runState']);
+    $refreshParent = true;
+  }
+} elseif ( $action == 'save' ) {
+  if ( !empty($_REQUEST['runState']) || !empty($_REQUEST['newState']) ) {
+    $sql = 'SELECT Id,Function,Enabled FROM Monitors ORDER BY Id';
+    $definitions = array();
+    foreach( dbFetchAll($sql) as $monitor ) {
+      $definitions[] = $monitor['Id'].':'.$monitor['Function'].':'.$monitor['Enabled'];
+    }
+    $definition = join(',', $definitions);
+    if ( $_REQUEST['newState'] )
+      $_REQUEST['runState'] = $_REQUEST['newState'];
+    dbQuery('REPLACE INTO States SET Name=?, Definition=?', array($_REQUEST['runState'],$definition));
+  }
+} elseif ( $action == 'delete' ) {
+  if ( isset($_REQUEST['runState']) )
+    dbQuery('DELETE FROM States WHERE Name=?', array($_REQUEST['runState']));
+}
+?>
diff --git a/web/includes/actions/storage.php b/web/includes/actions/storage.php
new file mode 100644
index 000000000..94b76bae7
--- /dev/null
+++ b/web/includes/actions/storage.php
@@ -0,0 +1,49 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// System edit actions
+if ( ! canEdit('System') ) {
+  Warning("Need System permission to edit Storage");
+  return;
+}
+
+if ( $action == 'Save' ) {
+  if ( !empty($_REQUEST['id']) )
+    $dbStorage = dbFetchOne('SELECT * FROM Storage WHERE Id=?', NULL, array($_REQUEST['id']));
+  else
+    $dbStorage = array();
+
+  $types = array();
+  $changes = getFormChanges($dbStorage, $_REQUEST['newStorage'], $types);
+
+  if ( count($changes) ) {
+    if ( !empty($_REQUEST['id']) ) {
+      dbQuery('UPDATE Storage SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['id']));
+    } else {
+      dbQuery('INSERT INTO Storage set '.implode(', ', $changes));
+    }
+    $refreshParent = true;
+  }
+  $view = 'none';
+} else {
+  Error("Unknown action $action in saving Storage");
+}
+
+?>
diff --git a/web/includes/actions/user.php b/web/includes/actions/user.php
new file mode 100644
index 000000000..af569627f
--- /dev/null
+++ b/web/includes/actions/user.php
@@ -0,0 +1,67 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( $action == 'user' ) {
+  if ( canEdit('System') ) {
+    if ( !empty($_REQUEST['uid']) )
+      $dbUser = dbFetchOne('SELECT * FROM Users WHERE Id=?', NULL, array($_REQUEST['uid']));
+    else
+      $dbUser = array();
+
+    $types = array();
+    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
+
+    if ( $_REQUEST['newUser']['Password'] )
+      $changes['Password'] = 'Password = password('.dbEscape($_REQUEST['newUser']['Password']).')';
+    else
+      unset($changes['Password']);
+
+    if ( count($changes) ) {
+      if ( !empty($_REQUEST['uid']) ) {
+        dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
+        # If we are updating the logged in user, then update our session user data.
+        if ( $user and ( $dbUser['Username'] == $user['Username'] ) )
+          userLogin($dbUser['Username'], $dbUser['Password']);
+      } else {
+        dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
+      }
+      $refreshParent = true;
+    }
+    $view = 'none';
+  } else if ( ZM_USER_SELF_EDIT and ( $_REQUEST['uid'] == $user['Id'] ) ) {
+    $uid = $user['Id'];
+
+    $dbUser = dbFetchOne('SELECT Id, Password, Language FROM Users WHERE Id = ?', NULL, array($uid));
+
+    $types = array();
+    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
+
+    if ( !empty($_REQUEST['newUser']['Password']) )
+      $changes['Password'] = 'Password = password('.dbEscape($_REQUEST['newUser']['Password']).')';
+    else
+      unset($changes['Password']);
+    if ( count($changes) ) {
+      dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
+      $refreshParent = true;
+    }
+    $view = 'none';
+  }
+} // end if $action == user
+?>
diff --git a/web/includes/actions/version.php b/web/includes/actions/version.php
new file mode 100644
index 000000000..0e89b2457
--- /dev/null
+++ b/web/includes/actions/version.php
@@ -0,0 +1,52 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// System edit actions
+if ( !canEdit('System') ) {
+  Warning("Need System permissions to update version");
+  return;
+}
+if ( $action == 'version' && isset($_REQUEST['option']) ) {
+  $option = $_REQUEST['option'];
+  switch( $option ) {
+  case 'go' :
+    // Ignore this, the caller will open the page itself
+    break;
+  case 'ignore' :
+    dbQuery("UPDATE Config SET Value = '".ZM_DYN_LAST_VERSION."' WHERE Name = 'ZM_DYN_CURR_VERSION'");
+    break;
+  case 'hour' :
+  case 'day' :
+  case 'week' :
+    $nextReminder = time();
+    if ( $option == 'hour' ) {
+      $nextReminder += 60*60;
+    } elseif ( $option == 'day' ) {
+      $nextReminder += 24*60*60;
+    } elseif ( $option == 'week' ) {
+      $nextReminder += 7*24*60*60;
+    }
+    dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
+    break;
+  case 'never' :
+    dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_CHECK_FOR_UPDATES'");
+    break;
+  } // end switch (option)
+}
diff --git a/web/includes/actions/zone.php b/web/includes/actions/zone.php
new file mode 100644
index 000000000..692dcf11d
--- /dev/null
+++ b/web/includes/actions/zone.php
@@ -0,0 +1,81 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Monitor edit actions, require a monitor id and edit permissions for that monitor
+if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
+  $mid = validInt($_REQUEST['mid']);
+  if ( $action == 'zone' && isset($_REQUEST['zid']) ) {
+    $zid = validInt($_REQUEST['zid']);
+    $monitor = dbFetchOne('SELECT * FROM Monitors WHERE Id=?', NULL, array($mid));
+
+    if ( !empty($zid) ) {
+      $zone = dbFetchOne('SELECT * FROM Zones WHERE MonitorId=? AND Id=?', NULL, array($mid, $zid));
+    } else {
+      $zone = array();
+    }
+
+    if ( $_REQUEST['newZone']['Units'] == 'Percent' ) {
+      $_REQUEST['newZone']['MinAlarmPixels'] = intval(($_REQUEST['newZone']['MinAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
+      $_REQUEST['newZone']['MaxAlarmPixels'] = intval(($_REQUEST['newZone']['MaxAlarmPixels']*$_REQUEST['newZone']['Area'])/100);
+      if ( isset($_REQUEST['newZone']['MinFilterPixels']) )
+        $_REQUEST['newZone']['MinFilterPixels'] = intval(($_REQUEST['newZone']['MinFilterPixels']*$_REQUEST['newZone']['Area'])/100);
+      if ( isset($_REQUEST['newZone']['MaxFilterPixels']) )
+        $_REQUEST['newZone']['MaxFilterPixels'] = intval(($_REQUEST['newZone']['MaxFilterPixels']*$_REQUEST['newZone']['Area'])/100);
+      if ( isset($_REQUEST['newZone']['MinBlobPixels']) )
+        $_REQUEST['newZone']['MinBlobPixels'] = intval(($_REQUEST['newZone']['MinBlobPixels']*$_REQUEST['newZone']['Area'])/100);
+      if ( isset($_REQUEST['newZone']['MaxBlobPixels']) )
+        $_REQUEST['newZone']['MaxBlobPixels'] = intval(($_REQUEST['newZone']['MaxBlobPixels']*$_REQUEST['newZone']['Area'])/100);
+    }
+
+    unset( $_REQUEST['newZone']['Points'] );
+
+    # convert these fields to integer e.g. NULL -> 0
+    $types = array(
+        'OverloadFrames' => 'integer',
+        'ExtendAlarmFrames' => 'integer',
+        );
+
+    $changes = getFormChanges($zone, $_REQUEST['newZone'], $types);
+
+    if ( count($changes) ) {
+      if ( $zid > 0 ) {
+        dbQuery('UPDATE Zones SET '.implode(', ', $changes).' WHERE MonitorId=? AND Id=?', array($mid, $zid));
+      } else {
+        dbQuery('INSERT INTO Zones SET MonitorId=?, '.implode(', ', $changes), array($mid));
+      }
+      if ( daemonCheck() && ($monitor['Type'] != 'WebSite') ) {
+        if ( $_REQUEST['newZone']['Type'] == 'Privacy' ) {
+          zmaControl($monitor, 'stop');
+          zmcControl($monitor, 'restart');
+          zmaControl($monitor, 'start');
+        } else {
+          zmaControl($monitor, 'restart');
+        }
+      }
+      if ( ($_REQUEST['newZone']['Type'] == 'Privacy') && $monitor['Controllable'] ) {
+        require_once('control_functions.php');
+        sendControlCommand($mid, 'quit');
+      }
+      $refreshParent = true;
+    }
+    $view = 'none';
+  } // end if action 
+} // end if $mid and canEdit($mid)
+?>
diff --git a/web/includes/actions/zones.php b/web/includes/actions/zones.php
new file mode 100644
index 000000000..f7ee15c9d
--- /dev/null
+++ b/web/includes/actions/zones.php
@@ -0,0 +1,49 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
+  $mid = validInt($_REQUEST['mid']);
+  $monitor = new Monitor($mid);
+  
+  if ( $action == 'delete' ) {
+    if ( isset($_REQUEST['markZids']) ) {
+      $restart_zmc = 0;
+      foreach ( $_REQUEST['markZids'] as $markZid ) {
+
+        if ( ! $restart_zmc ) {
+          $zone = dbFetchOne('SELECT * FROM Zones WHERE Id=?', NULL, array($markZid));
+          if ( $zone['Type'] == 'Privacy' ) {
+            $restart_zmc = 1;
+          }
+        }
+        dbQuery('DELETE FROM Zones WHERE MonitorId=? AND Id=?', array($mid, $markZid));
+      }
+      if ( daemonCheck() && $monitor->Type() != 'WebSite' ) {
+        zmaControl($mid, 'stop');
+        if ( $restart_zmc )
+          zmcControl($mid, 'restart');
+        zmaControl($mid, 'start');
+      } // end if daemonCheck()
+      $refreshParent = true;
+    } // end if isset($_REQUEST['markZids'])
+  } // end if action 
+} // end if $mid and canEdit($mid)
+
+?>
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 08185146e..4b18e3237 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -608,6 +608,11 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
           }
         }
         break;
+      case 'integer' :
+        if ( (!isset($values[$key])) or $values[$key] != $value ) {
+          $changes[$key] = $key . ' = '.intval($value);
+        }
+        break;
       default :
         {
           if ( !isset($values[$key]) || ($values[$key] != $value) ) {
@@ -845,13 +850,7 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
 }
 
 function viewImagePath( $path, $querySep='&amp;' ) {
-  if ( strncmp( $path, ZM_DIR_IMAGES, strlen(ZM_DIR_IMAGES) ) == 0 ) {
-    // Thumbnails
-    return( $path );
-  } elseif ( strpos( ZM_DIR_EVENTS, '/' ) === 0 ) {
-    return( '?view=image'.$querySep.'path='.$path );
-  }
-  return( ZM_DIR_EVENTS.'/'.$path );
+  return( '?view=image'.$querySep.'path='.$path );
 }
 
 function createListThumbnail( $event, $overwrite=false ) {
@@ -2349,4 +2348,23 @@ if ( !function_exists('ftok') ) {
   }
 }
 
+function getAffectedIds( $name ) {
+  $names = $name.'s';
+  $ids = array();
+	if ( isset($_REQUEST[$names]) ) {
+		if ( is_array($_REQUEST[$names]) ) {
+			$ids = $_REQUEST[$names];
+		} else {
+			$ids = array($_REQUEST[$names]);
+		}
+	} else if ( isset($_REQUEST[$name]) ) {
+		if ( is_array($_REQUEST[$name]) ) {
+			$ids = $_REQUEST[$name];
+		} else {
+			$ids = array($_REQUEST[$name]);
+		}
+	}
+	return $ids;
+}
+
 ?>
diff --git a/web/index.php b/web/index.php
index bd80f1d89..ef55a81d6 100644
--- a/web/index.php
+++ b/web/index.php
@@ -164,8 +164,8 @@ $running = null;
 CORSHeaders();
 
 // Check for valid content dirs
-if ( !is_writable(ZM_DIR_EVENTS) || !is_writable(ZM_DIR_IMAGES) ) {
-  Warning("Cannot write to content dirs('".ZM_DIR_EVENTS."','".ZM_DIR_IMAGES."').  Check that these exist and are owned by the web account user");
+if ( !is_writable(ZM_DIR_EVENTS) ) {
+  Warning("Cannot write to event folder ".ZM_DIR_EVENTS.". Check that it exists and is owned by the web account user.");
 }
 
 # Globals
@@ -210,7 +210,14 @@ if (
 }
 
 # Need to include actions because it does auth
-require_once('includes/actions.php');
+if ( $action ) {
+  if ( file_exists('includes/actions/'.$view.'.php') ) {
+    Logger::Debug("Including includes/actions/$view.php");
+    require_once('includes/actions/'.$view.'.php');
+  } else {
+    Warning("No includes/actions/$view.php for action $action");
+  }
+}
 
 # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in.
 if ( ZM_OPT_USE_AUTH and !isset($user) ) {
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 1f2d17e2e..5526be753 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -882,10 +882,6 @@ $OLANG = array(
         'Prompt' => "Directorul &#238;n care sunt stocate evenimentele",
         'Help' => "Acesta este subdirectorul &#238;n care sunt salvate imaginile generate de evenimente &#351;i alte fi&#351;iere. Implicit este un subdirector al directorului r&#259;d&#259;cina zoneminder; dac&#259; spa&#355;iul nu v&#259; permite pute&#355;i s&#259; stoca&#355;i imaginile pe alt&#259; parti&#355;ie, caz &#238;n care ar trebui s&#259; face&#355;i un link la subdirectorul implicit."
     ),
-    'DIR_IMAGES' => array(
-        'Prompt' => "Directorul &#238;n care sunt stocate imaginile",
-        'Help' => "ZoneMinder genereaz&#259; multe imagini, majoritate asociate cu evenimente. &#206;n acest director vor fi stocate imaginile neasociate evenimentelor."
-    ),
     'DIR_SOUNDS' => array(
         'Prompt' => "Directorul cu sunetele care pot fi folosite de ZoneMinder",
         'Help' => "ZoneMinder poate rula un sunet atunci c&#226;nd este detectat&#259; o alarm&#259;. Acesta este directorul &#238;n care este stocat sunetul care va fi rulat."
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 07bda5aaf..2ea5e48ab 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -38,6 +38,7 @@ ob_end_clean();
 
 $monIdx = 0;
 $monitors = array();
+$monitor = NULL;
 foreach( $displayMonitors as &$row ) {
   if ( $row['Function'] == 'None' )
     continue;
diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php
index bad9a18bc..388c7cfb2 100644
--- a/web/skins/classic/views/eventdetail.php
+++ b/web/skins/classic/views/eventdetail.php
@@ -18,14 +18,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'Events' ) ) {
+if ( !canEdit('Events') ) {
   $view = 'error';
   return;
 }
 if ( isset($_REQUEST['eid']) ) {
   $mode = 'single';
   $eid = validInt($_REQUEST['eid']);
-  $newEvent = dbFetchOne( 'SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid) );
+  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
 } elseif ( isset($_REQUEST['eids']) ) {
   $mode = 'multi';
   $sql = 'SELECT E.* FROM Events AS E WHERE ';
@@ -33,10 +33,10 @@ if ( isset($_REQUEST['eid']) ) {
   $sqlValues = array();
   foreach ( $_REQUEST['eids'] as $eid ) {
     $sqlWhere[] = 'E.Id = ?';
-    $sqlValues[] = $eid;
+    $sqlValues[] = validInt($eid);
   }
-  unset( $eid );
-  $sql .= join( " or ", $sqlWhere );
+  unset($eid);
+  $sql .= join(' OR ', $sqlWhere);
   foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
     if ( !isset($newEvent) ) {
       $newEvent = $row;
@@ -75,27 +75,24 @@ if ( $mode == 'single' ) {
     </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="eventdetail"/>
+        <input type="hidden" name="view" value="<?php echo $view ?>"/>
 <?php
 if ( $mode == 'single' ) {
 ?>
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="eventdetail"/>
-        <input type="hidden" name="eid" value="<?php echo $eid ?>"/>
+        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
 <?php
-} elseif ( $mode = 'multi' ) {
+} else if ( $mode = 'multi' ) {
 ?>
-        <input type="hidden" name="view" value="none"/>
-        <input type="hidden" name="action" value="eventdetail"/>
 <?php
     foreach ( $_REQUEST['eids'] as $eid ) {
 ?>
-        <input type="hidden" name="markEids[]" value="<?php echo validHtmlStr($eid) ?>"/>
+        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
 <?php
     }
 }
 ?>
-        <table id="contentTable" class="major" cellspacing="0">
+        <table id="contentTable" class="major">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Cause') ?></th>
@@ -108,8 +105,10 @@ if ( $mode == 'single' ) {
           </tbody>
         </table>
         <div id="contentButtons">
-          <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()"/>
+          <button type="submit" value="Save" <?php echo !canEdit('Events') ? ' disabled="disabled"' : '' ?>>
+          <?php echo translate('Save') ?>
+          </button>
+          <button type="button" onclick="closeWindow()"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index d765e445f..49fb558b2 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -39,7 +39,6 @@ xhtmlHeaders(__FILE__, translate('Group').' - '.$newGroup->Name());
     <div id="content">
       <form name="groupForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="group"/>
         <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
         <table id="contentTable" class="major">
           <tbody>
@@ -119,7 +118,7 @@ echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('on
           </tbody>
         </table>
         <div id="contentButtons">
-          <button type="submit" name="saveBtn" value="Save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>>
+          <button type="submit" name="action" value="Save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>>
           <?php echo translate('Save') ?>
           </button>
           <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 007f17456..c56a246f6 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -51,8 +51,8 @@ function deleteEvents( element, name ) {
   }
   var form = element.form;
   var count = 0;
-  for (var i = 0; i < form.elements.length; i++) {
-    if (form.elements[i].name.indexOf(name) == 0) {
+  for (var i = 0, len=form.elements.length; i < len; i++) {
+    if ( form.elements[i].name.indexOf(name) == 0 ) {
       if ( form.elements[i].checked ) {
         count++;
         break;
@@ -60,7 +60,7 @@ function deleteEvents( element, name ) {
     }
   }
   if ( count > 0 ) {
-    if ( confirm( confirmDeleteEventsString ) ) {
+    if ( confirm(confirmDeleteEventsString) ) {
       form.elements['action'].value = 'delete';
       form.submit();
     }
@@ -74,14 +74,14 @@ function editEvents( element, name ) {
   }
   var form = element.form;
   var eids = new Array();
-  for (var i = 0; i < form.elements.length; i++) {
-    if (form.elements[i].name.indexOf(name) == 0) {
+  for (var i = 0, len=form.elements.length; i < len; i++) {
+    if ( form.elements[i].name.indexOf(name) == 0 ) {
       if ( form.elements[i].checked ) {
         eids[eids.length] = 'eids[]='+form.elements[i].value;
       }
     }
   }
-  createPopup( '?view=eventdetail&'+eids.join( '&' ), 'zmEventDetail', 'eventdetail' );
+  createPopup('?view=eventdetail&'+eids.join('&'), 'zmEventDetail', 'eventdetail');
 }
 
 function downloadVideo( element, name ) {
diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index aad114325..9c4789e4e 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -117,21 +117,12 @@ function getImageSource( monId, time ) {
     Event = events[Frame.EventId];
 
     var storage = Storage[Event.StorageId];
-    var server = storage.ServerId ? Servers[storage.ServerId] : Servers[serverId];
-    if ( server ) {
-      return server.url() +
-      //location.protocol + '//' + server.Hostname + 
-        //'/cgi-bin/zms?mode=jpeg&replay=single&event=' + event_id +
-        //'&frame='+Frame.FrameId +
-        '/index.php?view=image&eid=' + Frame.EventId + '&fid='+Frame.FrameId +
-        "&width=" + monitorCanvasObj[monId].width + 
-        "&height=" + monitorCanvasObj[monId].height;
-    }
-    console.log("No server found for " + ( storage.ServerId ? storage.ServerId : serverId ));
-    //console.log("No storage found for " + eStorageId[i] );
-    return '/zm/index.php?view=image&eid=' + Frame.EventId + '&fid='+frame_id + "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
-    //return "/cgi-bin/zms?mode=single&replay=single&event=" + Frame.EventId + '&time='+time+ "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
-    //return "/cgi-bin/zms?mode=jpeg&replay=single&event=" + Frame.EventId + '&frame='+frame_id + "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
+    // monitorServerId may be 0, which gives us the default Server entry
+    var server = storage.ServerId ? Servers[storage.ServerId] : Servers[monitorServerId[monId]];
+    return server.PathToIndex() +
+	    '?view=image&eid=' + Frame.EventId + '&fid='+Frame.FrameId +
+	    "&width=" + monitorCanvasObj[monId].width + 
+	    "&height=" + monitorCanvasObj[monId].height;
   } // end found Frame
   return '';
   //return "no data";
diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index 2afab05d3..1e91a8b23 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -18,7 +18,7 @@ var speedIndex=<?php echo $speedIndex?>;
 // for history, and fps for live, and dynamically determined (in ms)
 
 var currentDisplayInterval=<?php echo $initialDisplayInterval?>;
-var playSecsperInterval=1;         // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
+var playSecsperInterval=1;       // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live)
 var timerInterval;               // milliseconds between interrupts
 var timerObj;                    // object to hold timer interval;
 var freeTimeLastIntervals=[];    // Percentage of current interval used in loading most recent image
@@ -35,7 +35,7 @@ var timeLabelsFractOfRow = 0.9;
 
 $index = 0;
 $anyAlarms = false;
-$maxScore=0;
+$maxScore = 0;
 
 if ( !$liveMode ) {
   $result = dbQuery($eventsSql);
@@ -123,12 +123,18 @@ foreach ( Storage::find() as $Storage ) {
   echo 'Storage[' . $Storage->Id() . '] = ' . json_encode($Storage). ";\n";
 }
 echo "\nvar Servers = [];\n";
+// Fall back to get Server paths, etc when no using multi-server mode
+$Server = new Server();
+echo 'Servers[0] = new Server(' . json_encode($Server). ");\n";
 foreach ( Server::find() as $Server ) {
   echo 'Servers[' . $Server->Id() . '] = new Server(' . json_encode($Server). ");\n";
 }
+
+
 echo '
 var monitorName = [];
 var monitorLoading = [];
+var monitorServerId = [];
 var monitorImageObject = [];
 var monitorImageURL = [];
 var monitorLoadingStageURL = [];
@@ -164,6 +170,7 @@ foreach ( $monitors as $m ) {
   echo "  monitorWidth["           . $m->Id() . "]=" . $m->Width() . ";\n";
   echo "  monitorHeight["          . $m->Id() . "]=" . $m->Height() . ";\n";
   echo "  monitorIndex["           . $m->Id() . "]=" . $numMonitors . ";\n";
+  echo "  monitorServerId["        . $m->Id() . "]='" .($m->ServerId() ?  $m->ServerId() : '0'). "';\n";
   echo "  monitorName["            . $m->Id() . "]=\"" . $m->Name() . "\";\n";
   echo "  monitorLoadStartTimems[" . $m->Id() . "]=0;\n";
   echo "  monitorLoadEndTimems["   . $m->Id() . "]=0;\n";
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index e24cac8b7..f8d0fcc92 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -347,6 +347,7 @@ function updateX( index ) {
   zone['Points'][index].x = x;
   var Point = $('zonePoly').points.getItem(index);
   Point.x = x;
+  updateArea();
 }
 
 function updateY( index ) {
@@ -359,6 +360,7 @@ function updateY( index ) {
   zone['Points'][index].y = y;
   var Point = $('zonePoly').points.getItem(index);
   Point.y = y;
+  updateArea();
 }
 
 function saveChanges( element ) {
diff --git a/web/views/image.php b/web/views/image.php
index 16c88f908..d9b740059 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -103,7 +103,7 @@ if ( empty($_REQUEST['path']) ) {
       if ( !$Frame )
         $Frame = Frame::find_one(array('EventId'=>$_REQUEST['eid']));
       if ( !$Frame ) {
-        Warning("No frame found for event " + $_REQUEST['eid']);
+        Warning('No frame found for event ' . $_REQUEST['eid']);
         $Frame = new Frame();
         $Frame->Delta(1);
         $Frame->FrameId('snapshot');