diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
index 772d95f21..60e8574f1 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/fw_log.volt
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
     'use strict';
 
     $( document ).ready(function() {
-        var field_type_icons = {'pass': 'fa-play', 'block': 'fa-ban', 'in': 'fa-arrow-right', 'out': 'fa-arrow-left', 'rdr': 'fa-exchange' }
+        var field_type_icons = {'pass': 'fa-play', 'block': 'fa-ban', 'in': 'fa-arrow-right', 'out': 'fa-arrow-left', 'rdr': 'fa-exchange' };
         var interface_descriptions = {};
         let hostnameMap = {};
 
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
         function reverse_lookup() {
             let to_fetch = [];
              $(".address").each(function(){
-                let address = $(this).data('address')
+                let address = $(this).data('address');
                 if (!hostnameMap.hasOwnProperty(address) && !to_fetch.includes(address)) {
                     to_fetch.push(address);
                 }
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
                           $(this).removeClass('address');
                     }
                 });
-            }
+            };
             if (to_fetch.length > 0) {
                 ajaxGet('/api/diagnostics/dns/reverse_lookup', { 'address': to_fetch }, function(data, status) {
                     $.each(to_fetch, function(index, address) {
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/netflow.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/netflow.volt
index 96e77420e..af5a472af 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/netflow.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/netflow.volt
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
         $("#act_refresh_cache_stats").click(function(){
             ajaxGet('/api/diagnostics/netflow/cacheStats', {}, function(data, status) {
-                var html = []
+                var html = [];
                 // convert to plain Array
                 var data_arr = $.makeArray(data)[0];
                 // sort by flow
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt
index 66737514c..1f08de73b 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt
@@ -372,10 +372,10 @@ POSSIBILITY OF SUCH DAMAGE.
                             grid_details();
                         }
                     });
-                    chart.legend.margin({top: 0, right: 0, left: 0, bottom: 20})
+                    chart.legend.margin({top: 0, right: 0, left: 0, bottom: 20});
                     return chart;
                   });
-              }
+              };
               if ($("#reverse_lookup").is(':checked')) {
                   var addresses = [];
                   data.map(function(item){
@@ -475,7 +475,7 @@ POSSIBILITY OF SUCH DAMAGE.
         ajaxGet('/api/diagnostics/networkinsight/top/FlowSourceAddrDetails/'+time_url+'/service_port,protocol,if,src_addr,dst_addr/octets/100/',
             {'filter_field': filters['filter_field'].join(','), 'filter_value': filters['filter_value'].join(',')}, function(data, status){
             if (status == 'success'){
-                let html = []
+                let html = [];
                 // count total traffic
                 let grand_total = 0;
                 data.map(function(item){
diff --git a/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt b/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
index b2d851c95..deaa38316 100644
--- a/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/IDS/index.volt
@@ -430,7 +430,7 @@ POSSIBILITY OF SUCH DAMAGE.
                                                 alert_enabled.prop('checked', true);
                                             }
                                             $.each(rule_data.action, function(key, value){
-                                                var opt = $('<option/>').attr("value", key).text(value.value)
+                                                var opt = $('<option/>').attr("value", key).text(value.value);
                                                 if (value.selected == 1) {
                                                     opt.attr('selected', 'selected');
                                                 }
@@ -493,7 +493,7 @@ POSSIBILITY OF SUCH DAMAGE.
                     }
                 );
             }
-        })
+        });
 
 
 
diff --git a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
index 6d9b2cef9..086510cc6 100644
--- a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
@@ -83,9 +83,9 @@ POSSIBILITY OF SUCH DAMAGE.
                             if ('rows' in response) {
                                 for (var i = 0; i < response.rowCount; i++) {
                                     response.rows[i]['displaysrc'] = {'not':response.rows[i].source_not == '1',
-                                                                      'val':response.rows[i].source}
+                                                                      'val':response.rows[i].source};
                                     response.rows[i]['displaydst'] = {'not':response.rows[i].destination_not == '1',
-                                                                      'val':response.rows[i].destination}
+                                                                      'val':response.rows[i].destination};
                                 }
                             }
                             return response;
diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 3a71e9eb0..eae78c4a5 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -120,7 +120,7 @@
                         $("#menu_search_box").typeahead({
                             source: menusearch_items,
                             matcher: function (item) {
-                                var ar = this.query.trim()
+                                var ar = this.query.trim();
                                 if (ar == "") {
                                     return false;
                                 }
diff --git a/src/opnsense/www/js/opnsense_bootgrid_plugin.js b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
index 5f225575e..b47dd0b9b 100644
--- a/src/opnsense/www/js/opnsense_bootgrid_plugin.js
+++ b/src/opnsense/www/js/opnsense_bootgrid_plugin.js
@@ -95,7 +95,7 @@ function stdBootgridUI(obj, sourceUrl, options) {
             });
         });
 
-    })
+    });
 
     return grid;
 }
