diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h
index e1a24ae5c..0c5516dfc 100644
--- a/esp32_marauder/Display.h
+++ b/esp32_marauder/Display.h
@@ -46,9 +46,9 @@
 #define LV_ADD_SSID 14
 #define WIFI_ATTACK_BEACON_LIST 15
 
-#define TFT_SHIELD
-//#define TFT_DIY
-//#define KIT
+//#define TFT_SHIELD
+#define TFT_DIY
+#define KIT
 
 #define SCREEN_WIDTH 240
 #define SCREEN_HEIGHT 320
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 2107d6ba3..af56e3baa 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -279,15 +279,20 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
   else if (scan_mode == WIFI_PACKET_MONITOR)
     RunPacketMonitor(scan_mode, color);
   else if (scan_mode == WIFI_ATTACK_BEACON_LIST)
-    RunBeaconList(scan_mode, color);
+    this->startWiFiAttacks(scan_mode, color, " Beacon Spam List ");
+    //RunBeaconList(scan_mode, color);
   else if (scan_mode == WIFI_ATTACK_BEACON_SPAM)
-    RunBeaconSpam(scan_mode, color);
+    this->startWiFiAttacks(scan_mode, color, " Beacon Spam Random ");
+    //RunBeaconSpam(scan_mode, color);
   else if (scan_mode == WIFI_ATTACK_RICK_ROLL)
-    RunRickRoll(scan_mode, color);
+    this->startWiFiAttacks(scan_mode, color, " Rick Roll Beacon ");
+    //RunRickRoll(scan_mode, color);
   else if (scan_mode == WIFI_ATTACK_AUTH)
-    RunProbeFlood(scan_mode, color);
+    this->startWiFiAttacks(scan_mode, color, " Probe Flood ");
+    //RunProbeFlood(scan_mode, color);
   else if (scan_mode == WIFI_ATTACK_DEAUTH)
-    RunDeauthFlood(scan_mode, color);
+    this->startWiFiAttacks(scan_mode, color, " Deauth Flood ");
+    //RunDeauthFlood(scan_mode, color);
   else if (scan_mode == BT_SCAN_ALL)
     RunBluetoothScan(scan_mode, color);
   else if (scan_mode == BT_SCAN_SKIMMERS)
@@ -302,6 +307,35 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
   WiFiScan::currentScanMode = scan_mode;
 }
 
+void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_string) {
+  // Common wifi attack configurations
+  display_obj.TOP_FIXED_AREA_2 = 48;
+  display_obj.tteBar = true;
+  display_obj.print_delay_1 = 15;
+  display_obj.print_delay_2 = 10;
+  //display_obj.clearScreen();
+  display_obj.initScrollValues(true);
+  display_obj.tft.setTextWrap(false);
+  display_obj.tft.setTextColor(TFT_BLACK, color);
+  display_obj.tft.fillRect(0,16,240,16, color);
+  display_obj.tft.drawCentreString((String)title_string,120,16,2);
+  display_obj.touchToExit();
+  display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
+  packets_sent = 0;
+  //esp_wifi_set_mode(WIFI_MODE_STA);
+  //WiFi.mode(WIFI_AP_STA);
+  esp_wifi_init(&cfg);
+  esp_wifi_set_storage(WIFI_STORAGE_RAM);
+  //WiFi.mode(WIFI_AP_STA);
+  esp_wifi_set_mode(WIFI_AP_STA);
+  esp_wifi_start();
+  esp_wifi_set_promiscuous_filter(NULL);
+  esp_wifi_set_promiscuous(true);
+  esp_wifi_set_max_tx_power(78);
+  this->wifi_initialized = true;
+  initTime = millis();
+}
+
 bool WiFiScan::shutdownWiFi() {
   if (this->wifi_initialized) {
     Serial.println("Ahhh yes...promiscuity will end");
@@ -767,6 +801,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
   initTime = millis();
 }
 
+/*
 void WiFiScan::RunRickRoll(uint8_t scan_mode, uint16_t color)
 {
   //Serial.println("Rick Roll...");
@@ -793,9 +828,10 @@ void WiFiScan::RunRickRoll(uint8_t scan_mode, uint16_t color)
   initTime = millis();
   //display_obj.clearScreen();
   //Serial.println("End of func");
-}
+}*/
 
 // Function to prepare for beacon list
+/*
 void WiFiScan::RunBeaconList(uint8_t scan_mode, uint16_t color) {
   sd_obj.openCapture("beacon_list");
   
@@ -824,40 +860,8 @@ void WiFiScan::RunBeaconList(uint8_t scan_mode, uint16_t color) {
   esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
   this->wifi_initialized = true;
   initTime = millis();
-}
-/*
-void WiFiScan::RunBeaconList(uint8_t scan_mode, uint16_t color)
-{
-  //Serial.println("Beacon list...");
-  display_obj.TOP_FIXED_AREA_2 = 48;
-  display_obj.tteBar = true;
-  display_obj.print_delay_1 = 15;
-  display_obj.print_delay_2 = 10;
-  //display_obj.clearScreen();
-  display_obj.initScrollValues(true);
-  display_obj.tft.setTextWrap(false);
-  display_obj.tft.setTextColor(TFT_BLACK, color);
-  display_obj.tft.fillRect(0,16,240,16, color);
-  display_obj.tft.drawCentreString(" Beacon Spam List ",120,16,2);
-  display_obj.touchToExit();
-  display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
-  packets_sent = 0;
-  //esp_wifi_set_mode(WIFI_MODE_STA);
-  //WiFi.mode(WIFI_AP_STA);
-  esp_wifi_init(&cfg);
-  esp_wifi_set_storage(WIFI_STORAGE_RAM);
-  //WiFi.mode(WIFI_AP_STA);
-  esp_wifi_set_mode(WIFI_AP_STA);
-  esp_wifi_start();
-  esp_wifi_set_promiscuous_filter(NULL);
-  esp_wifi_set_promiscuous(true);
-  esp_wifi_set_max_tx_power(78);
-  this->wifi_initialized = true;
-  initTime = millis();
-  //display_obj.clearScreen();
-  //Serial.println("End of func");
-}
-*/
+}*/
+
 
 // Function to prepare for beacon mimic
 void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) {
@@ -891,6 +895,7 @@ void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) {
 }
 
 // Function to prepare for beacon spam
