diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index ce3386d58..63177cac7 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -769,27 +769,6 @@ int FfmpegCamera::CaptureAndRecord(
       return -1;
     }
 
-#if 0
-    if ( (packet.pts != AV_NOPTS_VALUE) && (packet.pts < -100000) ) {
-      // Ignore packets that have crazy negative pts.
-      // They aren't supposed to happen.
-      Warning("Ignore packet because pts %" PRId64 " is massively negative."
-         " Error count is %d", packet.pts, error_count);
-      dumpPacket(
-          mFormatContext->streams[packet.stream_index],
-          &packet,
-          "Ignored packet");
-      if ( error_count > 100 ) {
-        Error("Bad packet count over 100, going to close and re-open stream");
-        return -1;
-      }
-      error_count += 1;
-      continue;
-    }
-    // If we get a good frame, decrease the error count.. We could zero it...
-    if ( error_count > 0 ) error_count -= 1;
-#endif
-
     int keyframe = packet.flags & AV_PKT_FLAG_KEY;
     bytes += packet.size;
     dumpPacket(
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index 77658a9b6..382da1086 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -153,12 +153,8 @@ input,textarea,select,button,.btn-primary {
     background-color: #f8f8f8;
     text-align: left;
     border-radius:4px;
+    margin: 1px 0;
 }
-/*
-input[type=text], input[type=password], input[type="url"], textarea, select {
-    padding: 1px;
-}
-*/
 
 input.noborder {
     border: 0;
@@ -568,7 +564,7 @@ input[type=submit],
     border-color: #3498db;
     text-transform: uppercase;
     font-weight: 200;
-    padding: 5px 10px;
+    padding: 7px 10px 5px 10px;
     cursor: pointer;
     text-decoration: none;
     display: inline-block;
diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css
index d14f44267..a0f8960b9 100644
--- a/web/skins/classic/css/base/views/console.css
+++ b/web/skins/classic/css/base/views/console.css
@@ -74,7 +74,7 @@
 }
 
 .consoleTable .colMark {
-    width: 52px;
+    width: 32px;
     text-align: left;
 }
 
@@ -102,3 +102,15 @@
 #FunctionFunction {
   margin-bottom: 2rem;
 }
+
+.MonitorNameFilter,
+.FunctionFilter,
+.StatusFilter,
+.SourceFilter,
+.MonitorFilter {
+  display: inline-block;
+}
+.MonitorNameFilter input,
+.SourceFilter input {
+  padding: 3px 5px 4px 5px;
+}
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index b1a400a2b..bf41e6f8c 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -22,139 +22,47 @@
  */
 
 body {
-    font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
     color: #dddddd;
     background-color: #222222;
-    font-weight: normal;
-    text-align: center;
 }
 
 h1 {
-    font-family: inherit;
-    font-size: 120%;
     color: #10a4e8;
-    font-weight: bold;
-    text-align: center;
 }
 
 h2 {
-    font-family: inherit;
-    font-size: 110%;
     color: #10a4e8;
-    font-weight: bold;
 }
 
 h3 {
-    font-family: inherit;
-    font-size: 100%;
     color: #117AAd;
-    font-weight: bold;
 }
 
 h4 {
-    font-family: inherit;
-    font-size: 100%;
     color: #117AAd;
 }
 
 p {
-    font-family: inherit;
-    font-size: 100%;
     color: #dddddd;
-    font-weight: normal;
 }
 
 th {
-    font-weight: bold;
     color: #117AAd;
 }
 
-a:link {
-    color: #8f8fc2;
-    text-decoration: none;
-}
-
-a:visited {
-    color: #8f8fc2;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #7777aa;
-    text-decoration: underline;
-}
-
-label {
-    margin-right: 4px;
-}
-
-input,textarea,select,button,.btn-primary {
-    border: 1px #8f8fc2 solid !important;
-    padding: 10px;
-    border-radius: 2px;
-    font-family: inherit;
-    font-weight: 400;
-    font-size: 100%;
-    color: #eeeeee !important;
-    background-color: #444444 !important;
-}
-
-input[type=text], input[type=password], input[type="url"], textarea, select {
-    padding: 1px;
-}
-
-input.noborder {
-    border: 0;
-}
-
-
-img {
-  display: inline-block;
-}
-
 img.normal {
     border: #cccccc solid 1px;
 }
 