diff --git a/src/www/firewall_rules.php b/src/www/firewall_rules.php
index 1ea35c7c7..5911e85b8 100644
--- a/src/www/firewall_rules.php
+++ b/src/www/firewall_rules.php
@@ -262,7 +262,7 @@ $( document ).ready(function() {
               selected_values = [];
               return false;
           }
-      })
+      });
       $(".rule").each(function(){
           // save zebra color
           if ( $(this).children(0).css("background-color") != 'transparent') {
diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php
index 20ef41d2e..28d2d6b4a 100644
--- a/src/www/firewall_schedule_edit.php
+++ b/src/www/firewall_schedule_edit.php
@@ -575,7 +575,7 @@ function addTimeRange(){
 
 
     //get time specified
-    starttimehour =  document.getElementById("starttimehour").value
+    starttimehour =  document.getElementById("starttimehour").value;
     starttimemin = document.getElementById("starttimemin").value;
     stoptimehour = document.getElementById("stoptimehour").value;
     stoptimemin = document.getElementById("stoptimemin").value;
@@ -587,7 +587,7 @@ function addTimeRange(){
     + stoptimemin;
 
     //get description for time range
-    tempdescr = document.getElementById("timerangedescr").value
+    tempdescr = document.getElementById("timerangedescr").value;
 
     if (nonrepeatingfound){
       nrtempTime += nrtempID;
diff --git a/src/www/head.inc b/src/www/head.inc
index 94e700b54..cbfa2ae06 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -211,7 +211,7 @@ $pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $conf
               $("#menu_search_box").typeahead({
                   source: menusearch_items,
                   matcher: function (item) {
-                      var ar = this.query.trim()
+                      var ar = this.query.trim();
                       if (ar == "") {
                           return false;
                       }
diff --git a/src/www/index.php b/src/www/index.php
index d046cd1a7..a0f56270e 100644
--- a/src/www/index.php
+++ b/src/www/index.php
@@ -235,7 +235,7 @@ include("fbegin.inc");?>
           if ($(this).data('callback') != undefined) {
               callbacks.push({'function' : $(this).data('callback'), 'plugin': $(this).data('plugin'), 'sender': $(this)});
           }
-      })
+      });
       // collect data for provided plugins
       $.ajax("/widgets/api/get.php",{type: 'get', cache: false, dataType: "json", data: {'load': plugins.join(',')}})
         .done(function(response) {
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index 09d2d436e..f289f2c0e 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -1440,7 +1440,7 @@ include("head.inc");
 
       //
       $("#type").change(function(){
-          $('#staticv4, #dhcp, #pppoe, #pptp, #ppp').hide()
+          $('#staticv4, #dhcp, #pppoe, #pptp, #ppp').hide();
           $("#rfc3118").hide();
           if ($("#type").val() == "dhcp" || $("#type6").val() == "dhcp6") {
              $("#rfc3118").show();
diff --git a/src/www/interfaces_ppps_edit.php b/src/www/interfaces_ppps_edit.php
index b83bce624..85b8e6e5f 100644
--- a/src/www/interfaces_ppps_edit.php
+++ b/src/www/interfaces_ppps_edit.php
@@ -325,7 +325,7 @@ include("head.inc");
         $("#show_advanced").click(function(){
             $(".act_show_advanced").show();
             $("#show_advanced_opt").hide();
-        })
+        });
 
         // ppp -> country change
         $("#country").change(function(){
diff --git a/src/www/javascript/opnsense_legacy.js b/src/www/javascript/opnsense_legacy.js
index 0d183554c..1e3a08550 100644
--- a/src/www/javascript/opnsense_legacy.js
+++ b/src/www/javascript/opnsense_legacy.js
@@ -137,7 +137,7 @@ function hook_stacked_form_tables(match)
                           ++index;
                       }
                   });
-              }
+              };
               $( window ).resize(root_node.do_resize);
               root_node.do_resize();
           }
diff --git a/src/www/services_ntpd_gps.php b/src/www/services_ntpd_gps.php
index 5ecbfde86..d30bac85d 100644
--- a/src/www/services_ntpd_gps.php
+++ b/src/www/services_ntpd_gps.php
@@ -88,14 +88,14 @@ include("head.inc");
         } else {
             $("#gpsselect").prop('checked', true);
         }
-    })
+    });
     $("#gpsselect").click(function(){
         if ($(this).prop('checked')) {
             $("#gpsprefer").prop('checked', false);
         } else {
             $("#gpsprefer").prop('checked', true);
         }
-    })
+    });
     $("#showgpsinitbox").click(function(event){
         $("#showgpsinitbox").parent().hide();
         $("#showgpsinit").show();
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index d897c074e..16a3dbd1c 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -160,7 +160,7 @@ include_once("head.inc");
             $(this).parent().parent().hide();
             $(".showadv").show();
             $(window).trigger('resize');
-        })
+        });
         // show advanced when option set
         if ($("#outgoing_interface").val() != '' || $("#custom_options").val() != '' || $("#enable_wpad").prop('checked')) {
             $("#show_advanced_dns").click();
diff --git a/src/www/status_graph.php b/src/www/status_graph.php
index ab701f890..7acdcf50f 100644
--- a/src/www/status_graph.php
+++ b/src/www/status_graph.php
@@ -251,7 +251,7 @@ include("head.inc");
                         })
                         .y(function(d) {
                             return y(d);
-                        })
+                        });
                     var svg = document.createElementNS(d3.ns.prefix.svg, 'g');
                     var graphIn = d3.select(svg).append("svg:svg")
                           .attr("width", w + m[1] + m[3] + "px")
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php
index a10d202ee..0cd3d34e8 100644
--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -591,7 +591,7 @@ if (empty($act)) {
                 $(".password_field").removeClass("has-warning");
                 $(".password_field").closest('div').removeClass('has-warning');
             }
