diff --git a/app/Config/OpenAudit.php b/app/Config/OpenAudit.php
index d900fc032..f063105a6 100755
--- a/app/Config/OpenAudit.php
+++ b/app/Config/OpenAudit.php
@@ -14,7 +14,7 @@ class OpenAudit extends BaseConfig
     public string $displayVersion = '5.1.0';
     public int $appVersion = 20240104;
 
-    public array $enterprise_collections = array('applications' => 'cud', 'baselines' => 'crud', 'baselines_policies' => 'crud', 'baselines_results' => 'crud', 'clouds' => 'crud', 'collectors' => 'crud', 'dashboards' => 'cud', 'discovery_scan_options' => 'cud', 'files' => 'crud', 'integrations' => 'crud', 'racks' => 'crud', 'roles' => 'cu');
+    public array $enterprise_collections = array('applications' => 'cud', 'baselines' => 'crud', 'baselines_policies' => 'crud', 'baselines_results' => 'crud', 'clouds' => 'crud', 'collectors' => 'crud', 'dashboards' => 'cud', 'discovery_scan_options' => 'cud', 'files' => 'crud', 'executables' => 'crud', 'integrations' => 'crud', 'racks' => 'crud', 'roles' => 'cu');
     public array $professional_collections = array('applications' => 'r', 'clusters' => 'crud', 'dashboards' => 'r', 'discovery_scan_options' => 'r', 'maps' => 'crud', 'rules' => 'crud', 'tasks' => 'crud', 'widgets' => 'crud');
     public float $microtime = 0;
     public int $collector_connect_timeout = 10;
@@ -32,6 +32,7 @@ class OpenAudit extends BaseConfig
     public string $server_os = '';
     public string $server_platform = '';
     public bool $advanced_queries = true;
+    public bool $executables = false;
 
     public function __set($key, $value)
     {
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 0439793ee..fa2a1f888 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -15,7 +15,7 @@
  */
 
 $collections = array('agents','applications','attributes','baselines','baselines_policies','baselines_results','clouds','clusters','collectors', 'components',
-'configuration','connections','credentials','dashboards','devices','discoveries','discovery_log','discovery_scan_options','errors','fields','files',
+'configuration','connections','credentials','dashboards','devices','discoveries','discovery_log','discovery_scan_options','errors','executables','fields','files',
 'groups','integrations','ldap_servers','licenses','locations','maps','networks','nmis','orgs','queries','queue','racks','rack_devices','reports','roles',
 'rules','scripts','summaries','support','tasks','users','widgets');
 
diff --git a/app/Controllers/Input.php b/app/Controllers/Input.php
index c72358969..85e70eb4e 100644
--- a/app/Controllers/Input.php
+++ b/app/Controllers/Input.php
@@ -54,7 +54,7 @@ public function devices()
         include "include_process_device.php";
         $discoveryLogModel = new \App\Models\DiscoveryLogModel();
         $log = new \stdClass();
-        $log->discovery_id = null;
+        $log->discovery_id = (!empty($device->system->discovery_id)) ? intval($device->system->discovery_id) : null;
         $log->device_id = $device->system->id;
         $log->timestamp = null;
         $log->severity = 7;
diff --git a/app/Controllers/Scripts.php b/app/Controllers/Scripts.php
index 4a74c15fe..c05933ec1 100644
--- a/app/Controllers/Scripts.php
+++ b/app/Controllers/Scripts.php
@@ -32,13 +32,15 @@ class Scripts extends BaseController
 {
     public function download($id)
     {
-        $id = intval($id);
         if (empty($this->scriptsModel)) {
             $this->scriptsModel = model('App\Models\ScriptsModel');
         }
         if (!is_numeric($id)) {
             $id = $this->scriptsModel->getByOs($id);
         }
+        if (is_numeric($id)) {
+            $id = intval($id);
+        }
         if (empty($id)) {
             return;
         }
diff --git a/app/Controllers/include_process_device.php b/app/Controllers/include_process_device.php
index 7318202a8..3ccdb5059 100644
--- a/app/Controllers/include_process_device.php
+++ b/app/Controllers/include_process_device.php
@@ -16,7 +16,7 @@
 helper('utility');
 
 $log = new \stdClass();
-$log->discovery_id = null;
+$log->discovery_id = (!empty($device->system->discovery_id)) ? intval($device->system->discovery_id) : null;
 $log->device_id = null;
 $log->timestamp = null;
 $log->severity = 7;
diff --git a/app/Helpers/components_helper.php b/app/Helpers/components_helper.php
index a3ae20540..4cf0ae68f 100644
--- a/app/Helpers/components_helper.php
+++ b/app/Helpers/components_helper.php
@@ -19,6 +19,9 @@ function match_columns($table)
     if ($table === 'dns') {
             $match_columns = array('ip', 'name', 'fqdn');
     }
+    if ($table === 'executable') {
+            $match_columns = array('full_name', 'hash', 'inode', 'last_changed');
+    }
     if ($table === 'file') {
             $match_columns = array('full_name', 'hash', 'inode', 'last_changed');
     }
diff --git a/app/Helpers/discoveries_helper.php b/app/Helpers/discoveries_helper.php
index 7f2460b50..935b7f0d3 100644
--- a/app/Helpers/discoveries_helper.php
+++ b/app/Helpers/discoveries_helper.php
@@ -66,7 +66,7 @@ function all_ip_list($discovery = null)
     function responding_ip_list($discovery = null)
     {
         if (is_null($discovery)) {
-            return false;
+            return array();
         }
         $discoveryLogModel = new \App\Models\DiscoveryLogModel();
 
@@ -88,8 +88,20 @@ function responding_ip_list($discovery = null)
         if ($discovery->scan_options->ping === 'y') {
             if (!empty($discovery->scan_options->exclude_ip)) {
                 $command = 'nmap -n -oG - -sP --exclude ' . $discovery->scan_options->exclude_ip . ' ' . $discovery->subnet;
+                // NOTE - Below should be faster than 'normal' Nmap
+                // $command = 'nmap -n -oG - -sP -T5 --min-parallelism 100 --max-parallelism 256  --exclude ' . $discovery->scan_options->exclude_ip . ' ' . $discovery->subnet;
             } else {
                 $command = 'nmap -n -oG - -sP ' . $discovery->subnet;
+                // NOTE - Below should be faster than 'normal' Nmap
+                // $command = 'nmap -n -oG - -sP -T5 --min-parallelism 100 --max-parallelism 256 ' . $discovery->subnet;
+                //
+                // NOTE - below is for Linux only and only in specific circumstances
+                //      - Fping doesn't have an exclude option
+                //      - Fping doesn't accept the same host formatting as Nmap, except for 1.2.3.4/5
+                // if (filter_var($discovery->subnet, FILTER_VALIDATE_IP)) {
+                //     $discovery->subnet = $discovery->subnet . '/32';
+                // }
+                // $command = 'fping -A -a -q -g -r 2 ' . $discovery->subnet . ' 2>&1';
             }
             if (php_uname('s') === 'Darwin') {
                 $command = '/usr/local/bin/' . $command;
@@ -103,13 +115,19 @@ function responding_ip_list($discovery = null)
                         $ip_addresses[] = $temp[1];
                     }
                 }
+                // Caters to a single responding IP on each line, for fping or Nmap with piping to cut, et al
+                // foreach ($output as $line) {
+                //     if (filter_var($line, FILTER_VALIDATE_IP)) {
+                //         $ip_addresses[] = $line;
+                //     }
+                // }
             } else {
                 if (php_uname('s') === 'Windows NT' and empty($output)) {
                     log_message('error', 'No response from Nmap. Is the Apache Service running as a normal user?');
                 }
                 $log->command_output = json_encode($output);
                 $discoveryLogModel->create($log);
-                return false;
+                return array();
             }
         } else {
             if (!empty($discovery->scan_options->exclude_ip)) {
@@ -131,7 +149,7 @@ function responding_ip_list($discovery = null)
                 }
             } else {
                 $discoveryLogModel->create($log);
-                return false;
+                return array();
             }
         }
         $log->command_output = 'Responding IPs: ' . @count($ip_addresses);
@@ -1807,7 +1825,7 @@ function ip_audit($ip_scan = null)
             $log->message = 'Matching device from audit result';
             $discoveryLogModel->create($log);
             $audit_device = deviceMatch($audit->system, intval($discovery->id), $discovery->match_options);
-            #$audit->system->discovery_id = $discovery->id;
+            $audit->system->discovery_id = $discovery->id;
             if (!empty($audit->system->id)) {
                 $log->device_id = $audit->system->id;
             }
@@ -1973,6 +1991,7 @@ function ip_audit($ip_scan = null)
             unset($device_json->system->original_last_seen);
             unset($device_json->system->id);
             unset($device_json->system->first_seen);
+            $device_json->system->discovery_id = $discovery->id;
             $device_json = json_encode($device_json);
 
             $url = $server->host . $server->community . '/index.php/input/devices';
@@ -1995,6 +2014,7 @@ function ip_audit($ip_scan = null)
                 // error
                 $log->severity = 4;
                 $log->message = 'Could not send result to ' . $url . ' - please check with your server administrator.';
+                $log->device_id = $device->id;
                 $discoveryLogModel->create($log);
                 $log->severity = 7;
                 log_message('error', 'Could not send result to ' . $url);
@@ -2002,6 +2022,7 @@ function ip_audit($ip_scan = null)
                 // success
                 $log->severity = 7;
                 $log->message = 'Result sent to ' . $server->host . '.';
+                $log->device_id = $device->id;
                 $discoveryLogModel->create($log);
                 log_message('debug', 'Result sent to ' . $server->host . '.');
             }
@@ -2021,6 +2042,7 @@ function ip_audit($ip_scan = null)
         $log->command_status = 'device complete';
         $log->command_time_to_execute = microtime(true)  - $start;
         $log->message = 'IP Audit finish on device ' . ip_address_from_db($device->ip);
+        $log->device_id = $device->id;
         $log->ip = ip_address_from_db($device->ip);
         $discoveryLogModel->create($log);
 
diff --git a/app/Helpers/response_helper.php b/app/Helpers/response_helper.php
index e67c76ab7..02b23894a 100644
--- a/app/Helpers/response_helper.php
+++ b/app/Helpers/response_helper.php
@@ -1498,7 +1498,7 @@ function response_valid_actions()
      */
     function response_valid_collections()
     {
-        return array('agents','applications','attributes','baselines','baselines_policies','baselines_results','chart','clouds','clusters','collectors','components','configuration','connections','credentials','dashboards','database','devices','discoveries','discovery_log','discovery_scan_options','errors','fields','files','groups','help','integrations','integrations_log','integrations_rules','ldap_servers','licenses','locations','logs','maps','networks','nmis','orgs','queries','queue','racks','rack_devices','reports','roles','rules','scripts','search','sessions','summaries','support','tasks','users','widgets');
+        return array('agents','applications','attributes','baselines','baselines_policies','baselines_results','chart','clouds','clusters','collectors','components','configuration','connections','credentials','dashboards','database','devices','discoveries','discovery_log','discovery_scan_options','errors','executables','fields','files','groups','help','integrations','integrations_log','integrations_rules','ldap_servers','licenses','locations','logs','maps','networks','nmis','orgs','queries','queue','racks','rack_devices','reports','roles','rules','scripts','search','sessions','summaries','support','tasks','users','widgets');
     }
 }
 