-img.alarm {
-    border: red solid 1px;
-}
-
 hr {
-    height: 1px;
-    width: 100%;
-    border: 0;
     color: #8f8fc2;
     background-color: #8f8fc2;
 }
 
-/*
- * Tabbed headings
- */
-ul.tabList {
-    float: left;
-    list-style: none;
-    padding: 0;
-    margin: 0 0 -4px 0;
-    white-space: nowrap;
-    text-align: left;
-}
-
 ul.tabList li {
-    float: left;
-    border: 1px solid;
     color: #8f8fc2;
     border: #8f8fc2 solid 1px;
-    border-bottom-width: 0;
-    margin: 0 2px 0 0;
     background: #444444;
-    text-align: center;
-    padding: 5px 10px;
-}
-
-ul.tabList li a {
-    text-decoration: none;
 }
 
 ul.tabList li:hover {
@@ -166,87 +74,17 @@ ul.tabList li.active {
     border-bottom: #8f8fc2 dotted 1px;
 }
 
-ul.tabList li.active a {
-    font-weight: bold;
-}
-
 /*
  * Major league table for multiple inputs or presentation
  */
 
-#content table.major {
-    margin: 4px auto;
-    width: 100%;
-    border-collapse: collapse;
-}
-
 #content table.major tr.highlight {
     color: #eeeeee;
     background-color: #000000;
 }
 
-#content table.major thead tr th {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major tfoot td {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
 #content table.major th, #content table.major td {
     border-bottom: 2px solid #8f8fc2;
-    padding: 5px 10px;
-    text-align: left;
-}
-
-#content table.major th {
-    vertical-align: bottom;
-}
-
-#content table.major td {
-    vertical-align: middle;
-}
-
-#content table.major th[scope=row] {
-    padding: 4px 3px 3px;
-    vertical-align: top;
-}
-
-#content table.major .colMark, #content table.major .colSelect {
-    text-align: center;
-}
-/*
- * Lesser table for very simple forms
- */
-
-#content table.minor {
-    width: 280px;
-    margin: 0 auto;
-}
-
-#content table.minor td {
-    padding: 4px;
-}
-
-#content table.minor .colLeft {
-    width: 50%;
-    text-align: right;
-}
-
-#content table.minor .colRight {
-    width: 50%;
-    text-align: left;
-}
-
-#content table.minor input[type=submit]
-{
-    margin-top: 8px;
-    padding: 0 2px;
-    font-size: 120%;
 }
 
 #content table > tbody > tr:hover
@@ -255,7 +93,6 @@ ul.tabList li.active a {
 }
 
 .overlay {
-    font-size: 11px;
     background-color: #222222;
 }
 