-        }
+        };
         confirm_input.on('keyup', keyup_pass);
         password_input.on('keyup', keyup_pass);
 
diff --git a/src/www/widgets/widgets/ntp_status.widget.php b/src/www/widgets/widgets/ntp_status.widget.php
index 0b1b96a0d..463c54781 100644
--- a/src/www/widgets/widgets/ntp_status.widget.php
+++ b/src/www/widgets/widgets/ntp_status.widget.php
@@ -453,7 +453,7 @@ function clockUpdate()
 /*** End of Clock ***/
 //-->
   window.onload=clockInit(clockLocalStartTime, clockServerStartTime);clockOnLoad();
-  window.onunload=clockOnUnload()
+  window.onunload=clockOnUnload();
   clockUpdate();
 </script>
 
@@ -495,7 +495,7 @@ function clockUpdate()
         }
         function ntpstatuscallback(transport) {
           // The server returns formatted html code
-          var responseStringNtp = transport.responseText
+          var responseStringNtp = transport.responseText;
           jQuery('#ntpstatus').prop('innerHTML',responseStringNtp);
         }
         // Do the first status check 1 second after the dashboard opens
diff --git a/src/www/widgets/widgets/system_information.widget.php b/src/www/widgets/widgets/system_information.widget.php
index a6d7e4d92..505792b35 100644
--- a/src/www/widgets/widgets/system_information.widget.php
+++ b/src/www/widgets/widgets/system_information.widget.php
@@ -84,12 +84,12 @@ require_once("system.inc");
 
       var states_perc = parseInt((parseInt(data['kernel']['pf']['states']) / parseInt(data['kernel']['pf']['maxstates']))*100);
       $("#system_information_widget_states .progress-bar").css("width",  states_perc + "%").attr("aria-valuenow", states_perc + "%");