+/*
 void WiFiScan::RunProbeFlood(uint8_t scan_mode, uint16_t color) {
   display_obj.TOP_FIXED_AREA_2 = 48;
   display_obj.tteBar = true;
@@ -919,8 +924,9 @@ void WiFiScan::RunProbeFlood(uint8_t scan_mode, uint16_t color) {
   initTime = millis();
   //display_obj.clearScreen();
   //Serial.println("End of func");
-}
+}*/
 
+/*
 void WiFiScan::RunDeauthFlood(uint8_t scan_mode, uint16_t color) {
   display_obj.TOP_FIXED_AREA_2 = 48;
   display_obj.tteBar = true;
@@ -949,9 +955,10 @@ void WiFiScan::RunDeauthFlood(uint8_t scan_mode, uint16_t color) {
   initTime = millis();
   //display_obj.clearScreen();
   //Serial.println("End of func");
-}
+}*/
 
 // Function to prepare for beacon spam
+/*
 void WiFiScan::RunBeaconSpam(uint8_t scan_mode, uint16_t color)
 {
   //Serial.println("Beacon Spam...");
@@ -982,7 +989,7 @@ void WiFiScan::RunBeaconSpam(uint8_t scan_mode, uint16_t color)
   initTime = millis();
   //display_obj.clearScreen();
   //Serial.println("End of func");
-}
+}*/
 
 void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 {
diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index 2fe511af0..45d006930 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -194,6 +194,8 @@ class WiFiScan
                               0xf0, 0xff, 0x02, 0x00
                           };
 
+    void startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_string);
+
     void packetMonitorMain(uint32_t currentTime);
     void eapolMonitorMain(uint32_t currentTime);
     void changeChannel();
@@ -209,12 +211,12 @@ class WiFiScan
     void broadcastCustomBeacon(uint32_t current_time, ssid custom_ssid);
     void broadcastSetSSID(uint32_t current_time, char* ESSID);
     void RunAPScan(uint8_t scan_mode, uint16_t color);
-    void RunRickRoll(uint8_t scan_mode, uint16_t color);
-    void RunBeaconSpam(uint8_t scan_mode, uint16_t color);
-    void RunProbeFlood(uint8_t scan_mode, uint16_t color);
-    void RunDeauthFlood(uint8_t scan_mode, uint16_t color);
+    //void RunRickRoll(uint8_t scan_mode, uint16_t color);
+    //void RunBeaconSpam(uint8_t scan_mode, uint16_t color);
+    //void RunProbeFlood(uint8_t scan_mode, uint16_t color);
+    //void RunDeauthFlood(uint8_t scan_mode, uint16_t color);
     void RunMimicFlood(uint8_t scan_mode, uint16_t color);
-    void RunBeaconList(uint8_t scan_mode, uint16_t color);
+    //void RunBeaconList(uint8_t scan_mode, uint16_t color);
     void RunEspressifScan(uint8_t scan_mode, uint16_t color);
     void RunPwnScan(uint8_t scan_mode, uint16_t color);
     void RunBeaconScan(uint8_t scan_mode, uint16_t color);
diff --git a/esp32_marauder/esp32_marauder_v0_9_3_20210724_kit.bin b/esp32_marauder/esp32_marauder_v0_9_3_20210724_kit.bin
index 37f881168..11cd2a646 100644
Binary files a/esp32_marauder/esp32_marauder_v0_9_3_20210724_kit.bin and b/esp32_marauder/esp32_marauder_v0_9_3_20210724_kit.bin differ
diff --git a/esp32_marauder/esp32_marauder_v0_9_3_20210724_new_hardware.bin b/esp32_marauder/esp32_marauder_v0_9_3_20210724_new_hardware.bin
new file mode 100644
index 000000000..008163b8d
Binary files /dev/null and b/esp32_marauder/esp32_marauder_v0_9_3_20210724_new_hardware.bin differ
diff --git a/esp32_marauder/esp32_marauder_v0_9_3_20210724_old_hardware.bin b/esp32_marauder/esp32_marauder_v0_9_3_20210724_old_hardware.bin
index aa27a68eb..d26b7f435 100644
Binary files a/esp32_marauder/esp32_marauder_v0_9_3_20210724_old_hardware.bin and b/esp32_marauder/esp32_marauder_v0_9_3_20210724_old_hardware.bin differ