@@ -1532,7 +1532,7 @@ function response_valid_formats()
      */
     function response_valid_includes()
     {
-        return array('application', 'attachment', 'audit_log', 'bios', 'certificate', 'change_log', 'cluster', 'credential', 'discovery_log', 'disk', 'dns', 'edit_log', 'field', 'file', 'image', 'ip', 'location', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'purchase', 'rack_devices', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
+        return array('application', 'attachment', 'audit_log', 'bios', 'certificate', 'change_log', 'cluster', 'credential', 'discovery_log', 'disk', 'dns', 'edit_log', 'executable', 'field', 'file', 'image', 'ip', 'location', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'purchase', 'rack_devices', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
     }
 }
 
@@ -1588,7 +1588,7 @@ function response_valid_permissions($collection)
      */
     function response_valid_sub_resources()
     {
-        return array('application', 'attachment', 'audit_log', 'bios', 'certificate', 'change_log', 'cluster', 'credential', 'discovery', 'discovery_log', 'disk', 'dns', 'edit_log', 'field', 'image', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'partition_graph', 'policy', 'print_queue', 'processor', 'radio', 'route', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows', 'report', 'query', 'group');
+        return array('application', 'attachment', 'audit_log', 'bios', 'certificate', 'change_log', 'cluster', 'credential', 'discovery', 'discovery_log', 'disk', 'dns', 'edit_log', 'executable', 'field', 'image', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'partition_graph', 'policy', 'print_queue', 'processor', 'radio', 'route', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows', 'report', 'query', 'group');
     }
 }
 
diff --git a/app/Helpers/snmp_6876_2_helper.php b/app/Helpers/snmp_6876_2_helper.php
index e608d252f..7fbdf2532 100644
--- a/app/Helpers/snmp_6876_2_helper.php
+++ b/app/Helpers/snmp_6876_2_helper.php
@@ -41,6 +41,7 @@
         $guest->cpu = my_snmp_get($ip, $credentials, "1.3.6.1.4.1.6876.2.1.1.9.".$guest->vm_ident);
         $guest->status = my_snmp_get($ip, $credentials, "1.3.6.1.4.1.6876.2.1.1.6.".$guest->vm_ident);
         $guest->config_file = my_snmp_get($ip, $credentials, "1.3.6.1.4.1.6876.2.1.1.3.".$guest->vm_ident);
+        $guest->os = my_snmp_get($ip, $credentials, "1.3.6.1.4.1.6876.2.1.1.4.".$guest->vm_ident);
         $guest->vm_group = '';
         $guest->type = 'esx';
         $guests[] = $guest;
diff --git a/app/Helpers/snmp_helper.php b/app/Helpers/snmp_helper.php
index 0ca0e6833..0108e7b87 100644
--- a/app/Helpers/snmp_helper.php
+++ b/app/Helpers/snmp_helper.php
@@ -1634,8 +1634,7 @@ function snmp_audit(string $ip = '', object $credentials = null, int $discovery_
             $log->command_time_to_execute = (microtime(true) - $item_start);
             $log->message = 'Route count retrieval for '.$ip;
             $log->command = 'snmpwalk 1.3.6.1.2.1.4.24.3.0';
-            $temp = (!empty($route_count)) ? count($route_count) : 0;
-            $log->command_output = "Count is $temp";
+            $log->command_output = "Count is $route_count";
             $log->command_status = 'notice';
             if (!empty($route_count) && $route_count < $config_value) {
                 $retrieve_routes = 1;
diff --git a/app/Helpers/ssh_helper.php b/app/Helpers/ssh_helper.php
index fe7d269cd..b435c3881 100644
--- a/app/Helpers/ssh_helper.php
+++ b/app/Helpers/ssh_helper.php
@@ -605,7 +605,9 @@ function ssh_audit($parameters)
                 }
             } else if ($credential->type === 'ssh') {
                 log_message('debug', 'Testing credentials named: ' . $credential->name . ' on ' . $ip);
-                if ($ssh->login($credential->credentials->username, $credential->credentials->password)) {
+                // NOTE - Use @ below because some devices cause "Error reading from socket" and halt this process
+                // TODO - change to try / catch
+                if (@$ssh->login($credential->credentials->username, $credential->credentials->password)) {
                     $log->message = "Valid credentials named {$credential->name} used to log in to {$ip}.";
                     $log->command_status = 'success';
                     $discoveryLogModel->create($log);
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index 436fbcd23..fc38493d4 100644
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -643,6 +643,17 @@ function collections_list()
         $collections->discovery_scan_options->actions->professional = 'r';
         $collections->discovery_scan_options->actions->community = 'r';
 
+
+        $collections->executables = new \StdClass();
+        $collections->executables->icon = 'fa fa-file-code-o';
+        $collections->executables->name = 'Executables';
+        $collections->executables->edition = 'Enterprise';
+        $collections->executables->orgs = 'b';
+        $collections->executables->actions = new \stdClass();
+        $collections->executables->actions->enterprise = 'crud';
+        $collections->executables->actions->professional = '';
+        $collections->executables->actions->community = '';
+
         $collections->fields = new \StdClass();
         $collections->fields->icon = 'fa fa-comments-o';
         $collections->fields->name = 'Fields';
diff --git a/app/Models/ComponentsModel.php b/app/Models/ComponentsModel.php
index 1ae642417..4d28d6a52 100644
--- a/app/Models/ComponentsModel.php
+++ b/app/Models/ComponentsModel.php
@@ -47,7 +47,7 @@ public function collection(object $resp): array
         }
         if ($table === '') {
             // No components.type requested, return all the below
-            $tables = array('bios', 'certificate', 'disk', 'dns', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
+            $tables = array('bios', 'certificate', 'disk', 'dns', 'executable', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
         }
         $orgs = array();
         $count = count($resp->meta->filter);
@@ -67,7 +67,7 @@ public function collection(object $resp): array
             }
         }
         if (empty($tables)) {
-            if (!in_array($table, ['audit_log', 'bios', 'certificate', 'change_log', 'discovery_log', 'disk', 'dns', 'edit_log', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows'])) {
+            if (!in_array($table, ['audit_log', 'bios', 'certificate', 'change_log', 'discovery_log', 'disk', 'dns', 'edit_log', 'executable', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows'])) {
                 # Invalid table
                 log_message('error', 'Invalid table provided to ComponentsModel::collection, ' . $table);
                 $_SESSION['error'] = 'Invalid table provided to ComponentsModel::collection, ' . htmlentities($table);
@@ -1109,6 +1109,26 @@ public function upsert(string $table = '', object $device = null, array $data =
                         }
                     }
                 }
+                if (empty($virtual_machine->icon) and !empty($virtual_machine->os)) {
+                    if (stripos($virtual_machine->os, 'red hat') !== false) {
+                        $virtual_machine->icon = 'redhat';
+                    }
+                    if (stripos($virtual_machine->os, 'debian') !== false) {
+                        $virtual_machine->icon = 'debian';
+                    }
+                    if (stripos($virtual_machine->os, 'centos') !== false) {
+                        $virtual_machine->icon = 'centos';
+                    }
+                    if (stripos($virtual_machine->os, 'ubuntu') !== false) {
+                        $virtual_machine->icon = 'ubuntu';
+                    }
+                    if (stripos($virtual_machine->os, 'windows') !== false) {
+                        $virtual_machine->icon = 'windows';
+                    }
+                    if (empty($virtual_machine->icon) and stripos($virtual_machine->os, 'linux') !== false) {
+                        $virtual_machine->icon = 'linux';
+                    }
+                }
             }
         }
 
@@ -1277,7 +1297,7 @@ public function upsert(string $table = '', object $device = null, array $data =
                     }
                     $alert_details = substr($alert_details, 0, -2);
                     $alert_details = "Item added to {$table} - {$alert_details}";
-                    $sql = 'INSERT INTO change_log (device_id, db_table, db_row, db_action, details, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)';
+                    $sql = 'INSERT INTO change_log (device_id, db_table, db_row, db_action, details, `timestamp`, `notes`) VALUES (?, ?, ?, ?, ?, ?, "")';
                     $query = $this->db->query($sql, [intval($device->id), "{$table}", intval($id), 'create', "{$alert_details}", "{$device->last_seen}"]);
                     // add a count to our chart table
                     $sql = "INSERT INTO chart (`when`, `what`, `org_id`, `count`) VALUES (DATE(NOW()), '{$table}_create', " . intval($device->org_id) . ', 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1';
@@ -1384,7 +1404,7 @@ public function upsert(string $table = '', object $device = null, array $data =
                 }
                 $alert_details = substr($alert_details, 0, -2);
                 $alert_details = "Item removed from {$table} - {$alert_details}";
-                $sql = 'INSERT INTO change_log (device_id, db_table, db_row, db_action, details, `timestamp`) VALUES (?, ?, ?, ?, ?, ?)';
+                $sql = 'INSERT INTO change_log (device_id, db_table, db_row, db_action, details, `timestamp`, `notes`) VALUES (?, ?, ?, ?, ?, ?, "")';
                 $query = $this->db->query($sql, [intval($device->id), "{$table}", intval($db_item->id), 'delete', "{$alert_details}", "{$device->last_seen}"]);
                 // add a count to our chart table
                 $sql = "INSERT INTO chart (`when`, `what`, `org_id`, `count`) VALUES (DATE(NOW()), '{$table}_delete', " . intval($device->org_id) . ', 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1';
diff --git a/app/Models/DevicesModel.php b/app/Models/DevicesModel.php
index 61d89a752..610903c5c 100644
--- a/app/Models/DevicesModel.php
+++ b/app/Models/DevicesModel.php
@@ -213,7 +213,7 @@ public function create($data = null): ?int
         // Set the device icon
         reset_icons($id);
 
-        $sql = "INSERT INTO change_log VALUES (null, ?, 'devices', ?, 'create', 'Item added to devices', null, '2000-01-01 00:00:00', '', '', '', null, '', NOW())";
+        $sql = "INSERT INTO change_log VALUES (null, ?, 'devices', ?, 'create', 'Item added to devices', '', '2000-01-01 00:00:00', '', '', '', null, '', NOW())";
         $this->db->query($sql, [$id, $id]);
 
         $weight = weight($data->last_seen_by);
@@ -356,7 +356,7 @@ public function includedCollection(): array
         $orgs = array_unique(array_merge($instance->user->orgs, $instance->orgsModel->getUserDescendants($instance->user->orgs, $instance->orgs)));
 
         $included = array();
-        // No file, radio, san, scsi, usb
+        // No executable, file, radio, san, scsi, usb
         $current = array('audit_log', 'bios', 'change_log', 'disk', 'dns', 'edit_log', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'route', 'server', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
 
         foreach ($current as $table) {
@@ -387,7 +387,7 @@ public function includedRead(int $id = 0): array
         }
 
         $include = array();
-        $current = array('bios', 'certificate', 'disk', 'dns', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
+        $current = array('bios', 'certificate', 'disk', 'dns', 'executable', 'file', 'ip', 'log', 'memory', 'module', 'monitor', 'motherboard', 'netstat', 'network', 'nmap', 'optical', 'pagefile', 'partition', 'policy', 'print_queue', 'processor', 'radio', 'route', 'san', 'scsi', 'server_item', 'service', 'share', 'software', 'software_key', 'sound', 'task', 'usb', 'user', 'user_group', 'variable', 'video', 'vm', 'windows');
         foreach ($current as $table) {
             if (empty($resp_include) or in_array($table, $resp_include)) {
                 $sql = "SELECT * FROM `$table` WHERE device_id = ? and current = 'y'";
diff --git a/app/Models/DiscoveriesModel.php b/app/Models/DiscoveriesModel.php
index 3df5591fa..ab62f02d8 100644
--- a/app/Models/DiscoveriesModel.php
+++ b/app/Models/DiscoveriesModel.php
@@ -550,7 +550,11 @@ public function includedRead(int $id = 0): array
 
         $sql = "SELECT * FROM discovery_log WHERE discovery_id = ? ORDER BY id";
         $query = $this->db->query($sql, [$id]);
-        $included['discovery_log'] = $query->getResult();
+        $discovery_log = $query->getResult();
+        foreach ($discovery_log as $log) {
+            $log->ip_padded = ip_address_to_db($log->ip);
+        }
+        $included['discovery_log'] = $discovery_log;
 
         $discovery_scan_optionsModel = new \App\Models\DiscoveryScanOptionsModel();
         $included['discovery_scan_options'] = $discovery_scan_optionsModel->listUser();
diff --git a/app/Models/DiscoveryLogModel.php b/app/Models/DiscoveryLogModel.php
index 27bbac954..be1e34828 100644
--- a/app/Models/DiscoveryLogModel.php
+++ b/app/Models/DiscoveryLogModel.php
@@ -158,7 +158,6 @@ public function create($data = null): ?int
         $this->builder->insert($newdata);
         $id = intval($this->db->insertID());
 
-        // TODO - enable
         // If we are a collector, forward the log
         if (!empty($instance->config->servers) and !empty($instance->config->servers->type) and $instance->config->servers->type === 'collector') {
             $log = $newdata;
diff --git a/app/Models/ExecutablesModel.php b/app/Models/ExecutablesModel.php
new file mode 100644
index 000000000..cb62b4e2e
--- /dev/null
+++ b/app/Models/ExecutablesModel.php
@@ -0,0 +1,252 @@
+<?php
+# Copyright © 2023 FirstWave. All Rights Reserved.
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use \stdClass;
+
+class ExecutablesModel extends BaseModel
+{
+
+    public function __construct()
+    {
+        $this->db = db_connect();
+        $this->builder = $this->db->table('executables');
+        # Use the below to execute BaseModel::__construct
+        # parent::__construct();
+    }
+
+    /**
+     * Read the collection from the database
+     *
+     * @param  $resp object An object containing the properties, filter, sort and limit as passed by the user
+     *
+     * @return array        An array of formatted entries
+     */
+    public function collection(object $resp): array
+    {
+        $properties = $resp->meta->properties;
+        $properties[] = "orgs.name as `orgs.name`";
+        $properties[] = "orgs.id as `orgs.id`";
+        $this->builder->select($properties, false);
+        $this->builder->join('orgs', $resp->meta->collection . '.org_id = orgs.id', 'left');
+        foreach ($resp->meta->filter as $filter) {
+            if (in_array($filter->operator, ['!=', '>=', '<=', '=', '>', '<'])) {
+                $this->builder->{$filter->function}($filter->name . ' ' . $filter->operator, $filter->value);
+            } else {
+                $this->builder->{$filter->function}($filter->name, $filter->value);
+            }
+        }
+        $this->builder->orderBy($resp->meta->sort);
+        $this->builder->limit($resp->meta->limit, $resp->meta->offset);
+        $query = $this->builder->get();
+        if ($this->sqlError($this->db->error())) {
+            return array();
+        }
+        return format_data($query->getResult(), $resp->meta->collection);
+    }
+
+    /**
+     * Create an individual item in the database
+     *
+     * @param  object $data The data attributes
+     *
+     * @return int|false    The Integer ID of the newly created item, or false
+     */
+    public function create($data = null): ?int
+    {
+        if (empty($data)) {
+            return null;
+        }
+        $data->path = str_replace("'", '', $data->path);
+        $data->path = str_replace('"', '', $data->path);
+        $data->path = str_replace(';', '', $data->path);
+        $data->path = str_replace("\n", '', $data->path);
+        $data = $this->createFieldData('executables', $data);
+        if (empty($data)) {
+            return null;
+        }
+        $this->builder->insert($data);
+        if ($error = $this->sqlError($this->db->error())) {
+            \Config\Services::session()->setFlashdata('error', json_encode($error));
+            return null;
+        }
+        return (intval($this->db->insertID()));
+    }
+
+    /**
+     * Delete an individual item from the database, by ID
+     *
+     * @param  int $id The ID of the requested item
+     *
+     * @return bool    true || false depending on success
+     */
+    public function delete($id = null, bool $purge = false): bool
+    {
+        $this->builder->delete(['id' => intval($id)]);
+        if ($this->sqlError($this->db->error())) {
+            return false;
+        }
+        if ($this->db->affectedRows() !== 1) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Return an array containing arrays of related items to be stored in resp->included
+     *
+     * @param  int $id The ID of the requested item
+     * @return array  An array of anything needed for screen output
+     */
+    public function includedRead(int $id = 0): array
+    {
+        return array();
+    }
+
+    /**
+     * Return an array containing arrays of related items to be stored in resp->included
+     *
+     * @param  int $id The ID of the requested item
+     * @return array  An array of anything needed for screen output
+     */
+    public function includedCreateForm(int $id = 0): array
+    {
+        return array();
+    }
+
+
+    /**
+     * Read the entire collection from the database that the user is allowed to read
+     *
+     * @return array  An array of formatted entries
+     */
+    public function listUser($where = array(), $orgs = array()): array
+    {
+        if (empty($orgs)) {
+            $instance = & get_instance();
+            $orgs = array_unique(array_merge($instance->user->orgs, $instance->orgsModel->getUserDescendants($instance->user->orgs, $instance->orgs)));
+            $orgs = array_unique(array_merge($orgs, $instance->orgsModel->getUserAscendants($instance->user->orgs, $instance->orgs)));
+            $orgs[] = 1;
+            $orgs = array_unique($orgs);
+        }
+
+        $properties = array();
+        $properties[] = 'executables.*';
+        $properties[] = 'orgs.name as `orgs.name`';
+        $this->builder->select($properties, false);
+        $this->builder->join('orgs', 'executables.org_id = orgs.id', 'left');
+        $this->builder->whereIn('orgs.id', $orgs);
+        $this->builder->where($where);
+        $query = $this->builder->get();
+        if ($this->sqlError($this->db->error())) {
+            return array();
+        }
+        return format_data($query->getResult(), 'executables');
+    }
+
+    /**
+     * Read the entire collection from the database
+     *
+     * @return array  An array of all entries
+     */
+    public function listAll(): array
+    {
+        $query = $this->builder->get();
+        if ($this->sqlError($this->db->error())) {
+            return array();
+        }
+        return $query->getResult();
+    }
+
+    /**
+     * Read an individual item from the database, by ID
+     *
+     * @param  int $id The ID of the requested item
+     *
+     * @return array   The array containing the requested item
+     */
+    public function read(int $id = 0): array
+    {
+        $query = $this->builder->getWhere(['id' => intval($id)]);
+        if ($this->sqlError($this->db->error())) {
+            return array();
+        }
+        return format_data($query->getResult(), 'executables');
+    }
+
+    /**
+     * Reset a table
+     *
+     * @return bool Did it work or not?
+     */
+    public function reset(string $table = ''): bool
+    {
+        if ($this->tableReset('executables')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Update an individual item in the database
+     *
+     * @param  object  $data The data attributes
+     *
+     * @return bool    true || false depending on success
+     */
+    public function update($id = null, $data = null): bool
+    {
+        $data = $this->updateFieldData('executables', $data);
+        $this->builder->where('id', intval($id));
+        $this->builder->update($data);
+        if ($this->sqlError($this->db->error())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * The dictionary item
+     *
+     * @return object  The stdClass object containing the dictionary
+     */
+    public function dictionary(): object
+    {
+        $instance = & get_instance();
+
+        $collection = 'executables';
+        $dictionary = new stdClass();
+        $dictionary->table = $collection;
+        $dictionary->columns = new stdClass();
+
+        $dictionary->attributes = new stdClass();
+        $dictionary->attributes->collection = array('id', 'name', 'description', 'path', 'exclude', 'orgs.name');
+        $dictionary->attributes->create = array('name','org_id','path','exclude');
+        $dictionary->attributes->fields = $this->db->getFieldNames($collection);
+        $dictionary->attributes->fieldsMeta = $this->db->getFieldData($collection);
+        $dictionary->attributes->update = $this->updateFields($collection);
+
+        $dictionary->sentence = 'Open-AudIT Enterprise includes Executables, which detects executable files not know by the package manager. This feature is for Linux targets only.';
+
+        $dictionary->about = '<p>Open-AudIT can retrieve details about a file, ask the native package manager if they are known to it and monitor these files for changes as per other attributes in the Open-AudIT database.<br /><br />Supported clients are Linux only.<br /><br />' . $instance->dictionary->link . '<br /><br /></p>';
+
+        $dictionary->notes = '<p>Supported clients are Linux only.<br /><br /></p>';
+
+
+        $dictionary->product = 'enterprise';
+        $dictionary->columns->id = $instance->dictionary->id;
+        $dictionary->columns->name = $instance->dictionary->name;
+        $dictionary->columns->org_id = $instance->dictionary->org_id;
+        $dictionary->columns->description = $instance->dictionary->description;
+        $dictionary->columns->path = 'The path to the file or directory.';
+        $dictionary->columns->os_family = 'Unused as at 5.2.0.';
+        $dictionary->columns->exclude = 'Should this file (or pattern) be used to exclude files from being reported.';
+        $dictionary->columns->edited_by = $instance->dictionary->edited_by;
+        $dictionary->columns->edited_date = $instance->dictionary->edited_date;
+        return $dictionary;
+    }
+}
diff --git a/app/Models/ScriptsModel.php b/app/Models/ScriptsModel.php
index 86faaf2a6..3e3cbf4cd 100644
--- a/app/Models/ScriptsModel.php
+++ b/app/Models/ScriptsModel.php
@@ -358,7 +358,12 @@ public function download(int $id = 0): ?string
             if (!empty($instance->config->default_network_address)) {
                 $options->url = $instance->config->default_network_address . 'index.php/input/devices';
             } else {
-                unset($options->url);
+                $baseURL = base_url();
+                if (!empty($baseURL)) {
+                    $options->url = $baseURL . 'index.php/input/devices';
+                } else {
+                    unset($options->url);
+                }
             }
         }
         $find = 'Configuration from web UI here';
@@ -405,6 +410,30 @@ public function download(int $id = 0): ?string
             }
         }
 
+        if (!empty($instance->config->executables) and $instance->config->executables and $instance->config->product === 'enterprise') {
+            if ($data->based_on === 'audit_linux.sh') {
+                $sql = "SELECT * FROM executables";
+                $result = $this->db->query($sql)->getResult();
+                $exclusions = array();
+                if (!empty($result)) {
+                    foreach ($result as $item) {
+                        $path = str_replace('\\', '\\\\', $item->path);
+                        if ($item->exclude === 'n') {
+                            $replace = $find . "\nexecutables[" . ($item->id + 1) . ']="' . $path . '"';
+                            $file = str_replace($find, $replace, $file);
+                        }
+                        if ($item->exclude === 'y') {
+                            $exclusions[] = $path;
+                        }
+                    }
+                }
+                if (!empty($exclusions)) {
+                    $replace = $find . "\nexclusions=\"" . implode('|', $exclusions) . "\"";
+                    $file = str_replace($find, $replace, $file);
+                }
+            }
+        }
+
         // Force all line endings to be Unix style
         // Windows audit scripts with Unix line endings work
         // Unix audit scripts with Windows line endings do not work (bash for one, chokes)
diff --git a/app/Models/TasksModel.php b/app/Models/TasksModel.php
index c1b82268d..478778b59 100644
--- a/app/Models/TasksModel.php
+++ b/app/Models/TasksModel.php
@@ -90,6 +90,15 @@ public function create($data = null): ?int
         if (empty($data)) {
             return null;
         }
+        $data->minute = implode(',', $data->minute);
+        $data->hour = implode(',', $data->hour);
+        $data->month = implode(',', $data->month);
+        $data->day_of_month = implode(',', $data->day_of_month);
+        $data->day_of_week = implode(',', $data->day_of_week);
+        if (empty($data->uuid)) {
+            $instance = & get_instance();
+            $data->uuid = $instance->config->uuid;
+        }
         $data = $this->createFieldData('tasks', $data);
         if (empty($data)) {
             return null;
diff --git a/app/Models/db_upgrades/db_5.2.0.php b/app/Models/db_upgrades/db_5.2.0.php
index 9ad67403a..0325e7b11 100644
--- a/app/Models/db_upgrades/db_5.2.0.php
+++ b/app/Models/db_upgrades/db_5.2.0.php
@@ -1,6 +1,32 @@
 <?php
 $output .= "Upgrade database to 5.2.0 commenced.\n\n";
 
+$sql = "ALTER TABLE `bios` CHANGE `serial` `serial` VARCHAR(200) NOT NULL DEFAULT ''";
+$db->query($sql);
+$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+log_message('info', (string)$db->getLastQuery());
+
+if ($db->fieldExists('user_id', 'change_log')) {
+    $sql = "ALTER TABLE `change_log` DROP `user_id`";
+    $db->query($sql);
+    $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+    log_message('info', (string)$db->getLastQuery());
+}
+
+if (!$db->fieldExists('ack_by', 'change_log')) {
+    $sql = "ALTER TABLE `change_log` ADD `ack_by` varchar(200) NOT NULL DEFAULT '' AFTER `details`";
+    $db->query($sql);
+    $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+    log_message('info', (string)$db->getLastQuery());
+}
+
+if (!$db->fieldExists('notes', 'change_log') and $db->fieldExists('note', 'change_log')) {
+    $sql = "ALTER TABLE `change_log` CHANGE `note` `notes` TEXT NOT NULL";
+    $db->query($sql);
+    $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+    log_message('info', (string)$db->getLastQuery());
+}
+
 $sql = "DELETE FROM `configuration` WHERE `name` IN ('product', 'oae_product')";
 $db->query($sql);
 $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
@@ -16,6 +42,93 @@
 $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
 log_message('info', (string)$db->getLastQuery());
 
+$sql = "ALTER TABLE `discovery_log` CHANGE `timestamp` `timestamp` datetime DEFAULT current_timestamp()";
+$db->query($sql);
+$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+log_message('info', (string)$db->getLastQuery());
+
+$sql = "ALTER TABLE `enterprise` CHANGE `response` `response` mediumtext NOT NULL DEFAULT ''";
+$db->query($sql);
+$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+log_message('info', (string)$db->getLastQuery());
+
+if (!$db->tableExists('executables')) {
+    $sql = "CREATE TABLE `executables` (
+        `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+        `name` varchar(200) NOT NULL DEFAULT '',
+        `org_id` int(10) unsigned NOT NULL DEFAULT '1',
+        `path` text NOT NULL,
+        `description` text NOT NULL,
+        `os_family` varchar(50) NOT NULL DEFAULT '',
+        `exclude` enum('y', 'n') NOT NULL DEFAULT 'n',
+        `edited_by` varchar(200) NOT NULL DEFAULT '',
+        `edited_date` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+        PRIMARY KEY (`id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;";
+    $db->query($sql);
+    $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+    log_message('info', (string)$db->getLastQuery());
+}
+
+if (!$db->tableExists('executable')) {
+    $sql = "  CREATE TABLE `executable` (
+    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `device_id` int(10) unsigned DEFAULT NULL,
+    `current` enum('y','n') NOT NULL DEFAULT 'y',
+    `first_seen` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+    `last_seen` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+    `executable_id` int(10) unsigned DEFAULT NULL,
+    `name` varchar(200) NOT NULL DEFAULT '',
+    `full_name` text NOT NULL,
+    `description` varchar(1000) NOT NULL,
+    `package` varchar(1000) NOT NULL,
+    `size` int(10) unsigned NOT NULL DEFAULT '0',
+    `directory` text NOT NULL,
+    `hash` varchar(250) NOT NULL DEFAULT '',
+    `last_changed` varchar(100) NOT NULL DEFAULT '',
+    `meta_last_changed` varchar(100) NOT NULL DEFAULT '',
+    `permission` varchar(250) NOT NULL DEFAULT '',
+    `owner` varchar(100) NOT NULL DEFAULT '',
+    `group` varchar(100) NOT NULL DEFAULT '',
+    `type` varchar(100) NOT NULL DEFAULT '',
+    `version` varchar(100) NOT NULL DEFAULT '',
+    `inode` bigint(20) unsigned NOT NULL DEFAULT '0',
+    `ack_by` varchar(200) NOT NULL DEFAULT '',
+    `ack_date` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+    `notes` text NOT NULL,
+    PRIMARY KEY (`id`),
+    KEY `system_id` (`device_id`),
+    KEY `name` (`name`),
+    CONSTRAINT `executable_system_id` FOREIGN KEY (`device_id`) REFERENCES `devices` (`id`) ON DELETE CASCADE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci";
+    $db->query($sql);
+    $output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+    log_message('info', (string)$db->getLastQuery());
+}
+
+$sql = "ALTER TABLE `partition` CHANGE `mount_point` `mount_point` VARCHAR(200) NOT NULL DEFAULT ''";
+$db->query($sql);
+$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+log_message('info', (string)$db->getLastQuery());
+
+$sql = "SELECT * FROM `roles`";
+$roles = $db->query($sql)->getResult();
+$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
+log_message('info', (string)$db->getLastQuery());
+
+foreach ($roles as $role) {
+    if ($role->name === 'org_admin' or $role->name === 'user') {
+        $permissions = json_decode($role->permissions);
+        if ($role->name === 'org_admin') {
+            $permissions->executables = 'crud';
+        }
+        if ($role->name === 'user') {
+            $permissions->executable = 'r';
+        }
+        $this->rolesModel->update(intval($role->id), $permissions);
+    }
+}
+
 // set our versions
 $sql = "UPDATE `configuration` SET `value` = '20240512' WHERE `name` = 'internal_version'";
 $db->query($sql);
diff --git a/app/Views/componentsRead.php b/app/Views/componentsRead.php
index b17e083f5..2b376a4fe 100644
--- a/app/Views/componentsRead.php
+++ b/app/Views/componentsRead.php
@@ -30,6 +30,9 @@
                         } else if ($data[0]->type === 'policy' and $key === 'options') {
                             $resource->{$key} = html_entity_decode($resource->{$key});
                             echo read_text_box($key, $resource->{$key});
+                        } else if ($data[0]->type === 'change_log' and $key === 'db_row') {
+                            $link = "<a role=\"button\" title=\"" . __('View') . "\" class=\"btn btn-outline-secondary link_button\" href=\"" . url_to('componentsRead', $value) . "?components.type=" . $data[0]->attributes->db_table . "\"><span title=\"" . __('View') . "\" class=\"fa fa-link\" aria-hidden=\"true\"></span></a>";
+                            echo read_field($key, $resource->{$key}, '', false, $label, $link);
                         } else {
                             $label = '';
                             if ($key === 'id') {
diff --git a/app/Views/configurationRead.php b/app/Views/configurationRead.php
index 74d29fcff..a11280bb3 100644
--- a/app/Views/configurationRead.php
+++ b/app/Views/configurationRead.php
@@ -19,7 +19,7 @@
                             <?= read_field('editable', $resource->editable, $dictionary->columns->editable, false) ?>
                             <?= read_field('type', $resource->type, $dictionary->columns->type, false) ?>
                             <?php if ($resource->type !== 'bool') { ?>
-                                <?= read_field('value', $resource->value, $dictionary->columns->value, $update, '', '', '', $resource->type) ?>
+                                <?= read_field('value', html_entity_decode($resource->value), $dictionary->columns->value, $update, '', '', '', $resource->type) ?>
                             <?php } ?>
                             <?php if ($resource->type === 'bool') { ?>
                                 <?= read_select('value', $resource->value, $dictionary->columns->value, $update, '', array()) ?>
diff --git a/app/Views/devicesRead.php b/app/Views/devicesRead.php
index c5ad4e4ec..4851e9afe 100644
--- a/app/Views/devicesRead.php
+++ b/app/Views/devicesRead.php
@@ -126,7 +126,7 @@
 
                                     <?php
                                     $show = false;
-                                    $sections = array('certificate', 'dns', 'file', 'ip', 'log', 'netstat', 'nmap', 'pagefile', 'policy', 'print_queue', 'route', 'share', 'task', 'user', 'user_group', 'variable', 'vm', 'windows');
+                                    $sections = array('certificate', 'dns', 'file', 'executable', 'ip', 'log', 'netstat', 'nmap', 'pagefile', 'policy', 'print_queue', 'route', 'share', 'task', 'user', 'user_group', 'variable', 'vm', 'windows');
                                     foreach ($sections as $section) {
                                         if (!empty($included[$section])) {
                                             $show = true;
@@ -1764,6 +1764,45 @@
                                 </div>
                             </div>
 
+                            <div style="margin-bottom:20px; display:none;" class="card" id="executable_section">
+                                <?php $count = !empty($included['exceutable']) ? count($included['executable']) : 0; ?>
+                                <?=  device_panel('executable', $user->toolbar_style, $resource->id, '', false, $count); ?>
+                                <div class="card-body">
+                                    <div class="row">
+                                        <table class="table <?= $GLOBALS['table'] ?> table-striped table-hover dataTable" data-order='[[1,"asc"]]'>
+                                            <thead>
+                                                <tr>
+                                                    <th class="text-center" data-orderable="false"><?= __('View') ?></th>
+                                                    <th><?= __('Name') ?></th>
+                                                    <th><?= __('Full Name') ?></th>
+                                                    <th><?= __('Description') ?></th>
+                                                    <th><?= __('Size') ?></th>
+                                                    <th><?= __('Last Changed') ?></th>
+                                                    <th><?= __('Owner') ?></th>
+                                                    <th><?= __('Permission') ?></th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                            <?php if (!empty($included['executable'])) {
+                                                foreach ($included['executable'] as $row) { ?>
+                                                <tr>
+                                                    <?= device_component_button_read('executable', $row->id) ?>
+                                                    <td><?= $row->name ?></td>
+                                                    <td><?= $row->full_name ?></td>
+                                                    <td><?= $row->description ?></td>
+                                                    <td><?= $row->size ?></td>
+                                                    <td><?= $row->last_changed ?></td>
+                                                    <td><?= $row->owner ?></td>
+                                                    <td><?= $row->permission ?></td>
+                                                </tr>
+                                                <?php } ?>
+                                            <?php } ?>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div style="margin-bottom:20px; display:none;" class="card" id="file_section">
                                 <?php $count = !empty($included['file']) ? count($included['file']) : 0; ?>
                                 <?=  device_panel('file', $user->toolbar_style, $resource->id, '', false, $count); ?>
@@ -2377,7 +2416,7 @@
                                             <thead>
                                                 <tr>
                                                     <th class="text-center" data-orderable="false"><?= __('View') ?></th>
-                                                    <th><?= __('View Device') ?></th>
+                                                    <th class="text-center"><?= __('Icon') ?></th>
                                                     <th><?= __('Name') ?></th>
                                                     <th><?= __('Type') ?></th>
                                                     <th><?= __('Memory') ?></th>
@@ -2395,7 +2434,7 @@
                                                     } ?>
                                                 <tr>
                                                     <?= device_component_button_read('vm', $row->id) ?>
-                                                    <td><?= $row->icon ?></td>
+                                                    <td class="text-center"><?= $row->icon ?></td>
                                                     <td><?= $row->name ?></td>
                                                     <td><?= $row->type ?></td>
                                                     <td><?= $row->memory_count ?></td>
diff --git a/app/Views/executablesCollection.php b/app/Views/executablesCollection.php
new file mode 100644
index 000000000..3e7554521
--- /dev/null
+++ b/app/Views/executablesCollection.php
@@ -0,0 +1,52 @@
+<?php
+# Copyright © 2023 FirstWave. All Rights Reserved.
+# SPDX-License-Identifier: AGPL-3.0-or-later
+include 'shared/collection_functions.php';
+?>
+        <main class="container-fluid">
+            <div class="card">
+                <div class="card-header">
+                    <?= collection_card_header($meta->collection, $meta->icon, $user, '', $meta->query_string) ?>
+                </div>
+                <div class="card-body">
+                    <br />
+                    <div class="table-responsive">
+                        <table class="table <?= $GLOBALS['table'] ?> table-striped table-hover dataTable" data-order='[[1,"asc"],[2,"asc"],[3,"asc"]]'>
+                            <thead>
+                                <tr>
+                                    <th data-orderable="false" class="text-center"><?= __('Details') ?></th>
+                                    <?php foreach ($meta->data_order as $key) {
+                                        if ($key === 'id' or $key === 'orgs.id') {
+                                            continue;
+                                        } ?>
+                                        <th><?= collection_column_name($key) ?></th>
+                                    <?php } ?>
+                                    <?php if (strpos($user->permissions[$meta->collection], 'd') !== false) { ?>
+                                    <th data-orderable="false" class="text-center"><?= __('Delete') ?></th>
+                                    <?php } ?>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            <?php if (!empty($data)) { ?>
+                                <?php foreach ($data as $item) { ?>
+                                <tr>
+                                    <?= collection_button_read($meta->collection, $item->id) ?>
+                                    <?php foreach ($meta->data_order as $key) {
+                                        if ($key === 'id' or $key === 'orgs.id') {
+                                            continue;
+                                        }
+                                        echo "<td>" . $item->attributes->{$key} . "</td>\n";
+                                        ?>
+                                    <?php } ?>
+                                    <?php if (strpos($user->permissions[$meta->collection], 'd') !== false) { ?>
+                                        <?= collection_button_delete(intval($item->id)) ?>
+                                    <?php } ?>
+                                </tr>
+                                <?php } ?>
+                            <?php } ?>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </main>
diff --git a/app/Views/executablesCreateform.php b/app/Views/executablesCreateform.php
new file mode 100644
index 000000000..5743ee9d7
--- /dev/null
+++ b/app/Views/executablesCreateform.php
@@ -0,0 +1,62 @@
+<?php
+# Copyright © 2023 FirstWave. All Rights Reserved.
+# SPDX-License-Identifier: AGPL-3.0-or-later
+include 'shared/create_functions.php';
+?>
+        <main class="container-fluid">
+            <div class="card">
+                <div class="card-header">
+                    <?= create_card_header($meta->collection, $meta->icon, $user); ?>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <form class="form-horizontal" method="post" action="<?= url_to($meta->collection.'Create') ?>">
+                                <input type="hidden" value="<?= $meta->access_token ?>" id="data[access_token]" name="data[access_token]" />
+
+                                <?= create_text_field('data[attributes][name]', __('Name'), $dictionary->attributes->create) ?>
+                                <?= create_select('data[attributes][org_id]', __('Organisation'), $orgs, $dictionary->attributes->create) ?>
+                                <?= create_text_field('data[attributes][description]', __('Description'), $dictionary->attributes->create) ?>
+                                <?= create_text_field('data[attributes][path]', __('Path'), $dictionary->attributes->create) ?>
+                                <?= create_select('data[attributes][exclude]', __('Exclude'), null, $dictionary->attributes->create) ?>
+
+                                <br>
+                                <div class="row">
+                                    <div class="offset-2 col-8">
+                                        <label for="submit" class="form-label">&nbsp;</label>
+                                        <button id="submit" name="submit" type="submit" class="btn btn-primary"><?= __('Submit'); ?></button>
+                                    </div>
+                                </div>
+
+
+                            </form>
+                        </div>
+
+                        <div class="col-md-6">
+                            <div class="offset-2 col-8">
+                                <?php if (! empty($dictionary->about)) {
+                                    echo "<h4 class=\"text-center\">About</h4><br>";
+                                    echo html_entity_decode($dictionary->about);
+                                } ?>
+                                <?php if (! empty($dictionary->notes)) {
+                                    echo "<h4 class=\"text-center\">Notes</h4><br>";
+                                    echo html_entity_decode($dictionary->notes);
+                                } ?>
+                                <h4 class="text-center">Fields</h4><br>
+                                <?php foreach ($dictionary->columns as $key => $value) {
+                                    echo "<code>$key:</code> " . html_entity_decode($value) . "<br><br>";
+                                } ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </main>
+
+<script {csp-script-nonce}>
+window.onload = function () {
+    $(document).ready(function () {
+        $("#data\\[attributes\\]\\[exclude\\]").val('n');
+    });
+}
+</script>
diff --git a/app/Views/executablesRead.php b/app/Views/executablesRead.php
new file mode 100644
index 000000000..dbe8d716d
--- /dev/null
+++ b/app/Views/executablesRead.php
@@ -0,0 +1,73 @@
+<?php
+# Copyright © 2023 FirstWave. All Rights Reserved.
+# SPDX-License-Identifier: AGPL-3.0-or-later
+include 'shared/read_functions.php';
+?>
+        <main class="container-fluid">
+            <div class="card">
+                <div class="card-header">
+                    <?= read_card_header($meta->collection, $meta->id, $meta->icon, $user, $data[0]->attributes->name) ?>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-6">
+                            <?= read_field('name', $resource->name, $dictionary->columns->name, $update) ?>
+                            <?= read_select('org_id', $resource->org_id, $dictionary->columns->org_id, $update, __('Organisation'), $orgs) ?>
+                            <?= read_field('description', $resource->description, $dictionary->columns->description, $update) ?>
+                            <?= read_field('path', $resource->path, $dictionary->columns->path, $update) ?>
+
+                            <div class="row" style="padding-top:16px;">
+                                <div class="offset-2 col-8" style="position:relative;">
+                                    <label for="exclude" class="form-label"><?= __('Exclude') ?></label>
+                                    <div class="input-group">
+                                        <select class="form-select" id="exclude" name="exclude" data-original-value="<?= $resource->exclude ?>" disabled>
+                                            <option value="n"><?php echo __('No'); ?></option>
+                                            <option value="y"><?php echo __('Yes'); ?></option>
+                                        </select>
+                                        <?php if ($update) { ?>
+                                        <div class="float-end" style="padding-left:4px;">
+                                            <div data-attribute="exclude" class="btn btn-outline-secondary edit"><span style="font-size: 1.2rem;" class='fa fa-pencil'></span></div>
+                                            <div data-attribute="exclude" class="btn btn-outline-success submit" style="display: none;"><span style="font-size: 1.2rem;" class='fa fa-check'></span></div>
+                                            <div data-attribute="exclude" class="btn btn-outline-danger cancel" style="display: none;"><span style="font-size: 1.2rem;" class='fa fa-remove'></span></div>
+                                        </div>
+                                        <?php } ?>
+                                    </div>
+                                    <div class="form-text form-help float-end" style="position: absolute; right: 0;" data-attribute="exclude" data-dictionary="<?= $dictionary->columns->exclude ?>"><span><br></span></div>
+                                </div>
+                            </div>
+
+                            <?= read_field('edited_by', $resource->edited_by, $dictionary->columns->edited_by, false) ?>
+                            <?= read_field('edited_date', $resource->edited_date, $dictionary->columns->edited_date, false) ?>
+                        </div>
+                        <div class="col-6">
+                            <br>
+                            <div class="offset-2 col-8">
+                                <?php if (!empty($dictionary->about)) { ?>
+                                    <h4 class="text-center"><?= __('About') ?></h4><br>
+                                    <?= $dictionary->about ?>
+                                <?php } ?>
+                                <?php if (!empty($dictionary->notes)) { ?>
+                                    <h4 class="text-center"><?= __('Notes') ?></h4><br>
+                                    <?= $dictionary->notes ?>
+                                <?php } ?>
+                                <?php if (!empty($dictionary->columns)) { ?>
+                                    <?php $fields = array('name', 'org_id', 'description', 'path', 'exclude', 'edited_by', 'edited_date') ?>
+                                <h4 class="text-center"><?= __('Fields') ?></h4><br>
+                                    <?php foreach ($fields as $key) { ?>
+                                    <code><?= $key ?>: </code><?= $dictionary->columns->{$key} ?><br><br>
+                                    <?php } ?>
+                                <?php } ?>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </main>
+
+<script {csp-script-nonce}>
+window.onload = function () {
+    $(document).ready(function() {
+        $("#exclude").val("<?= $resource->exclude ?>");
+    });
+}
+</script>
\ No newline at end of file
diff --git a/app/Views/lang/en.inc b/app/Views/lang/en.inc
old mode 100755
new mode 100644
index 0bca00251..970e8d3ce
--- a/app/Views/lang/en.inc
+++ b/app/Views/lang/en.inc
@@ -7,6 +7,7 @@ $GLOBALS["lang"]["3"]="3";
 $GLOBALS["lang"]["4"]="4";
 $GLOBALS["lang"]["5"]="5";
 $GLOBALS["lang"]["<"]="<";
+$GLOBALS["lang"]["<br><br><strong>NOTE</strong> - You are accessing this URL from the local Open-AudIT server. The downloaded script will not be able to submit when run on any other machine.<br />If you need to audit other machines, please download the script from a remote machine, not the Open-AudIT server itself."]="<br><br><strong>NOTE</strong> - You are accessing this URL from the local Open-AudIT server. The downloaded script will not be able to submit when run on any other machine.<br />If you need to audit other machines, please download the script from a remote machine, not the Open-AudIT server itself.";
 $GLOBALS["lang"]["=<"]="=<";
 $GLOBALS["lang"]["=="]="==";
 $GLOBALS["lang"][">"]=">";
@@ -91,6 +92,7 @@ $GLOBALS["lang"]["Ambulance Station"]="Ambulance Station";
 $GLOBALS["lang"]["Android"]="Android";
 $GLOBALS["lang"]["Antivirus"]="Antivirus";
 $GLOBALS["lang"]["Apache"]="Apache";
+$GLOBALS["lang"]["API / Web Access"]="API / Web Access";
 $GLOBALS["lang"]["API Documentation"]="API Documentation";
 $GLOBALS["lang"]["API Key required."]="API Key required.";
 $GLOBALS["lang"]["API Result"]="API Result";
@@ -332,6 +334,7 @@ $GLOBALS["lang"]["Create Geocode"]="Create Geocode";
 $GLOBALS["lang"]["Create NMIS Devices from Open-AudIT"]="Create NMIS Devices from Open-AudIT";
 $GLOBALS["lang"]["Create Open-AudIT Devices from "]="Create Open-AudIT Devices from ";
 $GLOBALS["lang"]["Create Open-AudIT Devices from NMIS"]="Create Open-AudIT Devices from NMIS";
+$GLOBALS["lang"]["Creating"]="Creating";
 $GLOBALS["lang"]["credential"]="credential";
 $GLOBALS["lang"]["Credentials"]="Credentials";
 $GLOBALS["lang"]["credentials"]="credentials";
@@ -348,6 +351,8 @@ $GLOBALS["lang"]["Dallas_Office"]="Dallas_Office";
 $GLOBALS["lang"]["Dashboards"]="Dashboards";
 $GLOBALS["lang"]["dashboards"]="dashboards";
 $GLOBALS["lang"]["Database"]="Database";
+$GLOBALS["lang"]["Database Definition"]="Database Definition";
+$GLOBALS["lang"]["Database Schema"]="Database Schema";
 $GLOBALS["lang"]["Database Tables"]="Database Tables";
 $GLOBALS["lang"]["Data Center"]="Data Center";
 $GLOBALS["lang"]["DataCenter"]="DataCenter";
@@ -564,11 +569,13 @@ $GLOBALS["lang"]["etting Started"]="etting Started";
 $GLOBALS["lang"]["Evaluation"]="Evaluation";
 $GLOBALS["lang"]["Event"]="Event";
 $GLOBALS["lang"]["Example Devices"]="Example Devices";
+$GLOBALS["lang"]["Exceutable"]="Exceutable";
 $GLOBALS["lang"]["Exclude"]="Exclude";
 $GLOBALS["lang"]["Exclude IP Addresses"]="Exclude IP Addresses";
 $GLOBALS["lang"]["Exclude TCP Ports"]="Exclude TCP Ports";
 $GLOBALS["lang"]["Exclude UDP Ports"]="Exclude UDP Ports";
 $GLOBALS["lang"]["Executable"]="Executable";
+$GLOBALS["lang"]["Executables"]="Executables";
 $GLOBALS["lang"]["Execute"]="Execute";
 $GLOBALS["lang"]["Existing Building"]="Existing Building";
 $GLOBALS["lang"]["Existing Floor"]="Existing Floor";
@@ -754,6 +761,7 @@ $GLOBALS["lang"]["Interface Type"]="Interface Type";
 $GLOBALS["lang"]["Internal"]="Internal";
 $GLOBALS["lang"]["Internal Field Name"]="Internal Field Name";
 $GLOBALS["lang"]["Internal ID"]="Internal ID";
+$GLOBALS["lang"]["Introduction"]="Introduction";
 $GLOBALS["lang"]["invoice"]="invoice";
 $GLOBALS["lang"]["Invoice ID"]="Invoice ID";
 $GLOBALS["lang"]["invoice_item"]="invoice_item";
@@ -936,13 +944,7 @@ $GLOBALS["lang"]["MS Project"]="MS Project";
 $GLOBALS["lang"]["MS Visio"]="MS Visio";
 $GLOBALS["lang"]["MultiReport"]="MultiReport";
 $GLOBALS["lang"]["Must Respond to Ping"]="Must Respond to Ping";
-$GLOBALS["lang"]["My A Org"]="My A Org";
-$GLOBALS["lang"]["My B Org"]="My B Org";
-$GLOBALS["lang"]["Mycount"]="Mycount";
-$GLOBALS["lang"]["MyField"]="MyField";
-$GLOBALS["lang"]["My Second Org"]="My Second Org";
 $GLOBALS["lang"]["MySQL"]="MySQL";
-$GLOBALS["lang"]["My Third Org"]="My Third Org";
 $GLOBALS["lang"]["N+1"]="N+1";
 $GLOBALS["lang"]["N+M"]="N+M";
 $GLOBALS["lang"]["N-to-1"]="N-to-1";
@@ -1032,6 +1034,7 @@ $GLOBALS["lang"]["Open-AudIT Device Selection"]="Open-AudIT Device Selection";
 $GLOBALS["lang"]["Open-AudIT Field Name"]="Open-AudIT Field Name";
 $GLOBALS["lang"]["Open-AudIT Licenses"]="Open-AudIT Licenses";
 $GLOBALS["lang"]["Open-AudIT Options"]="Open-AudIT Options";
+$GLOBALS["lang"]["Open-AudIT Professional"]="Open-AudIT Professional";
 $GLOBALS["lang"]["OpenLDAP"]="OpenLDAP";
 $GLOBALS["lang"]["Operating System"]="Operating System";
 $GLOBALS["lang"]["Operating System Names"]="Operating System Names";
@@ -1046,6 +1049,7 @@ $GLOBALS["lang"]["Organisations"]="Organisations";
 $GLOBALS["lang"]["Org ID"]="Org ID";
 $GLOBALS["lang"]["Orgs"]="Orgs";
 $GLOBALS["lang"]["orgs"]="orgs";
+$GLOBALS["lang"]["Orgs from devices distinct"]="Orgs from devices distinct";
 $GLOBALS["lang"]["Orgs ID"]="Orgs ID";
 $GLOBALS["lang"]["org_admin"]="org_admin";
 $GLOBALS["lang"]["Orphaned"]="Orphaned";
@@ -1462,6 +1466,7 @@ $GLOBALS["lang"]["Tenant ID"]="Tenant ID";
 $GLOBALS["lang"]["Tennant ID"]="Tennant ID";
 $GLOBALS["lang"]["Terminal"]="Terminal";
 $GLOBALS["lang"]["Terminal Server"]="Terminal Server";
+$GLOBALS["lang"]["Test"]="Test";
 $GLOBALS["lang"]["Test 1"]="Test 1";
 $GLOBALS["lang"]["Test 2"]="Test 2";
 $GLOBALS["lang"]["Test 3"]="Test 3";
@@ -1580,6 +1585,7 @@ $GLOBALS["lang"]["Video Conference"]="Video Conference";
 $GLOBALS["lang"]["Video Wall"]="Video Wall";
 $GLOBALS["lang"]["View"]="View";
 $GLOBALS["lang"]["View All"]="View All";
+$GLOBALS["lang"]["View Details"]="View Details";
 $GLOBALS["lang"]["View Device"]="View Device";
 $GLOBALS["lang"]["View Discovery"]="View Discovery";
 $GLOBALS["lang"]["View the getting started documentation and find out \"What's On Your Network?\""]="View the getting started documentation and find out \"What's On Your Network?\"";
diff --git a/app/Views/licensesRead.php b/app/Views/licensesRead.php
index 30de972ad..26a73c759 100644
--- a/app/Views/licensesRead.php
+++ b/app/Views/licensesRead.php
@@ -106,7 +106,7 @@
                             <br>
                             <div class="row">
                                 <div class="col-12">
-                                    <table class="table <?= $GLOBALS['table'] ?> table-striped">
+                                    <table class="table <?= $GLOBALS['table'] ?> table-striped table-hover dataTable" data-order='[[2,"asc"]]'>
                                         <thead>
                                             <tr>
                                                 <th class="text-center"><?php echo __('View'); ?></th>
diff --git a/app/Views/logon.php b/app/Views/logon.php
index 88dcf72f8..a339f3f22 100644
--- a/app/Views/logon.php
+++ b/app/Views/logon.php
@@ -133,7 +133,6 @@
                                         <div class="offset-2 col-8" style="position:relative;">
                                         <br><span class="text-secondary">Don't forget about the Open-AudIT wiki for all your documentation.<br><a target='_blank' href='https://community.opmantek.com/display/OA/Home'>https://community.opmantek.com/display/OA/Home</a></span>
                                         </div>
-                                        <?php if (!empty($config->default_network_address) and strpos($config->default_network_address, '127.0.0.1') === false and strpos($config->default_network_address, 'localhost') === false and !empty($config->default_network_address)) { ?>
                                         <span align='center'>
                                             <br>
                                             <button id="audit" name="audit" type="button" class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#audit_select"><?= __('Audit My PC') ?></button>
@@ -157,11 +156,13 @@
                                                     </form>
                                                 </div>
                                                 <br />
-                                                <?= __('The direct link for the script is') ?><br /><a href="#" id="go_link">#</a><br />
+                                                <?= __('The direct link for the script is') ?>&nbsp;<a href="#" id="go_link">#</a><br />
                                                 <?= __('You may want to copy and paste this URL in an email to your staff.') ?>
+                                                <?php if (stripos(base_url(), 'localhost') !== false or stripos(base_url(), '127.0.0') !== false) {
+                                                    echo __('<br><br><strong>NOTE</strong> - You are accessing this URL from the local Open-AudIT server. The downloaded script will not be able to submit when run on any other machine.<br />If you need to audit other machines, please download the script from a remote machine, not the Open-AudIT server itself.');
+                                                } ?>
                                             </div>
                                         </span>
-                                        <?php } ?>
                                         <br>&nbsp;
                                     </div>
                                 </div>
diff --git a/app/Views/shared/header.php b/app/Views/shared/header.php
index 7858248fc..7af40f154 100644
--- a/app/Views/shared/header.php
+++ b/app/Views/shared/header.php
@@ -165,6 +165,15 @@ function my_comparison($asort, $bsort)
                                         <?= menuItem('tasks', 'c', $user, 'tasksCreateForm', __('Schedule') . ' ' . __('Discoveries'), '?type=discoveries') ?>
                                     </ul>
                                 </li>
+                                <?php if (!empty($config->executables) and $config->executables) { ?>
+                                <li><a class="dropdown-item dropdown-toggle first-level-dropdown-toggle" href="#"><?= __('Executables') ?></a>
+                                    <ul class="dropdown-menu">
+                                        <?= menuItem('executables', 'r', $user, 'executablesCollection', __('List') . ' ' . __('Executables')) ?>
+                                        <?= menuItem('executables', 'c', $user, 'executablesCreateForm', __('Create') . ' ' . __('Executables')) ?>
+                                        <?= menuItem('executables', '', $user, 'executablesHelp', __('Learn About') . ' ' . __('Executables')) ?>
+                                    </ul>
+                                </li>
+                                <?php } ?>
                                 <li><a class="dropdown-item dropdown-toggle first-level-dropdown-toggle" href="#"><?= __('Files') ?></a>
                                     <ul class="dropdown-menu">
                                         <?= menuItem('files', 'r', $user, 'filesCollection', __('List') . ' ' . __('Files')) ?>
diff --git a/app/Views/shared/read_functions.php b/app/Views/shared/read_functions.php
index a21458754..226d831e7 100644
--- a/app/Views/shared/read_functions.php
+++ b/app/Views/shared/read_functions.php
@@ -231,14 +231,14 @@ function read_select(string $name = '', string $value = '', string $dictionary =
             if ($item->attributes->value === '') {
                 $selected .= ' label="none"';
             }
-            $return .= "                                            <option value=\"{$item->attributes->value}\"{$selected}>" . __($item->attributes->name) . "</option>\n";
+            $return .= "                                            <option value=\"{$item->attributes->value}\"{$selected}>" . $item->attributes->name . "</option>\n";
         } else if (!empty($item->type) and $item->type === 'discovery_scan_options') {
             $return .= "                                            <option value=\"{$item->attributes->id}\"{$selected}>{$item->attributes->name}</option>\n";
         } else {
             if ($item->id === '') {
                 $selected .= ' label="none"';
             }
-            $return .= "                                            <option value=\"{$item->id}\"{$selected}>" . __($item->attributes->name) . "</option>\n";
+            $return .= "                                            <option value=\"{$item->id}\"{$selected}>" . $item->attributes->name . "</option>\n";
         }
     }
     $return .= "                                        </select>\n";
diff --git a/other/audit_linux.sh b/other/audit_linux.sh
index 46c3e8f84..48f4c758d 100755
--- a/other/audit_linux.sh
+++ b/other/audit_linux.sh
@@ -984,6 +984,7 @@ echo "	</sys>"
 
 
 
+
 ##################################
 # USB SECTION                    #
 ##################################
@@ -3628,6 +3629,68 @@ if [ "$busybox" = "n" ]; then
 fi
 
 
+########################################################
+# EXECUTABLES                                         #
+########################################################
+if [ "$debugging" -gt "0" ]; then
+	echo "Executable Files Info"
+fi
+if [ "$busybox" = "n" ]; then
+	echo "	<executable>" >> "$xml_file"
+	for dir in ${executables[@]}; do
+		for file in $(find "$dir" -type f | cut -d: -f1 | grep -Ev "$exclusions"); do
+
+			description=""
+			description=$(file -b "$file" | grep executable)
+			package=""
+
+			if [ -n "$description" ]; then
+				case $system_os_family in
+					'Ubuntu' | 'Debian' | 'LinuxMint' | 'Raspbian' )
+						package=$(dpkg -S "$file" 2>/dev/null | cut -d: -f1)
+					;;
+					'CentOS' | 'RedHat' | 'SUSE' | 'Fedora' | 'Suse' | 'Amazon' | 'Mariner' | 'AlmaLinux' )
+						package=$(rpm -qf "$file" 2>/dev/null )
+					;;
+				esac
+			fi
+
+			if [ -z "$package" ] && [ -n "$description" ]; then
+				file_size=$(stat --printf="%s" "$file")
+				file_directory=$(dirname "$file")
+				file_hash=$(sha1sum "$file" | cut -d" " -f1)
+				file_last_changed=$(stat -c %y "$file" | cut -d. -f1)
+				file_meta_last_changed=$(stat -c %z "$file" | cut -d. -f1)
+				file_permissions=$(stat -c "%a" "$file")
+				file_owner=$(ls -ld "$file" | awk '{print $3}')
+				file_group=$(ls -ld "$file" | awk '{print $4}')
+				inode=$(ls -li "$file" | awk '{print $1}')
+
+				file_name=$(basename "$file")
+				{
+				echo "		<item>"
+				echo "			<name>$(escape_xml "$file_name")</name>"
+				echo "			<full_name>$(escape_xml "$file")</full_name>"
+				echo "			<size>$(escape_xml "$file_size")</size>"
+				echo "			<directory>$(escape_xml "$file_directory")</directory>"
+				echo "			<description>$(escape_xml "$description")</description>"
+				echo "			<hash>$(escape_xml "$file_hash")</hash>"
+				echo "			<last_changed>$(escape_xml "$file_last_changed")</last_changed>"
+				echo "			<meta_last_changed>$(escape_xml "$file_meta_last_changed")</meta_last_changed>"
+				echo "			<permission>$(escape_xml "$file_permissions")</permission>"
+				echo "			<package>$(escape_xml "$package")</package>"
+				echo "			<owner>$(escape_xml "$file_owner")</owner>"
+				echo "			<group>$(escape_xml "$file_group")</group>"
+				echo "			<inode>$(escape_xml "$inode")</inode>"
+				echo "		</item>"
+				} >> "$xml_file"
+			fi
+		done
+	done
+	echo "	</executable>" >> "$xml_file"
+fi
+
+
 ########################################################
 # CLOSE THE AUDIT FILE                                 #
 ########################################################
diff --git a/other/db_5.2.0.php b/other/db_5.2.0.php
deleted file mode 100644
index 7279807b2..000000000
--- a/other/db_5.2.0.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$output .= "Upgrade database to 5.2.0 commenced.\n\n";
-
-$sql = "ALTER TABLE `partition` CHANGE `mount_point` `mount_point` VARCHAR(200) NOT NULL DEFAULT ''";
-$db->query($sql);
-$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
-log_message('info', (string)$db->getLastQuery());
-
-$sql = "ALTER TABLE `bios` CHANGE `serial` `serial` VARCHAR(200) NOT NULL DEFAULT ''";
-$db->query($sql);
-$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
-log_message('info', (string)$db->getLastQuery());
-
-// set our versions
-$sql = "UPDATE `configuration` SET `value` = '20240512' WHERE `name` = 'internal_version'";
-$db->query($sql);
-$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
-log_message('info', (string)$db->getLastQuery());
-
-$sql = "UPDATE `configuration` SET `value` = '5.2.0' WHERE `name` = 'display_version'";
-$db->query($sql);
-$output .= str_replace("\n", " ", (string)$db->getLastQuery()) . "\n\n";
-log_message('info', (string)$db->getLastQuery());
-
-$output .= "Upgrade database to 5.2.0 completed.\n\n";
-config('Openaudit')->internal_version = 20240512;
-config('Openaudit')->display_version = '5.2.0';
diff --git a/other/open-audit.sql b/other/open-audit.sql
index c1b8491a7..f3b10abbe 100644
--- a/other/open-audit.sql
+++ b/other/open-audit.sql
@@ -557,11 +557,11 @@ CREATE TABLE `change_log` (
   `db_row` int(10) unsigned NOT NULL DEFAULT '0',
   `db_action` enum('','create','update','delete') NOT NULL DEFAULT '',
   `details` text NOT NULL,
-  `user_id` int(10) unsigned DEFAULT NULL,
+  `ack_by` varchar(200) NOT NULL DEFAULT '',
   `ack_time` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
   `external_link` varchar(200) NOT NULL DEFAULT '',
   `external_ident` varchar(200) NOT NULL DEFAULT '',
-  `note` varchar(200) NOT NULL DEFAULT '',
+  `notes` text NOT NULL,
   `change_id` int(10) unsigned DEFAULT NULL,
   `change_type` enum('','standard','normal','emergency','unauthorised') NOT NULL DEFAULT '',
   `timestamp` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
@@ -1328,7 +1328,7 @@ CREATE TABLE `discovery_log` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `discovery_id` int(10) unsigned DEFAULT NULL,
   `device_id` int(10) unsigned DEFAULT NULL,
-  `timestamp` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `timestamp` datetime DEFAULT current_timestamp(),
   `severity` int(1) unsigned NOT NULL DEFAULT '5',
   `severity_text` enum('debug','info','notice','warning','error','critical','alert','emergency') NOT NULL DEFAULT 'notice',
   `pid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1534,7 +1534,7 @@ DROP TABLE IF EXISTS `enterprise`;
 CREATE TABLE `enterprise` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `request` text NOT NULL,
-  `response` longtext NOT NULL,
+  `response` mediumtext NOT NULL DEFAULT '',
   `timestamp` datetime NOT NULL DEFAULT current_timestamp(),
   `output` mediumtext NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
@@ -1542,7 +1542,7 @@ CREATE TABLE `enterprise` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `edit_log`
+-- Dumping data for table `enterprise`
 --
 
 LOCK TABLES `enterprise` WRITE;
@@ -1550,6 +1550,84 @@ LOCK TABLES `enterprise` WRITE;
 /*!40000 ALTER TABLE `enterprise` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `executable`
+--
+
+DROP TABLE IF EXISTS `executable`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `executable` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `device_id` int(10) unsigned DEFAULT NULL,
+  `current` enum('y','n') NOT NULL DEFAULT 'y',
+  `first_seen` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `last_seen` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `executable_id` int(10) unsigned DEFAULT NULL,
+  `name` varchar(200) NOT NULL DEFAULT '',
+  `full_name` text NOT NULL,
+  `description` varchar(1000) NOT NULL,
+  `package` varchar(1000) NOT NULL,
+  `size` int(10) unsigned NOT NULL DEFAULT '0',
+  `directory` text NOT NULL,
+  `hash` varchar(250) NOT NULL DEFAULT '',
+  `last_changed` varchar(100) NOT NULL DEFAULT '',
+  `meta_last_changed` varchar(100) NOT NULL DEFAULT '',
+  `permission` varchar(250) NOT NULL DEFAULT '',
+  `owner` varchar(100) NOT NULL DEFAULT '',
+  `group` varchar(100) NOT NULL DEFAULT '',
+  `type` varchar(100) NOT NULL DEFAULT '',
+  `version` varchar(100) NOT NULL DEFAULT '',
+  `inode` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `ack_by` varchar(200) NOT NULL DEFAULT '',
+  `ack_date` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  `notes` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `system_id` (`device_id`),
+  KEY `name` (`name`),
+  CONSTRAINT `executable_system_id` FOREIGN KEY (`device_id`) REFERENCES `devices` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `executable`
+--
+
+LOCK TABLES `executable` WRITE;
+/*!40000 ALTER TABLE `executable` DISABLE KEYS */;
+/*!40000 ALTER TABLE `executable` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `executables`
+--
+
+DROP TABLE IF EXISTS `executables`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `executables` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) NOT NULL DEFAULT '',
+  `org_id` int(10) unsigned NOT NULL DEFAULT '1',
+  `path` text NOT NULL,
+  `description` text NOT NULL,
+  `os_family` varchar(50) NOT NULL DEFAULT '',
+  `exclude` enum('y','n') NOT NULL DEFAULT 'n',
+  `edited_by` varchar(200) NOT NULL DEFAULT '',
+  `edited_date` datetime NOT NULL DEFAULT '2000-01-01 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `executables`
+--
+
+LOCK TABLES `executables` WRITE;
+/*!40000 ALTER TABLE `executables` DISABLE KEYS */;
+/*!40000 ALTER TABLE `executables` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `field`
 --
@@ -3012,8 +3090,8 @@ CREATE TABLE `roles` (
 LOCK TABLES `roles` WRITE;
 /*!40000 ALTER TABLE `roles` DISABLE KEYS */;
 INSERT INTO `roles` VALUES (NULL,'admin','This role can change global options.','{\"agents\":\"crud\",\"applications\":\"crud\",\"attributes\":\"crud\",\"baselines\":\"crud\",\"clusters\":\"r\",\"collectors\":\"crud\",\"configuration\":\"crud\",\"dashboards\":\"crud\",\"database\":\"crud\",\"devices\":\"r\",\"errors\":\"r\",\"groups\":\"crud\",\"ldap_servers\":\"crud\",\"logs\":\"crud\",\"nmis\":\"crud\",\"orgs\":\"crud\",\"queue\":\"crud\",\"queries\":\"crud\",\"reports\":\"r\",\"roles\":\"crud\",\"search\":\"crud\",\"sessions\":\"crud\",\"summaries\":\"crud\",\"tasks\":\"crud\",\"users\":\"crud\",\"widgets\":\"crud\"}','open-audit_roles_admin','system','2000-01-01 00:00:00');
-INSERT INTO `roles` VALUES (NULL,'org_admin','This role is used for administration of endpoints that contain an org_id.','{\"agents\":\"crud\",\"applications\":\"crud\",\"attributes\":\"crud\",\"baselines\":\"crud\",\"buildings\":\"crud\",\"charts\":\"crud\",\"clouds\":\"crud\",\"clusters\":\"crud\",\"connections\":\"crud\",\"credentials\":\"crud\",\"dashboards\":\"crud\",\"errors\":\"r\",\"floors\":\"crud\",\"queue\":\"cr\",\"summaries\":\"r\",\"devices\":\"crud\",\"discoveries\":\"crud\",\"discovery_scan_options\":\"crud\",\"fields\":\"crud\",\"files\":\"crud\",\"graph\":\"crud\",\"groups\":\"r\",\"integrations\":\"crud\",\"invoice\":\"crud\",\"licenses\":\"crud\",\"locations\":\"crud\",\"networks\":\"crud\",\"orgs\":\"crud\",\"queue\":\"cr\",\"queries\":\"r\",\"racks\":\"crud\",\"rack_devices\":\"crud\",\"reports\":\"r\",\"rooms\":\"crud\",\"rows\":\"crud\",\"rules\":\"crud\",\"scripts\":\"crud\",\"search\":\"crud\",\"sessions\":\"crud\",\"tasks\":\"crud\",\"users\":\"r\",\"widgets\":\"r\"}','open-audit_roles_org_admin','system','2000-01-01 00:00:00');
-INSERT INTO `roles` VALUES (NULL,'user','A standard role that can read all endpoints that contain an org_id.','{\"applications\":\"r\",\"baselines\":\"r\",\"buildings\":\"r\",\"charts\":\"r\",\"clouds\":\"r\",\"clusters\":\"r\",\"connections\":\"r\",\"credentials\":\"r\",\"dashboards\":\"r\",\"summaries\":\"r\",\"devices\":\"r\",\"errors\":\"r\",\"floors\":\"r\",\"fields\":\"r\",\"files\":\"r\",\"graph\":\"r\",\"groups\":\"r\",\"invoice\":\"r\",\"licenses\":\"r\",\"locations\":\"r\",\"networks\":\"r\",\"orgs\":\"r\",\"queue\":\"cr\",\"queries\":\"r\",\"racks\":\"r\",\"rack_devices\":\"r\",\"reports\":\"r\",\"rooms\":\"r\",\"rows\":\"r\",\"rules\":\"r\",\"search\":\"crud\",\"sessions\":\"crud\",\"widgets\":\"r\"}','open-audit_roles_user','system','2000-01-01 00:00:00');
+INSERT INTO `roles` VALUES (NULL,'org_admin','This role is used for administration of endpoints that contain an org_id.','{\"agents\":\"crud\",\"applications\":\"crud\",\"attributes\":\"crud\",\"baselines\":\"crud\",\"buildings\":\"crud\",\"charts\":\"crud\",\"clouds\":\"crud\",\"clusters\":\"crud\",\"connections\":\"crud\",\"credentials\":\"crud\",\"dashboards\":\"crud\",\"errors\":\"r\",\"floors\":\"crud\",\"queue\":\"cr\",\"summaries\":\"r\",\"devices\":\"crud\",\"discoveries\":\"crud\",\"discovery_scan_options\":\"crud\",\"executables\":\"crud\",\"fields\":\"crud\",\"files\":\"crud\",\"graph\":\"crud\",\"groups\":\"r\",\"integrations\":\"crud\",\"invoice\":\"crud\",\"licenses\":\"crud\",\"locations\":\"crud\",\"networks\":\"crud\",\"orgs\":\"crud\",\"queue\":\"cr\",\"queries\":\"r\",\"racks\":\"crud\",\"rack_devices\":\"crud\",\"reports\":\"r\",\"rooms\":\"crud\",\"rows\":\"crud\",\"rules\":\"crud\",\"scripts\":\"crud\",\"search\":\"crud\",\"sessions\":\"crud\",\"tasks\":\"crud\",\"users\":\"r\",\"widgets\":\"r\"}','open-audit_roles_org_admin','system','2000-01-01 00:00:00');
+INSERT INTO `roles` VALUES (NULL,'user','A standard role that can read all endpoints that contain an org_id.','{\"applications\":\"r\",\"baselines\":\"r\",\"buildings\":\"r\",\"charts\":\"r\",\"clouds\":\"r\",\"clusters\":\"r\",\"connections\":\"r\",\"credentials\":\"r\",\"dashboards\":\"r\",\"summaries\":\"r\",\"devices\":\"r\",\"errors\":\"r\",\"executables\":\"r\",\"floors\":\"r\",\"fields\":\"r\",\"files\":\"r\",\"graph\":\"r\",\"groups\":\"r\",\"invoice\":\"r\",\"licenses\":\"r\",\"locations\":\"r\",\"networks\":\"r\",\"orgs\":\"r\",\"queue\":\"cr\",\"queries\":\"r\",\"racks\":\"r\",\"rack_devices\":\"r\",\"reports\":\"r\",\"rooms\":\"r\",\"rows\":\"r\",\"rules\":\"r\",\"search\":\"crud\",\"sessions\":\"crud\",\"widgets\":\"r\"}','open-audit_roles_user','system','2000-01-01 00:00:00');
 INSERT INTO `roles` VALUES (NULL,'collector','The collector specific role.','{\"collectors\":\"crud\",\"configuration\":\"r\",\"credentials\":\"crud\",\"dashboards\":\"r\",\"devices\":\"crud\",\"discoveries\":\"crud\",\"discovery_scan_options\":\"crud\",\"locations\":\"crud\",\"networks\":\"crud\",\"orgs\":\"crud\",\"sessions\":\"crud\",\"tasks\":\"crud\",\"users\":\"r\",\"widgets\":\"r\"}','open-audit_roles_collector','system','2000-01-01 00:00:00');
 /*!40000 ALTER TABLE `roles` ENABLE KEYS */;
 UNLOCK TABLES;
diff --git a/public/device_images/windows.svg b/public/device_images/windows.svg
index 0406abc37..e33635a52 100644
--- a/public/device_images/windows.svg
+++ b/public/device_images/windows.svg
@@ -1,358 +1,74 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="100"
    height="100"
-   viewBox="0 0 100 100"
-   id="svg2"
+   viewBox="0 0 80 80"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="windows.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4021">
-      <stop
-         style="stop-color:#05233f;stop-opacity:1;"
-         offset="0"
-         id="stop4023" />
-      <stop
-         style="stop-color:#05233f;stop-opacity:0;"
-         offset="1"
-         id="stop4025" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4009">
-      <stop
-         id="stop4011"
-         offset="0"
-         style="stop-color:#359fc9;stop-opacity:1;" />
-      <stop
-         style="stop-color:#05233f;stop-opacity:1;"
-         offset="1"
-         id="stop4013" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3984">
-      <stop
-         style="stop-color:#cce5ec;stop-opacity:1;"
-         offset="0"
-         id="stop3986" />
-      <stop
-         id="stop3992"
-         offset="0.5"
-         style="stop-color:#4087b5;stop-opacity:1;" />
-      <stop
-         style="stop-color:#234b93;stop-opacity:1;"
-         offset="1"
-         id="stop3988" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3974">
-      <stop
-         style="stop-color:#eed715;stop-opacity:1;"
-         offset="0"
-         id="stop3976" />
-      <stop
-         id="stop3982"
-         offset="0.5"
-         style="stop-color:#e47a26;stop-opacity:1;" />
-      <stop
-         style="stop-color:#bd2125;stop-opacity:1;"
-         offset="1"
-         id="stop3978" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3956">
-      <stop
-         style="stop-color:#f8efa2;stop-opacity:1;"
-         offset="0"
-         id="stop3958" />
-      <stop
-         id="stop3964"
-         offset="0.59331369"
-         style="stop-color:#f9d121;stop-opacity:1;" />
-      <stop
-         style="stop-color:#f27c22;stop-opacity:1;"
-         offset="1"
-         id="stop3960" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3922">
-      <stop
-         style="stop-color:#d1e187;stop-opacity:1;"
-         offset="0"
-         id="stop3924" />
-      <stop
-         id="stop3970"
-         offset="0.61348403"
-         style="stop-color:#84b540;stop-opacity:1;" />
-      <stop
-         style="stop-color:#2c6230;stop-opacity:1;"
-         offset="1"
-         id="stop3926" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3908">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.42857143;"
-         offset="0"
-         id="stop3910" />
-      <stop
-         id="stop3920"
-         offset="0.32733533"
-         style="stop-color:#bfbfbf;stop-opacity:0;" />
-      <stop
-         id="stop3918"
-         offset="0.80720448"
-         style="stop-color:#7f7f7f;stop-opacity:0;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.2857143;"
-         offset="1"
-         id="stop3912" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3841">
-      <stop
-         style="stop-color:#002343;stop-opacity:1;"
-         offset="0"
-         id="stop3843" />
-      <stop
-         id="stop3902"
-         offset="0.63243002"
-         style="stop-color:#1c6083;stop-opacity:1;" />
-      <stop
-         style="stop-color:#339ec8;stop-opacity:1;"
-         offset="1"
-         id="stop3845" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-1"
-       id="linearGradient3847-3"
-       x1="182.08035"
-       y1="206.14285"
-       x2="547.91968"
-       y2="206.14285"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3841-1">
-      <stop
-         style="stop-color:#05233f;stop-opacity:1;"
-         offset="0"
-         id="stop3843-6" />
-      <stop
-         id="stop3861-8"
-         offset="0.68055558"
-         style="stop-color:#1c6083;stop-opacity:1;" />
-      <stop
-         style="stop-color:#339ec8;stop-opacity:1;"
-         offset="1"
-         id="stop3845-8" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient3952"
-       gradientUnits="userSpaceOnUse"
-       x1="183.80797"
-       y1="189.17567"
-       x2="547.41125"
-       y2="224.60561" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient3954"
-       gradientUnits="userSpaceOnUse"
-       x1="183.8438"
-       y1="181.517"
-       x2="546.62494"
-       y2="226.16542" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3956"
-       id="radialGradient3962"
-       cx="523.28448"
-       cy="371.79373"
-       fx="523.28448"
-       fy="371.79373"
-       r="89.183601"
-       gradientTransform="matrix(1.5713961,2.2330435,-2.2943973,1.6145708,550.23094,-1195.8604)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3922"
-       id="radialGradient3972"
-       cx="522.32867"
-       cy="397.98935"
-       fx="522.32867"
-       fy="397.98935"
-       r="89.846519"
-       gradientTransform="matrix(3.0991953,-1.8703954,1.7799641,2.949353,-1809.3407,333.24984)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="radialGradient3980"
-       cx="458.89542"
-       cy="315.17511"
-       fx="458.89542"
-       fy="315.17511"
-       r="85.692162"
-       gradientTransform="matrix(2.0190847,-1.5909207,1.7682954,2.2441961,-1004.1146,503.556)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3984"
-       id="radialGradient3990"
-       cx="488.55023"
-       cy="392.27255"
-       fx="488.55023"
-       fy="392.27255"
-       r="85.192162"
-       gradientTransform="matrix(-1.406158,-3.138466,3.0538162,-1.3682316,-46.92794,2628.1475)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4009"
-       id="radialGradient4007"
-       cx="532.8866"
-       cy="228.15034"
-       fx="532.8866"
-       fy="228.15034"
-       r="182.91965"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.3814619,-0.26692131,0.27893724,-1.4436507,1210.4839,693.42263)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3908"
-       id="linearGradient4017"
-       gradientUnits="userSpaceOnUse"
-       x1="183.8438"
-       y1="181.517"
-       x2="546.62494"
-       y2="226.16542" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4021"
-       id="radialGradient4027"
-       cx="398.57144"
-       cy="534"
-       fx="398.57144"
-       fy="534"
-       r="224.28572"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4021"
-       id="radialGradient4031"
-       gradientUnits="userSpaceOnUse"
-       cx="398.57144"
-       cy="534"
-       fx="398.57144"
-       fy="534"
-       r="224.28572" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="83.080742"
-     inkscape:cy="68.11938"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="706"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+   id="svg9233"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="windows_new.svg">
   <metadata
-     id="metadata7">
+     id="metadata9268">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <defs
+     id="defs9266" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1676"
+     inkscape:window-height="1003"
+     id="namedview9264"
+     showgrid="false"
+     inkscape:zoom="1.5853017"
+     inkscape:cx="118.68676"
+     inkscape:cy="21.535706"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg9233" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <g
-       id="g3389"
-       transform="matrix(0.10357587,0,0,0.10357587,-3.3314264,946.74153)">
-      <g
-         id="g3930">
-        <g
-           id="g3937">
-          <g
-             id="g3940" />
-        </g>
-      </g>
-      <circle
-         r="182.85715"
-         cy="206.14285"
-         cx="365"
-         transform="matrix(0.25284358,2.4832079,-2.4832079,0.25284358,933.41228,-425.61987)"
-         id="path3063"
-         style="fill:url(#radialGradient4007);fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         r="182.85715"
-         cy="206.14285"
-         cx="365"
-         transform="matrix(0.2316718,2.3280286,-2.2752775,0.23704301,898.27666,-365.72227)"
-         id="path3904"
-         style="fill:url(#linearGradient4017);fill-opacity:1;stroke:none" />
-      <circle
-         r="224.28572"
-         cy="534"
-         cx="398.57144"
-         transform="matrix(2.1258885,0,0,2.1258885,-333.37936,-592.52289)"
-         id="path4019"
-         style="fill:url(#radialGradient4031);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path3053"
-         d="m 275.29476,496.95092 -6.57173,-4.52304 59.4583,-203.95357 c 88.42785,-41.33027 164.30055,-35.86883 227.75503,13.61322 l -58.85169,202.40397 -5.99739,3.61733 C 425.1482,459.01013 351.41776,465.70978 275.29476,496.95092 Z"
-         style="fill:url(#radialGradient3980);fill-opacity:1;stroke:none" />
-      <path
-         style="fill:url(#radialGradient3990);fill-opacity:1;stroke:none"
-         d="m 207.78506,734.41533 -6.57172,-4.52305 59.45828,-203.95357 c 88.42786,-41.33026 164.30057,-35.86883 227.75503,13.61322 l -58.85169,202.40396 -5.99739,3.61734 c -65.93906,-49.0987 -139.66952,-42.39905 -215.79251,-11.1579 z"
-         id="path3055"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path3057"
-         d="m 507.21216,561.74681 6.91225,-4.9837 c 69.71322,50.65768 148.51498,47.23503 229.5449,18.67594 l 7.02402,6.81119 -56.40502,198.26898 c -54.20785,24.17579 -145.98754,51.86651 -244.26488,-16.59911 z"
-         style="fill:url(#radialGradient3962);fill-opacity:1;stroke:none" />
-      <path
-         style="fill:url(#radialGradient3972);fill-opacity:1;stroke:none"
-         d="m 575.62834,325.95502 7.17832,-4.77084 c 69.71321,50.65768 135.2119,50.32134 230.71556,13.24829 l 6.4919,6.49193 -58.63994,204.65444 c -54.20785,24.1758 -145.98754,51.86652 -244.26488,-16.5991 z"
-         id="path3059"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </g>
+     id="g9284"
+     transform="matrix(0.73993803,0,0,0.73993803,7.569537,7.1494765)">
+    <path
+       d="M 40,6.91 C 55.75,4.5 71.53,2.23 87.31,0.04 c 0.01,13.83 0,27.65 0.01,41.48 C 71.55,41.58 55.78,41.82 40,41.87 39.99,30.21 39.99,18.56 40,6.91 z"
+       id="path9236"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="M 0,12.49 C 11.86,10.66 23.77,9.08 35.68,7.59 35.69,19.06 35.69,30.52 35.7,41.99 23.8,41.98 11.9,42.16 0,42.13 L 0,12.49 z"
+       id="path9238"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="m 0,45.74 c 11.89,-0.04 23.78,0.15 35.67,0.13 0,11.5 0.03,23 0.01,34.5 C 23.8,78.61 11.9,77.07 0,75.46 L 0,45.74 z"
+       id="path9260"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="m 39.93,46.2 c 15.8,0 31.59,0 47.38,0 0.02,13.79 0,27.58 0,41.38 C 71.56,85.22 55.78,83.03 40,80.89 39.98,69.33 39.95,57.77 39.93,46.2 z"
+       id="path9262"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
   </g>
 </svg>
diff --git a/public/device_images/windows_2019.svg b/public/device_images/windows_2019.svg
new file mode 100644
index 000000000..e33635a52
--- /dev/null
+++ b/public/device_images/windows_2019.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   viewBox="0 0 80 80"
+   version="1.1"
+   id="svg9233"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="windows_new.svg">
+  <metadata
+     id="metadata9268">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9266" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1676"
+     inkscape:window-height="1003"
+     id="namedview9264"
+     showgrid="false"
+     inkscape:zoom="1.5853017"
+     inkscape:cx="118.68676"
+     inkscape:cy="21.535706"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg9233" />
+  <g
+     id="g9284"
+     transform="matrix(0.73993803,0,0,0.73993803,7.569537,7.1494765)">
+    <path
+       d="M 40,6.91 C 55.75,4.5 71.53,2.23 87.31,0.04 c 0.01,13.83 0,27.65 0.01,41.48 C 71.55,41.58 55.78,41.82 40,41.87 39.99,30.21 39.99,18.56 40,6.91 z"
+       id="path9236"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="M 0,12.49 C 11.86,10.66 23.77,9.08 35.68,7.59 35.69,19.06 35.69,30.52 35.7,41.99 23.8,41.98 11.9,42.16 0,42.13 L 0,12.49 z"
+       id="path9238"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="m 0,45.74 c 11.89,-0.04 23.78,0.15 35.67,0.13 0,11.5 0.03,23 0.01,34.5 C 23.8,78.61 11.9,77.07 0,75.46 L 0,45.74 z"
+       id="path9260"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+    <path
+       d="m 39.93,46.2 c 15.8,0 31.59,0 47.38,0 0.02,13.79 0,27.58 0,41.38 C 71.56,85.22 55.78,83.03 40,80.89 39.98,69.33 39.95,57.77 39.93,46.2 z"
+       id="path9262"
+       inkscape:connector-curvature="0"
+       style="fill:#00adef" />
+  </g>
+</svg>
diff --git a/public/icons/executable.svg b/public/icons/executable.svg
new file mode 100755
index 000000000..828dce40d
--- /dev/null
+++ b/public/icons/executable.svg
@@ -0,0 +1,63 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32px" height="32px" viewBox="0 0 32 32" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="33.076088" y1="56.067871" x2="33.076088" y2="58.713959" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(0.000000175,-0.0781325,-0.140639,-0.0000001,49.48457,63.595333)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial1" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(-0.000000175,0.0781325,0.140639,0.0000001,-18.393049,-7.527479)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial2" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(-0.000000175,-0.0781325,0.140639,-0.0000001,-18.393049,63.595333)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial3" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(0.000000175,0.0781325,-0.140639,0.0000001,49.484566,-7.52748)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="31.091534" y1="56.067898" x2="31.091534" y2="5.792224" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(64.705884%,83.92157%,65.490198%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(78.431374%,90.196079%,78.823531%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="31.091534" y1="56.067898" x2="31.091534" y2="5.792224" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(40.000001%,73.333335%,41.568628%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(50.588238%,78.039217%,51.764709%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="249.189407" y1="236.523788" x2="249.189423" y2="254.666687" gradientTransform="matrix(0.0298942,0,0,0.109385,15.042422,-16.526289)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="42.337395" y1="56.067867" x2="42.337395" y2="5.792208" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(40.000001%,73.333335%,41.568628%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(50.588238%,78.039217%,51.764709%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 7.9375 28.03125 L 23.152344 28.03125 L 23.152344 29.359375 L 7.9375 29.359375 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial0);" d="M 23.152344 28.03125 L 25.796875 28.03125 L 25.796875 26.710938 L 23.152344 26.710938 Z M 23.152344 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial1);" d="M 7.9375 28.03125 L 5.292969 28.03125 L 5.292969 29.359375 L 7.9375 29.359375 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial2);" d="M 7.9375 28.03125 L 5.292969 28.03125 L 5.292969 26.710938 L 7.9375 26.710938 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial3);" d="M 23.152344 28.03125 L 25.796875 28.03125 L 25.796875 29.359375 L 23.152344 29.359375 Z M 23.152344 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 18.542969 2.898438 L 6.617188 2.898438 C 5.882812 2.898438 5.292969 3.484375 5.292969 4.21875 L 5.292969 26.710938 C 5.292969 27.445312 5.882812 28.03125 6.617188 28.03125 L 24.476562 28.03125 C 25.210938 28.03125 25.796875 27.445312 25.796875 26.710938 L 25.796875 10.15625 Z M 18.542969 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 10.914062 11.46875 C 10.539062 11.46875 10.226562 11.78125 10.226562 12.15625 L 10.226562 14.804688 C 10.226562 15.140625 10.46875 15.425781 10.804688 15.480469 L 14.609375 16.117188 L 10.804688 16.75 C 10.46875 16.804688 10.226562 17.089844 10.226562 17.425781 L 10.226562 20.070312 C 10.226562 20.449219 10.539062 20.757812 10.914062 20.757812 L 13.5625 20.757812 C 13.84375 20.757812 14.09375 20.585938 14.195312 20.328125 L 15.523438 17.015625 C 15.53125 16.992188 15.539062 16.96875 15.546875 16.945312 C 15.554688 16.96875 15.5625 16.992188 15.570312 17.015625 L 16.890625 20.328125 C 17 20.585938 17.25 20.757812 17.53125 20.757812 L 20.175781 20.757812 C 20.554688 20.757812 20.863281 20.449219 20.863281 20.070312 L 20.863281 17.425781 C 20.863281 17.089844 20.617188 16.804688 20.289062 16.75 L 16.484375 16.117188 L 20.289062 15.480469 C 20.617188 15.425781 20.863281 15.140625 20.863281 14.804688 L 20.863281 12.15625 C 20.863281 11.78125 20.554688 11.46875 20.175781 11.46875 L 17.53125 11.46875 C 17.25 11.46875 17 11.640625 16.890625 11.902344 L 15.570312 15.210938 C 15.5625 15.234375 15.554688 15.257812 15.546875 15.28125 C 15.539062 15.257812 15.53125 15.234375 15.523438 15.210938 L 14.195312 11.902344 C 14.09375 11.640625 13.84375 11.46875 13.5625 11.46875 Z M 11.601562 12.84375 L 13.097656 12.84375 L 13.796875 14.585938 L 11.601562 14.222656 Z M 17.992188 12.84375 L 19.492188 12.84375 L 19.492188 14.222656 L 17.296875 14.585938 Z M 13.796875 17.640625 L 13.097656 19.382812 L 11.601562 19.382812 L 11.601562 18.007812 Z M 17.296875 17.640625 L 19.492188 18.007812 L 19.492188 19.382812 L 17.992188 19.382812 Z M 17.296875 17.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 18.523438 9.015625 L 24.804688 9.015625 L 25.796875 10.007812 L 25.796875 11.328125 L 18.523438 11.328125 Z M 18.523438 9.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.235294;" d="M 5.292969 26.195312 L 5.292969 26.710938 C 5.292969 27.445312 5.882812 28.03125 6.617188 28.03125 L 24.476562 28.03125 C 25.210938 28.03125 25.796875 27.445312 25.796875 26.710938 L 25.796875 26.195312 C 25.796875 26.929688 25.210938 27.519531 24.476562 27.519531 L 6.617188 27.519531 C 5.882812 27.519531 5.292969 26.929688 5.292969 26.195312 Z M 5.292969 26.195312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.392157;" d="M 6.617188 2.898438 C 5.882812 2.898438 5.292969 3.484375 5.292969 4.21875 L 5.292969 4.714844 C 5.292969 3.984375 5.882812 3.390625 6.617188 3.390625 L 18.542969 3.390625 L 25.796875 10.648438 L 25.796875 10.15625 L 18.542969 2.898438 Z M 6.617188 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear4);" d="M 25.796875 10.15625 L 18.542969 2.898438 L 18.542969 8.828125 C 18.542969 9.5625 19.132812 10.15625 19.867188 10.15625 Z M 25.796875 10.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.235294;" d="M 18.542969 8.519531 L 18.542969 8.828125 C 18.542969 9.5625 19.132812 10.15625 19.867188 10.15625 L 25.796875 10.15625 L 25.488281 9.84375 L 19.867188 9.84375 C 19.132812 9.84375 18.542969 9.25 18.542969 8.519531 Z M 18.542969 8.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.392157;" d="M 18.542969 2.898438 L 18.542969 3.390625 L 25.304688 10.15625 L 25.796875 10.15625 Z M 18.542969 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.941177%,12.941177%,12.941177%);fill-opacity:1;" d="M 18.539062 2.804688 C 18.492188 2.804688 18.449219 2.84375 18.449219 2.898438 L 18.449219 8.828125 C 18.449219 9.613281 19.082031 10.25 19.867188 10.25 L 25.796875 10.25 C 25.835938 10.246094 25.871094 10.226562 25.886719 10.1875 C 25.898438 10.15625 25.890625 10.113281 25.867188 10.085938 L 18.609375 2.828125 C 18.589844 2.8125 18.566406 2.804688 18.539062 2.804688 Z M 18.636719 3.125 L 25.570312 10.058594 L 19.867188 10.058594 C 19.179688 10.058594 18.636719 9.515625 18.636719 8.828125 Z M 18.636719 3.125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.941177%,12.941177%,12.941177%);fill-opacity:1;" d="M 6.617188 2.804688 C 5.832031 2.804688 5.199219 3.4375 5.199219 4.21875 L 5.199219 26.710938 C 5.199219 27.492188 5.832031 28.125 6.617188 28.125 L 24.476562 28.125 C 25.257812 28.125 25.890625 27.492188 25.890625 26.710938 L 25.890625 10.15625 C 25.890625 10.128906 25.882812 10.105469 25.867188 10.085938 L 18.609375 2.828125 C 18.589844 2.8125 18.566406 2.804688 18.542969 2.804688 Z M 6.617188 2.992188 L 18.503906 2.992188 L 25.703125 10.191406 L 25.703125 26.710938 C 25.703125 27.390625 25.15625 27.9375 24.476562 27.9375 L 6.617188 27.9375 C 5.929688 27.9375 5.386719 27.390625 5.386719 26.710938 L 5.386719 4.21875 C 5.386719 3.539062 5.929688 2.992188 6.617188 2.992188 Z M 6.617188 2.992188 "/>
+<path style="fill:none;stroke-width:11.338583;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(12.941177%,12.941177%,12.941177%);stroke-opacity:1;stroke-miterlimit:4;" d="M 660.172677 693.712755 C 637.261496 693.712755 618.601875 712.372377 618.601875 735.283557 L 618.601875 895.189425 C 618.601875 915.502431 633.246134 932.744866 653.322942 936.051634 L 883.379539 974.551865 L 653.322942 1012.815899 C 633.246134 1016.122667 618.601875 1033.365102 618.601875 1053.678107 L 618.601875 1213.583976 C 618.601875 1236.495156 637.261496 1255.154777 660.172677 1255.154777 L 820.078545 1255.154777 C 837.084782 1255.154777 852.201437 1244.762077 858.578776 1229.173026 L 938.649809 1029.113543 C 939.122205 1027.696356 939.5946 1026.27917 940.066996 1024.625786 C 940.539391 1026.27917 941.011787 1027.696356 941.484182 1029.113543 L 1021.555215 1229.173026 C 1027.932554 1244.762077 1043.049209 1255.154777 1060.055446 1255.154777 L 1219.961315 1255.154777 C 1242.872495 1255.154777 1261.532116 1236.495156 1261.532116 1213.583976 L 1261.532116 1053.678107 C 1261.532116 1033.365102 1246.887857 1016.122667 1226.811049 1012.815899 L 996.754453 974.551865 L 1226.811049 936.051634 C 1246.887857 932.744866 1261.532116 915.502431 1261.532116 895.189425 L 1261.532116 735.283557 C 1261.532116 712.372377 1242.872495 693.712755 1219.961315 693.712755 L 1060.055446 693.712755 C 1043.049209 693.712755 1027.932554 704.105456 1021.555215 719.694506 L 941.484182 919.75399 C 941.011787 921.171177 940.539391 922.588363 940.066996 924.241747 C 939.5946 922.588363 939.122205 921.171177 938.649809 919.75399 L 858.578776 719.694506 C 852.201437 704.105456 837.084782 693.712755 820.078545 693.712755 Z M 701.507281 776.618161 L 791.971014 776.618161 L 834.250409 882.19855 L 701.507281 859.995963 Z M 1088.162977 776.618161 L 1178.626711 776.618161 L 1178.626711 859.995963 L 1045.883582 882.19855 Z M 834.250409 1066.668983 L 791.971014 1172.249372 L 701.507281 1172.249372 L 701.507281 1088.87157 Z M 1045.883582 1066.668983 L 1178.626711 1088.87157 L 1178.626711 1172.249372 L 1088.162977 1172.249372 Z M 1045.883582 1066.668983 " transform="matrix(0.0165381,0,0,0.0165381,0,0)"/>
+</g>
+</svg>
diff --git a/public/icons/executables.svg b/public/icons/executables.svg
new file mode 100644
index 000000000..828dce40d
--- /dev/null
+++ b/public/icons/executables.svg
@@ -0,0 +1,63 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32px" height="32px" viewBox="0 0 32 32" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="33.076088" y1="56.067871" x2="33.076088" y2="58.713959" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(0.000000175,-0.0781325,-0.140639,-0.0000001,49.48457,63.595333)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial1" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(-0.000000175,0.0781325,0.140639,0.0000001,-18.393049,-7.527479)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial2" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(-0.000000175,-0.0781325,0.140639,-0.0000001,-18.393049,63.595333)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<radialGradient id="radial3" gradientUnits="userSpaceOnUse" cx="450.908936" cy="189.579361" fx="450.908936" fy="189.579361" r="21.166656" gradientTransform="matrix(0.000000175,0.0781325,-0.140639,0.0000001,49.484566,-7.52748)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.313726;"/>
+<stop offset="0.222222" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</radialGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="31.091534" y1="56.067898" x2="31.091534" y2="5.792224" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(64.705884%,83.92157%,65.490198%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(78.431374%,90.196079%,78.823531%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="31.091534" y1="56.067898" x2="31.091534" y2="5.792224" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(40.000001%,73.333335%,41.568628%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(50.588238%,78.039217%,51.764709%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="249.189407" y1="236.523788" x2="249.189423" y2="254.666687" gradientTransform="matrix(0.0298942,0,0,0.109385,15.042422,-16.526289)">
+<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:0.27451;"/>
+<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="42.337395" y1="56.067867" x2="42.337395" y2="5.792208" gradientTransform="matrix(0.5,0,0,0.5,0,0)">
+<stop offset="0" style="stop-color:rgb(40.000001%,73.333335%,41.568628%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(50.588238%,78.039217%,51.764709%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 7.9375 28.03125 L 23.152344 28.03125 L 23.152344 29.359375 L 7.9375 29.359375 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial0);" d="M 23.152344 28.03125 L 25.796875 28.03125 L 25.796875 26.710938 L 23.152344 26.710938 Z M 23.152344 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial1);" d="M 7.9375 28.03125 L 5.292969 28.03125 L 5.292969 29.359375 L 7.9375 29.359375 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial2);" d="M 7.9375 28.03125 L 5.292969 28.03125 L 5.292969 26.710938 L 7.9375 26.710938 Z M 7.9375 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#radial3);" d="M 23.152344 28.03125 L 25.796875 28.03125 L 25.796875 29.359375 L 23.152344 29.359375 Z M 23.152344 28.03125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 18.542969 2.898438 L 6.617188 2.898438 C 5.882812 2.898438 5.292969 3.484375 5.292969 4.21875 L 5.292969 26.710938 C 5.292969 27.445312 5.882812 28.03125 6.617188 28.03125 L 24.476562 28.03125 C 25.210938 28.03125 25.796875 27.445312 25.796875 26.710938 L 25.796875 10.15625 Z M 18.542969 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 10.914062 11.46875 C 10.539062 11.46875 10.226562 11.78125 10.226562 12.15625 L 10.226562 14.804688 C 10.226562 15.140625 10.46875 15.425781 10.804688 15.480469 L 14.609375 16.117188 L 10.804688 16.75 C 10.46875 16.804688 10.226562 17.089844 10.226562 17.425781 L 10.226562 20.070312 C 10.226562 20.449219 10.539062 20.757812 10.914062 20.757812 L 13.5625 20.757812 C 13.84375 20.757812 14.09375 20.585938 14.195312 20.328125 L 15.523438 17.015625 C 15.53125 16.992188 15.539062 16.96875 15.546875 16.945312 C 15.554688 16.96875 15.5625 16.992188 15.570312 17.015625 L 16.890625 20.328125 C 17 20.585938 17.25 20.757812 17.53125 20.757812 L 20.175781 20.757812 C 20.554688 20.757812 20.863281 20.449219 20.863281 20.070312 L 20.863281 17.425781 C 20.863281 17.089844 20.617188 16.804688 20.289062 16.75 L 16.484375 16.117188 L 20.289062 15.480469 C 20.617188 15.425781 20.863281 15.140625 20.863281 14.804688 L 20.863281 12.15625 C 20.863281 11.78125 20.554688 11.46875 20.175781 11.46875 L 17.53125 11.46875 C 17.25 11.46875 17 11.640625 16.890625 11.902344 L 15.570312 15.210938 C 15.5625 15.234375 15.554688 15.257812 15.546875 15.28125 C 15.539062 15.257812 15.53125 15.234375 15.523438 15.210938 L 14.195312 11.902344 C 14.09375 11.640625 13.84375 11.46875 13.5625 11.46875 Z M 11.601562 12.84375 L 13.097656 12.84375 L 13.796875 14.585938 L 11.601562 14.222656 Z M 17.992188 12.84375 L 19.492188 12.84375 L 19.492188 14.222656 L 17.296875 14.585938 Z M 13.796875 17.640625 L 13.097656 19.382812 L 11.601562 19.382812 L 11.601562 18.007812 Z M 17.296875 17.640625 L 19.492188 18.007812 L 19.492188 19.382812 L 17.992188 19.382812 Z M 17.296875 17.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 18.523438 9.015625 L 24.804688 9.015625 L 25.796875 10.007812 L 25.796875 11.328125 L 18.523438 11.328125 Z M 18.523438 9.015625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.235294;" d="M 5.292969 26.195312 L 5.292969 26.710938 C 5.292969 27.445312 5.882812 28.03125 6.617188 28.03125 L 24.476562 28.03125 C 25.210938 28.03125 25.796875 27.445312 25.796875 26.710938 L 25.796875 26.195312 C 25.796875 26.929688 25.210938 27.519531 24.476562 27.519531 L 6.617188 27.519531 C 5.882812 27.519531 5.292969 26.929688 5.292969 26.195312 Z M 5.292969 26.195312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.392157;" d="M 6.617188 2.898438 C 5.882812 2.898438 5.292969 3.484375 5.292969 4.21875 L 5.292969 4.714844 C 5.292969 3.984375 5.882812 3.390625 6.617188 3.390625 L 18.542969 3.390625 L 25.796875 10.648438 L 25.796875 10.15625 L 18.542969 2.898438 Z M 6.617188 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear4);" d="M 25.796875 10.15625 L 18.542969 2.898438 L 18.542969 8.828125 C 18.542969 9.5625 19.132812 10.15625 19.867188 10.15625 Z M 25.796875 10.15625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.235294;" d="M 18.542969 8.519531 L 18.542969 8.828125 C 18.542969 9.5625 19.132812 10.15625 19.867188 10.15625 L 25.796875 10.15625 L 25.488281 9.84375 L 19.867188 9.84375 C 19.132812 9.84375 18.542969 9.25 18.542969 8.519531 Z M 18.542969 8.519531 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.392157;" d="M 18.542969 2.898438 L 18.542969 3.390625 L 25.304688 10.15625 L 25.796875 10.15625 Z M 18.542969 2.898438 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.941177%,12.941177%,12.941177%);fill-opacity:1;" d="M 18.539062 2.804688 C 18.492188 2.804688 18.449219 2.84375 18.449219 2.898438 L 18.449219 8.828125 C 18.449219 9.613281 19.082031 10.25 19.867188 10.25 L 25.796875 10.25 C 25.835938 10.246094 25.871094 10.226562 25.886719 10.1875 C 25.898438 10.15625 25.890625 10.113281 25.867188 10.085938 L 18.609375 2.828125 C 18.589844 2.8125 18.566406 2.804688 18.539062 2.804688 Z M 18.636719 3.125 L 25.570312 10.058594 L 19.867188 10.058594 C 19.179688 10.058594 18.636719 9.515625 18.636719 8.828125 Z M 18.636719 3.125 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(12.941177%,12.941177%,12.941177%);fill-opacity:1;" d="M 6.617188 2.804688 C 5.832031 2.804688 5.199219 3.4375 5.199219 4.21875 L 5.199219 26.710938 C 5.199219 27.492188 5.832031 28.125 6.617188 28.125 L 24.476562 28.125 C 25.257812 28.125 25.890625 27.492188 25.890625 26.710938 L 25.890625 10.15625 C 25.890625 10.128906 25.882812 10.105469 25.867188 10.085938 L 18.609375 2.828125 C 18.589844 2.8125 18.566406 2.804688 18.542969 2.804688 Z M 6.617188 2.992188 L 18.503906 2.992188 L 25.703125 10.191406 L 25.703125 26.710938 C 25.703125 27.390625 25.15625 27.9375 24.476562 27.9375 L 6.617188 27.9375 C 5.929688 27.9375 5.386719 27.390625 5.386719 26.710938 L 5.386719 4.21875 C 5.386719 3.539062 5.929688 2.992188 6.617188 2.992188 Z M 6.617188 2.992188 "/>
+<path style="fill:none;stroke-width:11.338583;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(12.941177%,12.941177%,12.941177%);stroke-opacity:1;stroke-miterlimit:4;" d="M 660.172677 693.712755 C 637.261496 693.712755 618.601875 712.372377 618.601875 735.283557 L 618.601875 895.189425 C 618.601875 915.502431 633.246134 932.744866 653.322942 936.051634 L 883.379539 974.551865 L 653.322942 1012.815899 C 633.246134 1016.122667 618.601875 1033.365102 618.601875 1053.678107 L 618.601875 1213.583976 C 618.601875 1236.495156 637.261496 1255.154777 660.172677 1255.154777 L 820.078545 1255.154777 C 837.084782 1255.154777 852.201437 1244.762077 858.578776 1229.173026 L 938.649809 1029.113543 C 939.122205 1027.696356 939.5946 1026.27917 940.066996 1024.625786 C 940.539391 1026.27917 941.011787 1027.696356 941.484182 1029.113543 L 1021.555215 1229.173026 C 1027.932554 1244.762077 1043.049209 1255.154777 1060.055446 1255.154777 L 1219.961315 1255.154777 C 1242.872495 1255.154777 1261.532116 1236.495156 1261.532116 1213.583976 L 1261.532116 1053.678107 C 1261.532116 1033.365102 1246.887857 1016.122667 1226.811049 1012.815899 L 996.754453 974.551865 L 1226.811049 936.051634 C 1246.887857 932.744866 1261.532116 915.502431 1261.532116 895.189425 L 1261.532116 735.283557 C 1261.532116 712.372377 1242.872495 693.712755 1219.961315 693.712755 L 1060.055446 693.712755 C 1043.049209 693.712755 1027.932554 704.105456 1021.555215 719.694506 L 941.484182 919.75399 C 941.011787 921.171177 940.539391 922.588363 940.066996 924.241747 C 939.5946 922.588363 939.122205 921.171177 938.649809 919.75399 L 858.578776 719.694506 C 852.201437 704.105456 837.084782 693.712755 820.078545 693.712755 Z M 701.507281 776.618161 L 791.971014 776.618161 L 834.250409 882.19855 L 701.507281 859.995963 Z M 1088.162977 776.618161 L 1178.626711 776.618161 L 1178.626711 859.995963 L 1045.883582 882.19855 Z M 834.250409 1066.668983 L 791.971014 1172.249372 L 701.507281 1172.249372 L 701.507281 1088.87157 Z M 1045.883582 1066.668983 L 1178.626711 1088.87157 L 1178.626711 1172.249372 L 1088.162977 1172.249372 Z M 1045.883582 1066.668983 " transform="matrix(0.0165381,0,0,0.0165381,0,0)"/>
+</g>
+</svg>