-      var states_text = states_perc + " % " + "( " + data['kernel']['pf']['states'] + "/" + data['kernel']['pf']['maxstates'] + " )"
+      var states_text = states_perc + " % " + "( " + data['kernel']['pf']['states'] + "/" + data['kernel']['pf']['maxstates'] + " )";
       $("#system_information_widget_states .state_text").html(states_text);
 
       var mbuf_perc = parseInt((parseInt(data['kernel']['mbuf']['total']) / parseInt(data['kernel']['mbuf']['max']))*100);
       $("#system_information_widget_mbuf .progress-bar").css("width",  mbuf_perc + "%").attr("aria-valuenow", mbuf_perc + "%");
-      var mbuf_text = mbuf_perc + " % " + "( " + data['kernel']['mbuf']['total'] + "/" + data['kernel']['mbuf']['max'] + " )"
+      var mbuf_text = mbuf_perc + " % " + "( " + data['kernel']['mbuf']['total'] + "/" + data['kernel']['mbuf']['max'] + " )";
       $("#system_information_widget_mbuf .state_text").html(mbuf_text);
 
       $("#system_information_widget_load").html(data['cpu']['load'].join(','));
@@ -97,7 +97,7 @@ require_once("system.inc");
       var mem_perc = parseInt(data['kernel']['memory']['used'] / data['kernel']['memory']['total']*100);
       $("#system_information_widget_memory .progress-bar").css("width",  mem_perc + "%").attr("aria-valuenow", mem_perc + "%");
       var mem_text = mem_perc + " % " + "( " + parseInt(data['kernel']['memory']['used']/1024/1024) + "/";
-      mem_text += parseInt(data['kernel']['memory']['total']/1024/1024) + " MB )"
+      mem_text += parseInt(data['kernel']['memory']['total']/1024/1024) + " MB )";
       $("#system_information_widget_memory .state_text").html(mem_text);
 
 
@@ -106,7 +106,7 @@ require_once("system.inc");
           var swap_perc = parseInt(data['disk']['swap']['used'] / data['disk']['swap']['total']*100);
           $("#system_information_widget_swap .progress-bar").css("width",  swap_perc + "%").attr("aria-valuenow", swap_perc + "%");
           var swap_text = swap_perc + " % " + "( " + parseInt(data['disk']['swap']['used']/1024) + "/";
-          swap_text += parseInt(data['disk']['swap']['total']/1024) + " MB )"
+          swap_text += parseInt(data['disk']['swap']['total']/1024) + " MB )";
           $("#system_information_widget_swap .state_text").html(swap_text);
           $("#system_information_widget_swap").show();
       } else {
diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index 182b4a5ac..2f87573e5 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -75,8 +75,8 @@
                       bps_in = 0;
                       bps_out = 0;
                   }
-                  chart_data_in[chart_data_keys[key]]['values'].push([traffic_graph_widget_data[i]['time']*1000, bps_in])
-                  chart_data_out[chart_data_keys[key]]['values'].push([traffic_graph_widget_data[i]['time']*1000, bps_out])
+                  chart_data_in[chart_data_keys[key]]['values'].push([traffic_graph_widget_data[i]['time']*1000, bps_in]);
+                  chart_data_out[chart_data_keys[key]]['values'].push([traffic_graph_widget_data[i]['time']*1000, bps_out]);
               }
           }
       }