@@ -275,15 +112,6 @@ ul.tabList li.active a {
 
 fieldset {
     border: 1px solid #dddddd;
-    padding: 4px;
-    margin-bottom: 8px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-fieldset > legend {
-    padding: 0 2px;
 }
 
 /*
@@ -311,178 +139,18 @@ fieldset > legend {
     text-decoration: none;
 }
 
-/*
- * Generic useful classes, especially with mootools
- */
-
-.hidden {
-    display: none;
-}
-
-.invisible {
-    visibility: hidden;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-div.clear {
-    clear: both;
-}
-
-/*
-.table-th-sort {
-    font-style:italic;
-}
-
-td.table-td-sort {
-    font-style:italic;
-}
-*/
-
-th.table-th-sort {
-    margin-right: 12px;
-}
-
-th.table-th-sort span.table-th-sort-span {
-    float: right;
-    width: 12px;
-    height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
-}
-
-th.table-th-sort-rev span.table-th-sort-span {
-    float: right;
-    width: 12px;
-    height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
-}
-
 .table-tr-odd {
     background-color: #070707;
 }
 
-/*
- * Primary layout styles
- */
-
-#page {
-    width: 100%;
-}
-
 #header {
-    width: 100%;
-    line-height: 1;
-    text-align: left;
-    padding: 5px 20px;
-    margin: 0 auto 4px auto;
-    font-weight: 300;
     border-bottom: 1px solid #000000;
 }
 
-#header h2 {
-    left: 0;
+input {
+  background-color: rgb(68,68,68);
+  color: #999;
 }
-
-#header h2.floating {
-    float: left;
-}
-
-#headerControl {
-    text-align: center;
-    margin: 0 auto;
-}
-
-#headerButtons {
-    float: right;
-}
-
-#headerButtons a {
-    margin-left: 8px;
-}
-
-#headerButtons input {
-    margin-left: 4px;
-}
-
-#content {
-    width: 96%;
-    margin: 0 auto 8px auto;
-    line-height: 130%;
-    text-align: center;
-}
-
-#content p {
-    margin-top: 4px;
-}
-
-#content p.textblock {
-    text-align: justify;
-    padding: 4px;
-}
-
-#content p.textblock br {
-    margin-bottom: 8px;
-}
-
-/*
-#contentDiv {
-    margin: 0 auto 8px;
-    line-height: 140%;
-    text-align: center;
-}
-*/
-
-#content > input[type=submit], #content > input[type=button], #content > button {
-    margin-top: 8px;
-}
-
-#content table input[type=submit], #content table input[type=button], #content table button {
-    margin-top: 1px;
-}
-
-#contentButtons {
-    margin-top: 8px;
-    float: right;
-}
-
-#contentButtons button,
-#contentButtons input {
-    margin-left: 8px;
-    margin-bottom: 4px;
-}
-
-#footer {
-    width: 96%;
-    margin: 8px auto;
-}
-
-button,
-input[type=button],
-input[type=submit],
-.btn-primary,
-.btn-primary:link {
-  background-color: #444444;
-  color: #eeeeee;
-  border-color: #444444;
-  text-transform: uppercase;
-  font-weight: 200;
-  padding: 5px 10px;
-  cursor: pointer;
-  text-decoration: none;
-  display: inline-block;
-}
-
-button:hover,
-input[type=button]:hover,
-input[type=submit]:hover,
-.btn-primary:hover {
-  background-color: #555555;
-  border-color: #444444;
-}
-
-
 /* PP - make it easy to identify disabled buttons */
 
 button:disabled,
@@ -495,37 +163,15 @@ input[type=submit]:disabled,
   border-color: #666666;
 }
 
-.navbar{
+.navbar {
   margin-bottom: 0 !important;
   border-radius: 0;
   color: #03A9F4 !important;
 }
 
-.navbar-brand {
-  font-weight: bold;
-  font-size: 20px;
-}
-
-.container-fluid {
-  position: relative;
-}
-
 .sidebar {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  display: block;
-  padding: 0;
-  overflow-x: hidden;
-  overflow-y: auto;
   border-right: 1px solid #eeeeee;
-}
-
-.sidebar ul {
-  margin-right: 0;
-  margin-bottom: 20px;
-  margin-left: 0;
+  background-color: #222222;
 }
 
 .table {
@@ -543,7 +189,7 @@ input[type=submit]:disabled,
 }
 
 .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
-  color: #8f8fc2;
+  color: #ffa801;
   background-color: #333333;
 }
 
@@ -565,7 +211,6 @@ li.search-choice {
     background: linear-gradient(#555 20%,#464646 50%,#444 52%,#545454 100%) !important;
     background-color: #444444 !important;
     color: #eee !important;
-    border-color: #8f8fc2 !important;
     -webkit-box-shadow: none !important;
     background-image: none !important;
 }
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 8285a696e..0455c80c9 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -240,7 +240,7 @@ ob_start();
 ?>
             <th class="colZones"><a href="?view=zones"><?php echo translate('Zones') ?></a></th>
 <?php if ( canEdit('Monitors') ) { ?>
-            <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markMids[]" data-on-click-this="updateFormCheckboxesByName"/> <?php echo translate('All') ?></th>
+            <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markMids[]" data-on-click-this="updateFormCheckboxesByName"/></th>
 <?php } ?>
           </tr>
         </thead>