diff --git a/Packer/floppy/PinTo10.exe b/Packer/floppy/PinTo10.exe
old mode 100644
new mode 100755
diff --git a/Packer/floppy/WindowsPowershell.lnk b/Packer/floppy/WindowsPowershell.lnk
old mode 100644
new mode 100755
diff --git a/Packer/scripts/MakeWindows10GreatAgain.ps1 b/Packer/scripts/MakeWindows10GreatAgain.ps1
old mode 100644
new mode 100755
diff --git a/Packer/scripts/MakeWindows10GreatAgain.reg b/Packer/scripts/MakeWindows10GreatAgain.reg
old mode 100644
new mode 100755
diff --git a/Packer/scripts/rearm-windows.ps1 b/Packer/scripts/rearm-windows.ps1
old mode 100644
new mode 100755
diff --git a/Packer/scripts/sysprep.bat b/Packer/scripts/sysprep.bat
old mode 100644
new mode 100755
diff --git a/Vagrant/bootstrap.sh b/Vagrant/bootstrap.sh
index 3bf497d..39b6fa7 100644
--- a/Vagrant/bootstrap.sh
+++ b/Vagrant/bootstrap.sh
@@ -131,8 +131,16 @@ install_splunk() {
     # Skip Splunk Tour and Change Password Dialog
     echo "[$(date +%H:%M:%S)]: Disabling the Splunk tour prompt..."
     touch /opt/splunk/etc/.ui_login
-    mkdir /opt/splunk/etc/users/admin/search/local
-    echo -e "[search-tour]\nviewed = 1" > /opt/splunk/etc/users/admin/search/local/ui-tour.conf
+    mkdir -p /opt/splunk/etc/users/admin/search/local
+    echo -e "[search-tour]\nviewed = 1" > /opt/splunk/etc/system/local/ui-tour.conf
+    mkdir /opt/splunk/etc/apps/user-prefs/local
+    echo '[general]
+ render_version_messages = 0
+ hideInstrumentationOptInModal = 1
+ dismissedInstrumentationOptInVersion = 2
+ [general_default]
+ hideInstrumentationOptInModal = 1
+ showWhatsNew = 0' > /opt/splunk/etc/apps/user-prefs/local/user-prefs.conf
 
     # Enable SSL Login for Splunk
     echo -e "[settings]\nenableSplunkWebSSL = true" > /opt/splunk/etc/system/local/web.conf
@@ -204,13 +212,19 @@ install_bro() {
   SPLUNK_BRO_JSON=/opt/splunk/etc/apps/TA-bro_json
   SPLUNK_BRO_MONITOR='monitor:///opt/bro/spool/manager'
   SPLUNK_SURICATA_MONITOR='monitor:///var/log/suricata'
+  SPLUNK_SURICATA_SOURCETYPE='json_suricata'
   echo "deb http://download.opensuse.org/repositories/network:/bro/xUbuntu_16.04/ /" > /etc/apt/sources.list.d/bro.list
   curl -s http://download.opensuse.org/repositories/network:/bro/xUbuntu_16.04/Release.key |apt-key add -
 
   # Update APT repositories
   apt-get -qq -ym update
   # Install tools to build and configure bro
-  apt-get -qq -ym install bro crudini
+  apt-get -qq -ym install bro crudini python-pip
+  export PATH=$PATH:/opt/bro/bin
+  pip install bro-pkg
+  bro-pkg refresh
+  bro-pkg autoconfig
+  bro-pkg install --force salesforce/ja3
   # Load bro scripts
   echo '
   @load protocols/ftp/software
@@ -226,6 +240,7 @@ install_bro() {
   @load policy/protocols/smb
   @load policy/protocols/conn/vlan-logging
   @load policy/protocols/conn/mac-logging
+  @load ja3
 
   redef Intel::read_files += {
     "/opt/bro/etc/intel.dat"
@@ -266,6 +281,7 @@ install_bro() {
   crudini --set  $SPLUNK_BRO_JSON/local/inputs.conf $SPLUNK_SURICATA_MONITOR sourcetype   json_suricata
   crudini --set  $SPLUNK_BRO_JSON/local/inputs.conf $SPLUNK_SURICATA_MONITOR whitelist   'eve.json'
   crudini --set  $SPLUNK_BRO_JSON/local/inputs.conf $SPLUNK_SURICATA_MONITOR disabled   0
+  crudini --set  $SPLUNK_BRO_JSON/local/props.conf  $SPLUNK_SURICATA_SOURCETYPE TRUNCATE    0
 
   # Ensure permissions are correct and restart splunk
   chown -R splunk $SPLUNK_BRO_JSON
@@ -314,9 +330,12 @@ install_suricata() {
   /root/go/bin/yq d  -i /etc/suricata/suricata.yaml outputs.1.eve-log.types.2 # Remove SSH
   /root/go/bin/yq d  -i /etc/suricata/suricata.yaml outputs.1.eve-log.types.2 # Remove Stats
   /root/go/bin/yq d  -i /etc/suricata/suricata.yaml outputs.1.eve-log.types.2 # Remove Flow
+  # Enable JA3 fingerprinting
+  /root/go/bin/yq w -i /etc/suricata/suricata.yaml app-layer.protocols.tls.ja3-fingerprints true
   # AF packet monitoring should be set to eth1
   /root/go/bin/yq w -i /etc/suricata/suricata.yaml af-packet.0.interface eth1
 
+
   crudini --set --format=sh /etc/default/suricata '' iface eth1
   # update suricata signature sources
   suricata-update update-sources
@@ -378,6 +397,11 @@ test_suricata_prerequisites() {
   fi
 }
 
+postinstall_tasks() {
+  # Include Splunk and Bro in the PATH
+  echo export PATH="$PATH:/opt/splunk/bin:/opt/bro/bin" >> ~/.bashrc
+}
+
 main() {
   apt_install_prerequisites
   test_prerequisites
@@ -389,6 +413,7 @@ main() {
   import_osquery_config_into_fleet
   install_suricata
   install_bro
+  postinstall_tasks
 }
 
 main
diff --git a/Vagrant/scripts/MakeWindows10GreatAgain.ps1 b/Vagrant/scripts/MakeWindows10GreatAgain.ps1
index e2c5db2..a1a9508 100644
--- a/Vagrant/scripts/MakeWindows10GreatAgain.ps1
+++ b/Vagrant/scripts/MakeWindows10GreatAgain.ps1
@@ -38,3 +38,7 @@ if (-not (Test-Path $shutUp10RepoPath)) {
 } else {
   Write-Host "ShutUp10 was already installed. Moving On."
 }
+
+# Remove the Edge shortcut from the Desktop
+$lnkPath = "c:\Users\vagrant\Desktop\Microsoft Edge.lnk"
+if (Test-Path $lnkPath) { Remove-Item $lnkPath }
diff --git a/Vagrant/scripts/bginfo.bgi b/Vagrant/scripts/bginfo.bgi
index 88ddfbd..41c18e3 100755
Binary files a/Vagrant/scripts/bginfo.bgi and b/Vagrant/scripts/bginfo.bgi differ