diff --git a/esp32_marauder/Display.h b/esp32_marauder/Display.h
index 9692342..5640912 100644
--- a/esp32_marauder/Display.h
+++ b/esp32_marauder/Display.h
@@ -1,204 +1,204 @@
-#ifndef Display_h
-#define Display_h
-
-
-#include <FS.h>
-#include <functional>
-#include <JPEGDecoder.h>
-//#include <SimpleList.h>
-#include <LinkedList.h>
-#include <SPI.h>
-#include <lvgl.h>
-#include <Ticker.h>
-//#include <M5Stack.h>
-#include "SPIFFS.h"
-#include "Assets.h"
-
-#include <TFT_eSPI.h>
-
-#define TFT_MISO 19
-#define TFT_MOSI 23
-#define TFT_SCLK 18
-#define TFT_CS 27
-#define TFT_DC 26
-#define TFT_RST 5
-#define TFT_BL 32
-#define TOUCH_CS 21
-#define SD_CS 4
-
-// WiFi stuff
-#define OTA_UPDATE 100
-#define SHOW_INFO 101
-#define WIFI_SCAN_OFF 0
-#define WIFI_SCAN_PROBE 1
-#define WIFI_SCAN_AP 2
-#define WIFI_SCAN_PWN 3
-#define WIFI_SCAN_EAPOL 4
-#define WIFI_SCAN_DEAUTH 5
-#define WIFI_SCAN_ALL 6
-#define WIFI_PACKET_MONITOR 7
-#define WIFI_ATTACK_BEACON_SPAM 8
-#define WIFI_ATTACK_RICK_ROLL 9
-#define BT_SCAN_ALL 10
-#define BT_SCAN_SKIMMERS 11
-#define WIFI_SCAN_ESPRESSIF 12
-#define LV_JOIN_WIFI 13
-#define LV_ADD_SSID 14
-#define WIFI_ATTACK_BEACON_LIST 15
-
-//#define TFT_SHIELD
-#define TFT_DIY
-//#define KIT
-
-#define SCREEN_WIDTH 240
-#define SCREEN_HEIGHT 320
-#define HEIGHT_1 240
-#define WIDTH_1 320
-#define STANDARD_FONT_CHAR_LIMIT 40 // number of characters on a single line with normal font
-#define TEXT_HEIGHT 16 // Height of text to be printed and scrolled
-#define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen)
-#define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen)
-#define YMAX 320 // Bottom of screen area
-#define minimum(a,b)     (((a) < (b)) ? (a) : (b))
-//#define MENU_FONT NULL
-#define MENU_FONT &FreeMono9pt7b // Winner
-//#define MENU_FONT &FreeMonoBold9pt7b
-//#define MENU_FONT &FreeSans9pt7b
-//#define MENU_FONT &FreeSansBold9pt7b
-#define BUTTON_ARRAY_LEN 9
-#define STATUS_BAR_WIDTH 16
-#define LVGL_TICK_PERIOD 6
-
-#define FRAME_X 100
-#define FRAME_Y 64
-#define FRAME_W 120
-#define FRAME_H 50
-
-// Red zone size
-#define REDBUTTON_X FRAME_X
-#define REDBUTTON_Y FRAME_Y
-#define REDBUTTON_W (FRAME_W/2)
-#define REDBUTTON_H FRAME_H
-
-// Green zone size
-#define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W)
-#define GREENBUTTON_Y FRAME_Y
-#define GREENBUTTON_W (FRAME_W/2)
-#define GREENBUTTON_H FRAME_H
-
-#define STATUSBAR_COLOR 0x4A49
-
-#define KIT_LED_BUILTIN 13
-
-/*
-PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
-PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
-
-PROGMEM static lv_disp_buf_t disp_buf;
-PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];
-
-PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
-PROGMEM static void keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
-
-// lvgl stuff
-PROGMEM static lv_obj_t *kb;
-*/
-
-class Display
-{
-  private:
-    bool SwitchOn = false;
-    
-    bool run_setup = true;
-    
-    // For the byte we read from the serial port
-    byte data = 0;
-    
-    // A few test variables used during debugging
-    boolean change_colour = 1;
-    boolean selected = 1;
-
-    void drawFrame();
-
-    //void addNodes(Menu* menu, String name, Menu* child, std::function<void()> callable);
-    //void changeMenu(Menu* menu);
-    //void showMenuList(Menu* menu, int layer);
-    //static void lv_tick_handler();
-
-  public:
-    Display();
-    //Ticker tick;
-    TFT_eSPI tft = TFT_eSPI();
-    TFT_eSprite img = TFT_eSprite(&tft);
-    TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
-    const String PROGMEM version_number = "v0.9.3";
-
-    bool printing = false;
-    bool loading = false;
-    bool tteBar = false;
-    bool draw_tft = false;
-    bool exit_draw = false;
-
-    int TOP_FIXED_AREA_2 = 48;
-    int print_delay_1, print_delay_2 = 10;
-    int current_banner_pos = SCREEN_WIDTH;
-
-    //Menu* current_menu;
-    
-    //Menu mainMenu;
-    //Menu wifiMenu;
-    //Menu bluetoothMenu;
-
-    LinkedList<String>* display_buffer;
-
-    // The initial y coordinate of the top of the bottom text line
-    uint16_t yDraw = YMAX - BOT_FIXED_AREA - TEXT_HEIGHT;
-
-    // Keep track of the drawing x coordinate
-    uint16_t xPos = 0;
-
-    // The initial y coordinate of the top of the scrolling area
-    uint16_t yStart = TOP_FIXED_AREA_2;
-    // yArea must be a integral multiple of TEXT_HEIGHT
-    uint16_t yArea = YMAX - TOP_FIXED_AREA_2 - BOT_FIXED_AREA;
-
-    // We have to blank the top line each time the display is scrolled, but this takes up to 13 milliseconds
-    // for a full width line, meanwhile the serial buffer may be filling... and overflowing
-    // We can speed up scrolling of short text lines by just blanking the character we drew
-    int blank[19]; // We keep all the strings pixel lengths to optimise the speed of the top line blanking
-
-    //void initLVGL();
-    //void deinitLVGL();
-    //void joinWiFiGFX();
-    void tftDrawRedOnOffButton();
-    void tftDrawGreenOnOffButton();
-    void tftDrawGraphObjects(byte x_scale);
-    void tftDrawEapolColorKey();
-    void tftDrawColorKey();
-    void tftDrawXScaleButtons(byte x_scale);
-    void tftDrawYScaleButtons(byte y_scale);
-    void tftDrawChannelScaleButtons(int set_channel);
-    void tftDrawExitScaleButtons();
-    void buildBanner(String msg, int xpos);
-    void clearScreen();
-    void displayBuffer(bool do_clear = false);
-    void drawJpeg(const char *filename, int xpos, int ypos);
-    void setupDraw();
-    void drawStylus();
-    void getTouchWhileFunction(bool pressed);
-    void initScrollValues(bool tte = false);
-    void jpegInfo();
-    void jpegRender(int xpos, int ypos);
-    void listDir(fs::FS &fs, const char * dirname, uint8_t levels);
-    void listFiles();
-    void main(uint8_t scan_mode);
-    void RunSetup();
-    void scrollAddress(uint16_t vsp);
-    int scroll_line(uint32_t color);
-    void setupScrollArea(uint16_t tfa, uint16_t bfa);
-    void showCenterText(String text, int y);
-    void touchToExit();
-    void twoPartDisplay(String center_text);
-    void updateBanner(String msg);
-};
-#endif
+#ifndef Display_h
+#define Display_h
+
+
+#include <FS.h>
+#include <functional>
+#include <JPEGDecoder.h>
+//#include <SimpleList.h>
+#include <LinkedList.h>
+#include <SPI.h>
+#include <lvgl.h>
+#include <Ticker.h>
+//#include <M5Stack.h>
+#include "SPIFFS.h"
+#include "Assets.h"
+
+#include <TFT_eSPI.h>
+
+#define TFT_MISO 19
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+#define TFT_CS 27
+#define TFT_DC 26
+#define TFT_RST 5
+#define TFT_BL 32
+#define TOUCH_CS 21
+#define SD_CS 4
+
+// WiFi stuff
+#define OTA_UPDATE 100
+#define SHOW_INFO 101
+#define WIFI_SCAN_OFF 0
+#define WIFI_SCAN_PROBE 1
+#define WIFI_SCAN_AP 2
+#define WIFI_SCAN_PWN 3
+#define WIFI_SCAN_EAPOL 4
+#define WIFI_SCAN_DEAUTH 5
+#define WIFI_SCAN_ALL 6
+#define WIFI_PACKET_MONITOR 7
+#define WIFI_ATTACK_BEACON_SPAM 8
+#define WIFI_ATTACK_RICK_ROLL 9
+#define BT_SCAN_ALL 10
+#define BT_SCAN_SKIMMERS 11
+#define WIFI_SCAN_ESPRESSIF 12
+#define LV_JOIN_WIFI 13
+#define LV_ADD_SSID 14
+#define WIFI_ATTACK_BEACON_LIST 15
+
+//#define TFT_SHIELD
+#define TFT_DIY
+#define KIT
+
+#define SCREEN_WIDTH 240
+#define SCREEN_HEIGHT 320
+#define HEIGHT_1 240
+#define WIDTH_1 320
+#define STANDARD_FONT_CHAR_LIMIT 40 // number of characters on a single line with normal font
+#define TEXT_HEIGHT 16 // Height of text to be printed and scrolled
+#define BOT_FIXED_AREA 0 // Number of lines in bottom fixed area (lines counted from bottom of screen)
+#define TOP_FIXED_AREA 48 // Number of lines in top fixed area (lines counted from top of screen)
+#define YMAX 320 // Bottom of screen area
+#define minimum(a,b)     (((a) < (b)) ? (a) : (b))
+//#define MENU_FONT NULL
+#define MENU_FONT &FreeMono9pt7b // Winner
+//#define MENU_FONT &FreeMonoBold9pt7b
+//#define MENU_FONT &FreeSans9pt7b
+//#define MENU_FONT &FreeSansBold9pt7b
+#define BUTTON_ARRAY_LEN 9
+#define STATUS_BAR_WIDTH 16
+#define LVGL_TICK_PERIOD 6
+
+#define FRAME_X 100
+#define FRAME_Y 64
+#define FRAME_W 120
+#define FRAME_H 50
+
+// Red zone size
+#define REDBUTTON_X FRAME_X
+#define REDBUTTON_Y FRAME_Y
+#define REDBUTTON_W (FRAME_W/2)
+#define REDBUTTON_H FRAME_H
+
+// Green zone size
+#define GREENBUTTON_X (REDBUTTON_X + REDBUTTON_W)
+#define GREENBUTTON_Y FRAME_Y
+#define GREENBUTTON_W (FRAME_W/2)
+#define GREENBUTTON_H FRAME_H
+
+#define STATUSBAR_COLOR 0x4A49
+
+#define KIT_LED_BUILTIN 13
+
+/*
+PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
+PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
+
+PROGMEM static lv_disp_buf_t disp_buf;
+PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];
+
+PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
+PROGMEM static void keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+
+// lvgl stuff
+PROGMEM static lv_obj_t *kb;
+*/
+
+class Display
+{
+  private:
+    bool SwitchOn = false;
+    
+    bool run_setup = true;
+    
+    // For the byte we read from the serial port
+    byte data = 0;
+    
+    // A few test variables used during debugging
+    boolean change_colour = 1;
+    boolean selected = 1;
+
+    void drawFrame();
+
+    //void addNodes(Menu* menu, String name, Menu* child, std::function<void()> callable);
+    //void changeMenu(Menu* menu);
+    //void showMenuList(Menu* menu, int layer);
+    //static void lv_tick_handler();
+
+  public:
+    Display();
+    //Ticker tick;
+    TFT_eSPI tft = TFT_eSPI();
+    TFT_eSprite img = TFT_eSprite(&tft);
+    TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
+    const String PROGMEM version_number = "v0.9.4";
+
+    bool printing = false;
+    bool loading = false;
+    bool tteBar = false;
+    bool draw_tft = false;
+    bool exit_draw = false;
+
+    int TOP_FIXED_AREA_2 = 48;
+    int print_delay_1, print_delay_2 = 10;
+    int current_banner_pos = SCREEN_WIDTH;
+
+    //Menu* current_menu;
+    
+    //Menu mainMenu;
+    //Menu wifiMenu;
+    //Menu bluetoothMenu;
+
+    LinkedList<String>* display_buffer;
+
+    // The initial y coordinate of the top of the bottom text line
+    uint16_t yDraw = YMAX - BOT_FIXED_AREA - TEXT_HEIGHT;
+
+    // Keep track of the drawing x coordinate
+    uint16_t xPos = 0;
+
+    // The initial y coordinate of the top of the scrolling area
+    uint16_t yStart = TOP_FIXED_AREA_2;
+    // yArea must be a integral multiple of TEXT_HEIGHT
+    uint16_t yArea = YMAX - TOP_FIXED_AREA_2 - BOT_FIXED_AREA;
+
+    // We have to blank the top line each time the display is scrolled, but this takes up to 13 milliseconds
+    // for a full width line, meanwhile the serial buffer may be filling... and overflowing
+    // We can speed up scrolling of short text lines by just blanking the character we drew
+    int blank[19]; // We keep all the strings pixel lengths to optimise the speed of the top line blanking
+
+    //void initLVGL();
+    //void deinitLVGL();
+    //void joinWiFiGFX();
+    void tftDrawRedOnOffButton();
+    void tftDrawGreenOnOffButton();
+    void tftDrawGraphObjects(byte x_scale);
+    void tftDrawEapolColorKey();
+    void tftDrawColorKey();
+    void tftDrawXScaleButtons(byte x_scale);
+    void tftDrawYScaleButtons(byte y_scale);
+    void tftDrawChannelScaleButtons(int set_channel);
+    void tftDrawExitScaleButtons();
+    void buildBanner(String msg, int xpos);
+    void clearScreen();
+    void displayBuffer(bool do_clear = false);
+    void drawJpeg(const char *filename, int xpos, int ypos);
+    void setupDraw();
+    void drawStylus();
+    void getTouchWhileFunction(bool pressed);
+    void initScrollValues(bool tte = false);
+    void jpegInfo();
+    void jpegRender(int xpos, int ypos);
+    void listDir(fs::FS &fs, const char * dirname, uint8_t levels);
+    void listFiles();
+    void main(uint8_t scan_mode);
+    void RunSetup();
+    void scrollAddress(uint16_t vsp);
+    int scroll_line(uint32_t color);
+    void setupScrollArea(uint16_t tfa, uint16_t bfa);
+    void showCenterText(String text, int y);
+    void touchToExit();
+    void twoPartDisplay(String center_text);
+    void updateBanner(String msg);
+};
+#endif
diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index f3c8587..fef7cf5 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -1,1763 +1,1790 @@
-#include "MenuFunctions.h"
-//#include "icons.h"
-
-extern const unsigned char menu_icons[][66];
-PROGMEM lv_obj_t * slider_label;
-PROGMEM lv_obj_t * ta1;
-PROGMEM lv_obj_t * ta2;
-PROGMEM lv_obj_t * save_name;
-
-MenuFunctions::MenuFunctions()
-{
-}
-
-// LVGL Stuff
-/* Interrupt driven periodic handler */
-
-void MenuFunctions::lv_tick_handler()
-{
-  lv_tick_inc(LVGL_TICK_PERIOD);
-}
-
-/* Display flushing */
-void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p)
-{
-  extern Display display_obj;
-  uint16_t c;
-
-  display_obj.tft.startWrite();
-  display_obj.tft.setAddrWindow(area->x1, area->y1, (area->x2 - area->x1 + 1), (area->y2 - area->y1 + 1));
-  for (int y = area->y1; y <= area->y2; y++) {
-    for (int x = area->x1; x <= area->x2; x++) {
-      c = color_p->full;
-      display_obj.tft.writeColor(c, 1);
-      color_p++;
-    }
-  }
-  display_obj.tft.endWrite();
-  lv_disp_flush_ready(disp);
-}
-
-
-bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data)
-{
-  extern Display display_obj;
-  
-  uint16_t touchX, touchY;
-
-  bool touched = display_obj.tft.getTouch(&touchX, &touchY, 600);
-
-  if(!touched)
-  {
-    return false;
-  }
-
-  if(touchX>WIDTH_1 || touchY > HEIGHT_1)
-  {
-    Serial.println("Y or y outside of expected parameters..");
-    Serial.print("y:");
-    Serial.print(touchX);
-    Serial.print(" x:");
-    Serial.print(touchY);
-  }
-  else
-  {
-
-    data->state = touched ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; 
-
-    //if(data->state == LV_INDEV_STATE_PR) touchpad_get_xy(&last_x, &last_y);
-   
-    data->point.x = touchX;
-    data->point.y = touchY;
-
-    //Serial.print("Data x");
-    //Serial.println(touchX);
-    
-    //Serial.print("Data y");
-    //Serial.println(touchY);
-
-  }
-
-  return false;
-}
-
-void MenuFunctions::initLVGL() {
-  tick.attach_ms(LVGL_TICK_PERIOD, lv_tick_handler);
-  
-  lv_init();
-
-  lv_disp_buf_init(&disp_buf, buf, NULL, LV_HOR_RES_MAX * 10);
-
-  lv_disp_drv_t disp_drv;
-  lv_disp_drv_init(&disp_drv);
-  disp_drv.hor_res = WIDTH_1;
-  disp_drv.ver_res = HEIGHT_1;
-  disp_drv.flush_cb = my_disp_flush;
-  disp_drv.buffer = &disp_buf;
-  lv_disp_drv_register(&disp_drv);
-
-  lv_indev_drv_t indev_drv;
-  lv_indev_drv_init(&indev_drv);             
-  indev_drv.type = LV_INDEV_TYPE_POINTER;    
-  indev_drv.read_cb = my_touchpad_read;      
-  lv_indev_drv_register(&indev_drv);         
-}
-
-
-void MenuFunctions::deinitLVGL() {
-  Serial.println(F("Deinit LVGL"));
-  //lv_deinit();
-}
-
-void MenuFunctions::writeBadUSB(){
-  // Create a keyboard and apply the styles
-  kb = lv_keyboard_create(lv_scr_act(), NULL);
-  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
-  lv_obj_set_event_cb(kb, write_bad_usb_keyboard_event_cb);
-
-  // Create one text area
-  // Store all SSIDs
-  ta1 = lv_textarea_create(lv_scr_act(), NULL);
-  lv_textarea_set_cursor_hidden(ta1, false);
-  lv_textarea_set_one_line(ta1, false);
-  lv_obj_set_width(ta1, LV_HOR_RES);
-  lv_obj_set_height(ta1, (LV_VER_RES / 2) - 35);
-  lv_obj_set_pos(ta1, 5, 20);
-  lv_textarea_set_cursor_hidden(ta1, true);
-  lv_obj_align(ta1, NULL, LV_ALIGN_IN_TOP_MID, NULL, NULL);
-  lv_textarea_set_text(ta1, "");
-  lv_textarea_set_placeholder_text(ta1, "Ducky script");
-
-  if (sd_obj.supported) {
-    // Create load button
-    lv_obj_t * label;
-    lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL);
-    lv_obj_set_event_cb(load_btn, load_btn_cb);
-    lv_obj_set_height(load_btn, 35);
-    lv_obj_set_width(load_btn, LV_HOR_RES / 3);
-    lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area
-    label = lv_label_create(load_btn, NULL);
-    lv_label_set_text(label, "Load");
-  
-    // Create Save As button
-    lv_obj_t * label2;
-    lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL);
-    lv_obj_set_event_cb(save_as_btn, load_btn_cb);
-    lv_obj_set_height(save_as_btn, 35);
-    lv_obj_set_width(save_as_btn, LV_HOR_RES / 3);
-    lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area
-    label2 = lv_label_create(save_as_btn, NULL);
-    lv_label_set_text(label2, "Save As");
-  }
-  
-  // Focus it on one of the text areas to start
-  lv_keyboard_set_textarea(kb, ta1);
-  lv_keyboard_set_cursor_manage(kb, true);
-}
-
-// Event handler for settings drop down menus
-void setting_dropdown_cb(lv_obj_t * obj, lv_event_t event) {
-  //lv_event_code_t code = lv_event_get_code(event);
-  //lv_obj_t * obj = lv_event_get_target(event);
-  //lv_obj_t * list1 = lv_obj_get_parent(lv_obj_get_parent(obj));
-  //if(event == LV_EVENT_CLICKED) {
-  //    LV_LOG_USER("Clicked: %s", lv_list_get_btn_text(list1, obj));
-  //}
-}
-
-void settings_list_cb(lv_obj_t * btn, lv_event_t event) {
-  extern Settings settings_obj;
-  extern MenuFunctions menu_function_obj;
-
-  String btn_text = lv_list_get_btn_text(btn);
-  String display_string = "";
-  
-  if (event == LV_EVENT_CLICKED) {
-    if (btn_text == "Exit") {
-      Serial.println("Exiting...");
-      lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
-
-      printf("LV_EVENT_CANCEL\n");
-      Serial.println("Potato");
-      //menu_function_obj.deinitLVGL();
-      //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-      //display_obj.exit_draw = true; // set everything back to normal
-    }
-    else {
-      // Build base obj to host buttons
-      Serial.println("Creating base object...");
-      lv_obj_t * obj;
-      obj = lv_obj_create(lv_scr_act(), NULL);
-      lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES);
-      
-      lv_obj_t * exit_btn;
-
-      lv_obj_t * label;
-      
-      // Build the generic Exit button
-      exit_btn = lv_btn_create(obj, NULL);
-      lv_obj_set_event_cb(exit_btn, settings_list_cb);
-      lv_label_set_text(label, "Exit");
-      //lv_obj_center(label);
-
-      label = lv_label_create(exit_btn, NULL);
-
-      // Create the type specific device
-      if (settings_obj.getSettingType(btn_text) == "bool") {
-        lv_obj_t * sw = lv_switch_create(obj, NULL);
-        lv_obj_align(sw, NULL, LV_ALIGN_CENTER, 0, 0);
-      }
-    }
-  }
-
-  /*
-  if (event == LV_EVENT_VALUE_CHANGED) {      
-    if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
-      //Serial.print("Toggle on: ");
-      //Serial.println(btn_text);
-      for (int i = 0; i < access_points->size(); i++) {
-        if (access_points->get(i).essid == btn_text) {
-          Serial.println("Adding AP: " + (String)access_points->get(i).essid);
-          AccessPoint ap = access_points->get(i);
-          ap.selected = true;
-          access_points->set(i, ap);
-        }
-      }
-    }
-    else {
-      //Serial.print("Toggle off: ");
-      //Serial.println(btn_text);
-      for (int i = 0; i < access_points->size(); i++) {
-        if (access_points->get(i).essid == btn_text) {
-          Serial.println("Removing AP: " + (String)access_points->get(i).essid);
-          AccessPoint ap = access_points->get(i);
-          ap.selected = false;
-          access_points->set(i, ap);
-        }
-      }
-    }
-  }*/
-}
-
-void MenuFunctions::displaySettingsGFX(){
-  extern Settings settings_obj;
-
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, settings_obj.getSettingsString())) {
-    Serial.println("\nCould not parse json");
-  }
-  
-  lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
-  lv_obj_set_size(list1, 160, 200);
-  lv_obj_set_width(list1, LV_HOR_RES);
-  lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
-
-  lv_obj_t * list_btn;
-
-  lv_obj_t * label;
-
-  lv_obj_t * sw;
-
-  list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Exit");
-  lv_obj_set_event_cb(list_btn, ap_list_cb);
-
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    char buf[json["Settings"][i]["name"].as<String>().length() + 1] = {};
-    json["Settings"][i]["name"].as<String>().toCharArray(buf, json["Settings"][i]["name"].as<String>().length() + 1);
-    
-    list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, buf);
-    lv_btn_set_checkable(list_btn, false);
-    lv_obj_set_event_cb(list_btn, settings_list_cb);
-
-    //lv_list_add_text(list1, buf);
-
-    // Create the dropdown menu
-    /*lv_obj_t * dd = lv_dropdown_create(list1, NULL);
-    lv_dropdown_set_options(dd, "Apple\n"
-                                "Banana\n"
-                                "Orange\n"
-                                "Cherry\n"
-                                "Grape\n"
-                                "Raspberry\n"
-                                "Melon\n"
-                                "Orange\n"
-                                "Lemon\n"
-                                "Nuts");
-
-    //lv_obj_align(dd, LV_ALIGN_IN_RIGHT_MID, 0, 20);
-    lv_obj_align(dd, NULL, LV_ALIGN_IN_RIGHT_MID, 0, 0);
-    lv_obj_set_width(dd, LV_HOR_RES / 3);
-    lv_obj_set_event_cb(dd, setting_dropdown_cb);
-    //lv_obj_add_event_cb(dd, setting_dropdown_cb, LV_EVENT_ALL, NULL);*/
-    
-    //if (access_points->get(i).selected)
-    //  lv_btn_toggle(list_btn);
-
-    //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
-    //lv_obj_set_event_cb(btn1, ap_list_cb);
-    //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
-    //lv_btn_set_checkable(btn1, true);
-  }
-}
-
-// GFX Function to build a list showing all APs scanned
-void MenuFunctions::addAPGFX(){
-  extern LinkedList<AccessPoint>* access_points;
-
-  lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
-  lv_obj_set_size(list1, 160, 200);
-  lv_obj_set_width(list1, LV_HOR_RES);
-  lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
-
-  lv_obj_t * list_btn;
-
-  lv_obj_t * label;
-
-  list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Exit");
-  lv_obj_set_event_cb(list_btn, ap_list_cb);
-
-  for (int i = 0; i < access_points->size(); i++) {
-    char buf[access_points->get(i).essid.length() + 1] = {};
-    access_points->get(i).essid.toCharArray(buf, access_points->get(i).essid.length() + 1);
-    
-    list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, buf);
-    lv_btn_set_checkable(list_btn, true);
-    lv_obj_set_event_cb(list_btn, ap_list_cb);
-
-    if (access_points->get(i).selected)
-      lv_btn_toggle(list_btn);
-
-    //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
-    //lv_obj_set_event_cb(btn1, ap_list_cb);
-    //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
-    //lv_btn_set_checkable(btn1, true);
-
-    //label = lv_label_create(btn1, NULL);
-    //lv_label_set_text(label, buf);
-  }
-}
-
-
-
-void ap_list_cb(lv_obj_t * btn, lv_event_t event) {
-  extern LinkedList<AccessPoint>* access_points;
-  extern MenuFunctions menu_function_obj;
-
-  String btn_text = lv_list_get_btn_text(btn);
-  String display_string = "";
-  
-  if (event == LV_EVENT_CLICKED) {
-    if (btn_text != "Exit") {
-      //lv_list_focus_btn(lv_obj_get_parent(lv_obj_get_parent(btn)), btn);
-    }
-    else {
-      Serial.println("Exiting...");
-      lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
-
-      for (int i = 0; i < access_points->size(); i++) {
-        if (access_points->get(i).selected) {
-          Serial.println("Selected: " + (String)access_points->get(i).essid);
-        }
-      }
-
-      printf("LV_EVENT_CANCEL\n");
-      menu_function_obj.deinitLVGL();
-      wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-      display_obj.exit_draw = true; // set everything back to normal
-    }
-  }
-  
-  if (event == LV_EVENT_VALUE_CHANGED) {      
-    if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
-      //Serial.print("Toggle on: ");
-      //Serial.println(btn_text);
-      for (int i = 0; i < access_points->size(); i++) {
-        if (access_points->get(i).essid == btn_text) {
-          Serial.println("Adding AP: " + (String)access_points->get(i).essid);
-          AccessPoint ap = access_points->get(i);
-          ap.selected = true;
-          access_points->set(i, ap);
-        }
-      }
-    }
-    else {
-      //Serial.print("Toggle off: ");
-      //Serial.println(btn_text);
-      for (int i = 0; i < access_points->size(); i++) {
-        if (access_points->get(i).essid == btn_text) {
-          Serial.println("Removing AP: " + (String)access_points->get(i).essid);
-          AccessPoint ap = access_points->get(i);
-          ap.selected = false;
-          access_points->set(i, ap);
-        }
-      }
-    }
-  }
-}
-
-void MenuFunctions::addSSIDGFX(){
-  extern LinkedList<ssid>* ssids;
-  
-  String display_string = "";
-  // Create a keyboard and apply the styles
-  kb = lv_keyboard_create(lv_scr_act(), NULL);
-  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
-  lv_obj_set_event_cb(kb, add_ssid_keyboard_event_cb);
-
-  // Create one text area
-  // Store all SSIDs
-  ta1 = lv_textarea_create(lv_scr_act(), NULL);
-  lv_textarea_set_one_line(ta1, false);
-  lv_obj_set_width(ta1, LV_HOR_RES);
-  lv_obj_set_height(ta1, (LV_VER_RES / 2) - 35);
-  lv_obj_set_pos(ta1, 5, 20);
-  lv_textarea_set_cursor_hidden(ta1, true);
-  lv_obj_align(ta1, NULL, LV_ALIGN_IN_TOP_MID, NULL, NULL);
-  lv_textarea_set_placeholder_text(ta1, "SSID List");
-
-  // Create second text area
-  // Add SSIDs
-  ta2 = lv_textarea_create(lv_scr_act(), ta1);
-  lv_textarea_set_cursor_hidden(ta2, false);
-  lv_textarea_set_one_line(ta2, true);
-  lv_obj_align(ta2, NULL, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35);
-  lv_textarea_set_text(ta2, "");
-  lv_textarea_set_placeholder_text(ta2, "Add SSIDs");
-
-  // After generating text areas, add text to first text box
-  for (int i = 0; i < ssids->size(); i++)
-    display_string.concat((String)ssids->get(i).essid + "\n");
-    
-  lv_textarea_set_text(ta1, display_string.c_str());
-
-  // Focus it on one of the text areas to start
-  lv_keyboard_set_textarea(kb, ta2);
-  lv_keyboard_set_cursor_manage(kb, true);
-  
-}
-
-void MenuFunctions::joinWiFiGFX(){
-
-  // Create one text area
-  ta1 = lv_textarea_create(lv_scr_act(), NULL);
-  lv_textarea_set_one_line(ta1, true);
-  lv_obj_set_width(ta1, LV_HOR_RES / 2 - 20);
-  lv_obj_set_pos(ta1, 5, 20);
-  //lv_ta_set_cursor_type(ta, LV_CURSOR_BLOCK);
-  lv_textarea_set_text(ta1, "");
-  lv_obj_set_event_cb(ta1, ta_event_cb);
-
-  // Create first label
-  lv_obj_t * ssid_label = lv_label_create(lv_scr_act(), NULL);
-  lv_label_set_text(ssid_label, "SSID:");
-  lv_obj_align(ssid_label, ta1, LV_ALIGN_OUT_TOP_LEFT, 0, 0);
-
-  // Create second text area
-  ta2 = lv_textarea_create(lv_scr_act(), ta1);
-  //lv_textarea_set_pwd_mode(ta2, true); // This shit makes it so backspace does not work
-  //lv_textarea_set_pwd_show_time(ta2, 1000);
-  lv_textarea_set_cursor_hidden(ta2, true);
-  lv_obj_align(ta2, NULL, LV_ALIGN_IN_TOP_RIGHT, -5, 20);
-
-  // Create second label
-  lv_obj_t * pw_label = lv_label_create(lv_scr_act(), NULL);
-  lv_label_set_text(pw_label, "Password:");
-  lv_obj_align(pw_label, ta2, LV_ALIGN_OUT_TOP_LEFT, 0, 0);
-
-  // Create a keyboard and apply the styles
-  kb = lv_keyboard_create(lv_scr_act(), NULL);
-  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
-  lv_obj_set_event_cb(kb, join_wifi_keyboard_event_cb);
-
-  // Focus it on one of the text areas to start
-  lv_keyboard_set_textarea(kb, ta1);
-  lv_keyboard_set_cursor_manage(kb, true);
-  
-}
-
-// Function to create keyboard for saving file name
-void save_as_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) {
-  extern MenuFunctions menu_function_obj;
-
-  lv_keyboard_def_event_cb(save_as_kb, event);
-
-  // User canceled so we will get rid of the keyboard and text box
-  if (event == LV_EVENT_CANCEL) {
-    lv_obj_del_async(save_as_kb);
-    lv_obj_del_async(save_name);
-  }
-
-  // Save content from ta1 to file name in save_name
-  else if(event == LV_EVENT_APPLY){
-      String display_string = "";
-      printf("LV_EVENT_APPLY\n");
-
-      // Get ducky script
-      String content = lv_textarea_get_text(ta1);
-
-      String target_file_name = "/SCRIPTS/" + (String)lv_textarea_get_text(save_name);
-
-      Serial.println("Writing to target file: " + (String)target_file_name);
-
-      // Open file with the given name
-      File script = SD.open(target_file_name, FILE_WRITE);
-
-      if (script) {
-        menu_function_obj.loaded_file = target_file_name;
-
-        Serial.println("Writing content: ");
-        Serial.println(content);
-
-        script.print(content);
-
-        script.close();
-      }
-
-      lv_obj_del_async(save_as_kb);
-      lv_obj_del_async(save_name);
-
-      // Create Save button
-      lv_obj_t * save_label;
-      lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL);
-      lv_obj_set_event_cb(save_btn, load_btn_cb);
-      lv_obj_set_height(save_btn, 35);
-      lv_obj_set_width(save_btn, LV_HOR_RES / 3);
-      lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area
-      save_label = lv_label_create(save_btn, NULL);
-      lv_label_set_text(save_label, "Save");
-  }
-}
-
-
-void test_btn_cb(lv_obj_t * btn, lv_event_t event) {
-  extern MenuFunctions menu_function_obj;
-  
-  if (event == LV_EVENT_CLICKED) {
-    String btn_text = lv_list_get_btn_text(btn);
-    String display_string = "";
-    //printf("Clicked: %s\n", btn_text);
-    Serial.print("Clicked: ");
-    Serial.println(btn_text);
-
-    // Get file content and send to text area
-    if (btn_text != "Cancel") {
-      File script = SD.open(btn_text);
-
-      if (script) {
-        while (script.available()) {
-          display_string.concat((char)script.read());
-        }
-        script.close();
-
-        Serial.println(display_string);
-
-        char buf[display_string.length() + 1] = {};
-        display_string.toCharArray(buf, display_string.length() + 1);
-        
-        lv_textarea_set_text(ta1, buf);
-
-        // Create Save button
-        lv_obj_t * save_label;
-        lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL);
-        lv_obj_set_event_cb(save_btn, load_btn_cb);
-        lv_obj_set_height(save_btn, 35);
-        lv_obj_set_width(save_btn, LV_HOR_RES / 3);
-        lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area
-        save_label = lv_label_create(save_btn, NULL);
-        lv_label_set_text(save_label, "Save");
-      }
-    }
-
-    // Delete the file list obj
-    lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
-    menu_function_obj.loaded_file = btn_text;
-  }
-}
-
-void load_btn_cb(lv_obj_t * load_btn, lv_event_t event) {
-  extern SDInterface sd_obj;
-  extern MenuFunctions menu_function_obj;
-
-  String btn_text = lv_list_get_btn_text(load_btn);
-
-  if (btn_text == "Load") {
-    if (event == LV_EVENT_CLICKED)
-      Serial.println("Load button pressed");
-    else if (event == LV_EVENT_RELEASED) {
-      Serial.println("Load button released");
-      /*Create a list*/
-      lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
-      lv_obj_set_size(list1, 160, 200);
-      lv_obj_set_width(list1, LV_HOR_RES);
-      lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
-      //lv_list_set_anim_time(list1, 0);
-  
-      // Load file names into buttons
-      File scripts = SD.open("/SCRIPTS");
-  
-      // Build list of files from the SD card
-      lv_obj_t * list_btn;
-
-      list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Cancel");
-      lv_obj_set_event_cb(list_btn, test_btn_cb);
-  
-      while (true) {
-        File entity = scripts.openNextFile();
-  
-        if (!entity)
-          break;
-  
-        if (!entity.isDirectory()) {
-          String file_name = entity.name();
-  
-          // Fancy button text time
-          char buf[file_name.length() + 1] = {};
-          file_name.toCharArray(buf, file_name.length() + 1);
-          
-          list_btn = lv_list_add_btn(list1, LV_SYMBOL_FILE, buf);
-          lv_obj_set_event_cb(list_btn, test_btn_cb);
-        }
-  
-        entity.close();
-      }
-  
-      scripts.close();
-    }
-  }
-
-  // Save current text bod content to new file
-  else if (btn_text == "Save As") {
-    if (event == LV_EVENT_CLICKED)
-      Serial.println("Save button pressed");
-    else if (event == LV_EVENT_RELEASED) {
-      Serial.println("Save button released");
-
-      save_name = lv_textarea_create(lv_scr_act(), ta2);
-      lv_textarea_set_cursor_hidden(save_name, false);
-      lv_textarea_set_one_line(save_name, true);
-      lv_obj_align(save_name, NULL, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35);
-      lv_textarea_set_text(save_name, "");
-      lv_textarea_set_placeholder_text(save_name, "File Name");
-
-      // Create a keyboard and apply the styles
-      save_as_kb = lv_keyboard_create(lv_scr_act(), NULL);
-      lv_obj_set_size(save_as_kb, LV_HOR_RES, LV_VER_RES / 2);
-      lv_obj_set_event_cb(save_as_kb, save_as_keyboard_event_cb);
-
-      lv_keyboard_set_textarea(save_as_kb, save_name);
-      lv_keyboard_set_cursor_manage(save_as_kb, true);
-    }
-  }
-
-  // Save current text box content to current loaded file
-  else if (btn_text == "Save") {
-    if (event == LV_EVENT_CLICKED)
-      Serial.println("Save button pressed");
-    else if (event == LV_EVENT_RELEASED) {
-      Serial.println("Save button released");
-
-      Serial.println("Writing to file: " + (String)menu_function_obj.loaded_file);
-
-      File script = SD.open(menu_function_obj.loaded_file, FILE_WRITE);
-
-      // Write data to file
-      if (script) {
-        String content = lv_textarea_get_text(ta1);
-
-        Serial.println("Writing content:");
-        Serial.println(content);
-        Serial.println("to file: " + (String)menu_function_obj.loaded_file);
-        script.print(lv_textarea_get_text(ta1));
-        script.close();
-      }
-    }
-  }
-}
-
-void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) {
-  extern Display display_obj;
-  extern MenuFunctions menu_function_obj;
-  extern A32u4Interface a32u4_obj;
-  extern WiFiScan wifi_scan_obj;
-  
-  lv_keyboard_def_event_cb(kb, event);
-  if(event == LV_EVENT_APPLY){
-      String display_string = "";
-      printf("LV_EVENT_APPLY\n");
-
-    String ta1_text = lv_textarea_get_text(ta1);
-  
-    Serial.println(ta1_text);
-  
-    a32u4_obj.runScript(ta1_text);
-  }
-  else if(event == LV_EVENT_CANCEL) {
-    printf("LV_EVENT_CANCEL\n");
-    menu_function_obj.deinitLVGL();
-    wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-    display_obj.exit_draw = true; // set everything back to normal
-  }
-}
-
-// Keyboard callback dedicated to joining wifi
-void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){
-  extern Display display_obj;
-  extern MenuFunctions menu_function_obj;
-  extern WiFiScan wifi_scan_obj;
-  extern LinkedList<ssid>* ssids;
-  
-  lv_keyboard_def_event_cb(kb, event);
-
-  // User has applied text box
-  if(event == LV_EVENT_APPLY){
-    String display_string = "";
-    printf("LV_EVENT_APPLY\n");
-
-    // Get text from SSID text box
-    String ta2_text = lv_textarea_get_text(ta2);
-    //Serial.println(ta1_text);
-    Serial.println(ta2_text);
-
-    // Add text box text to list of SSIDs
-    wifi_scan_obj.addSSID(ta2_text);
-
-    // Update large text box with ssid
-    for (int i = 0; i < ssids->size(); i++)
-      display_string.concat((String)ssids->get(i).essid + "\n");
-    lv_textarea_set_text(ta1, display_string.c_str());
-
-    lv_textarea_set_text(ta2, "");
-  }else if(event == LV_EVENT_CANCEL){
-    printf("LV_EVENT_CANCEL\n");
-    //lv_textarea_set_text(lv_keyboard_get_textarea(kb), "");
-    menu_function_obj.deinitLVGL();
-    //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-    display_obj.exit_draw = true; // set everything back to normal
-  }
-}
-
-// Keyboard callback dedicated to joining wifi
-void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){
-  extern Display display_obj;
-  extern MenuFunctions menu_function_obj;
-  extern WiFiScan wifi_scan_obj;
-  lv_keyboard_def_event_cb(kb, event);
-  if(event == LV_EVENT_APPLY){
-    printf("LV_EVENT_APPLY\n");
-    //String ta1_text = lv_textarea_get_text(lv_keyboard_get_textarea(kb));
-    String ta1_text = lv_textarea_get_text(ta1);
-    String ta2_text = lv_textarea_get_text(ta2);
-    Serial.println(ta1_text);
-    Serial.println(ta2_text);
-    wifi_scan_obj.joinWiFi(ta1_text, ta2_text);
-  }else if(event == LV_EVENT_CANCEL){
-    printf("LV_EVENT_CANCEL\n");
-    //lv_textarea_set_text(lv_keyboard_get_textarea(kb), "");
-    menu_function_obj.deinitLVGL();
-    //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-    display_obj.exit_draw = true; // set everything back to normal
-  }
-}
-
-
-void ta_event_cb(lv_obj_t * ta, lv_event_t event)
-{
-  if(event == LV_EVENT_CLICKED) {
-    if(kb != NULL)
-      lv_keyboard_set_textarea(kb, ta);
-  }
-
-  //else if(event == LV_EVENT_INSERT) {
-  //  const char * str = lv_event_get_data();
-  //  if(str[0] == '\n') {
-  //    printf("Ready\n");
-  //  }
-  //}
-}
-
-// Function to check menu input
-void MenuFunctions::main(uint32_t currentTime)
-{
-  // Some function exited and we need to go back to normal
-  if (display_obj.exit_draw) {
-    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-    display_obj.exit_draw = false;
-    this->orientDisplay();
-    //changeMenu(current_menu);
-  }
-  if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
-      (wifi_scan_obj.currentScanMode == OTA_UPDATE) ||
-      (wifi_scan_obj.currentScanMode == ESP_UPDATE) ||
-      (wifi_scan_obj.currentScanMode == SHOW_INFO)) {
-    if (wifi_scan_obj.orient_display) {
-      this->orientDisplay();
-      wifi_scan_obj.orient_display = false;
-    }
-    //if ((display_obj.current_banner_pos <= 0) || (display_obj.current_banner_pos == SCREEN_WIDTH))
-    //{
-    //  this->drawStatusBar();
-    //}
-    if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) &&
-        (wifi_scan_obj.currentScanMode != LV_ADD_SSID))
-      display_obj.updateBanner(current_menu->name);
-  }
-
-  if (currentTime != 0) {
-    if (currentTime - initTime >= 100) {
-      this->initTime = millis();
-      if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) &&
-          (wifi_scan_obj.currentScanMode != LV_ADD_SSID))
-        this->updateStatusBar();
-    }
-  }
-
-  //this->displayCurrentMenu();
-
-  boolean pressed = false;
-  // This is code from bodmer's keypad example
-  uint16_t t_x = 0, t_y = 0; // To store the touch coordinates
-
-  // Get the display buffer out of the way
-  if ((wifi_scan_obj.currentScanMode != WIFI_SCAN_OFF ) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_SPAM) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
-      //(wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_LIST))
-    display_obj.displayBuffer();
-  //Serial.println(wifi_scan_obj.freeRAM());
-
-
-  // Pressed will be set true is there is a valid touch on the screen
-  int pre_getTouch = millis();
-
-  // getTouch causes a 10ms delay which makes beacon spam less effective
-  //if (wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF)
-  pressed = display_obj.tft.getTouch(&t_x, &t_y);
-
-  //if (pressed)
-  //  Serial.println("Pressed, son");
-  //boolean pressed = false;
-
-  //Serial.print("getTouch: ");
-  //Serial.print(millis() - pre_getTouch);
-  //Serial.println("ms");
-
-
-  // This is if there are scans/attacks going on
-  if ((wifi_scan_obj.currentScanMode != WIFI_SCAN_OFF) &&
-      (pressed) &&
-      (wifi_scan_obj.currentScanMode != OTA_UPDATE) &&
-      (wifi_scan_obj.currentScanMode != ESP_UPDATE) &&
-      (wifi_scan_obj.currentScanMode != SHOW_INFO))
-  {
-    // Stop the current scan
-    if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_AP) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_PWN) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_ESPRESSIF) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_ALL) ||
-        (wifi_scan_obj.currentScanMode == WIFI_SCAN_DEAUTH) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_SPAM) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_AUTH) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
-        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
-        (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
-        (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS))
-    {
-      Serial.println("Stopping scan...");
-      wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
-
-      // If we don't do this, the text and button coordinates will be off
-      display_obj.tft.init();
-
-      // Take us back to the menu
-      changeMenu(current_menu);
-    }
-
-    x = -1;
-    y = -1;
-
-    return;
-  }
-
-  // Check if any key coordinate boxes contain the touch coordinates
-  // This is for when on a menu
-  if ((wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_SPAM) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
-      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
-      //(wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_LIST))
-  {
-    // Need this to set all keys to false
-    for (uint8_t b = 0; b < BUTTON_ARRAY_LEN; b++) {
-      if (pressed && display_obj.key[b].contains(t_x, t_y)) {
-        display_obj.key[b].press(true);  // tell the button it is pressed
-      } else {
-        display_obj.key[b].press(false);  // tell the button it is NOT pressed
-      }
-    }
-
-    // Check if any key has changed state
-    for (uint8_t b = 0; b < current_menu->list->size(); b++) {
-      display_obj.tft.setFreeFont(MENU_FONT);
-      if (display_obj.key[b].justPressed()) {
-        //display_obj.key[b].drawButton2(current_menu->list->get(b).name, true);  // draw invert
-        //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name, true);
-        display_obj.key[b].drawButton(true, current_menu->list->get(b).name);
-        if (current_menu->list->get(b).name != "Back")
-          display_obj.tft.drawXBitmap(0,
-                                      KEY_Y + b * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
-                                      menu_icons[current_menu->list->get(b).icon],
-                                      ICON_W,
-                                      ICON_H,
-                                      current_menu->list->get(b).color,
-                                      TFT_BLACK);
-      }
-      //else if (pressed)
-      //  display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
-
-      // If button was just release, execute the button's function
-      if ((display_obj.key[b].justReleased()) && (!pressed))
-      {
-        //display_obj.key[b].drawButton2(current_menu->list->get(b).name);     // draw normal
-        //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name);
-        display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
-        current_menu->list->get(b).callable();
-      }
-      // This
-      else if ((display_obj.key[b].justReleased()) && (pressed)) {
-        display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
-        if (current_menu->list->get(b).name != "Back")
-          display_obj.tft.drawXBitmap(0,
-                                      KEY_Y + b * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
-                                      menu_icons[current_menu->list->get(b).icon],
-                                      ICON_W,
-                                      ICON_H,
-                                      TFT_BLACK,
-                                      current_menu->list->get(b).color);
-      }
-
-      display_obj.tft.setFreeFont(NULL);
-    }
-  }
-  x = -1;
-  y = -1;
-}
-
-#if BATTERY_ANALOG_ON == 1
-byte battery_analog_array[10];
-byte battery_count = 0;
-byte battery_analog_last = 101;
-#define BATTERY_CHECK 50
-uint16_t battery_analog = 0;
-void MenuFunctions::battery(bool initial)
-{
-  if (BATTERY_ANALOG_ON) {
-    uint8_t n = 0;
-    byte battery_analog_sample[10];
-    byte deviation;
-    if (battery_count == BATTERY_CHECK - 5)  digitalWrite(BATTERY_PIN, HIGH);
-    else if (battery_count == 5) digitalWrite(BATTERY_PIN, LOW);
-    if (battery_count == 0) {
-      battery_analog = 0;
-      for (n = 9; n > 0; n--)battery_analog_array[n] = battery_analog_array[n - 1];
-      for (n = 0; n < 10; n++) {
-        battery_analog_sample[n] = map((analogRead(ANALOG_PIN) * 5), 2400, 4200, 0, 100);
-        if (battery_analog_sample[n] > 100) battery_analog_sample[n] = 100;
-        else if (battery_analog_sample[n] < 0) battery_analog_sample[n] = 0;
-        battery_analog += battery_analog_sample[n];
-      }
-      battery_analog = battery_analog / 10;
-      for (n = 0; n < 10; n++) {
-        deviation = abs(battery_analog - battery_analog_sample[n]);
-        if (deviation >= 10) battery_analog_sample[n] = battery_analog;
-      }
-      battery_analog = 0;
-      for (n = 0; n < 10; n++) battery_analog += battery_analog_sample[n];
-      battery_analog = battery_analog / 10;
-      battery_analog_array[0] = battery_analog;
-      if (battery_analog_array[9] > 0 ) {
-        battery_analog = 0;
-        for (n = 0; n < 10; n++) battery_analog += battery_analog_array[n];
-        battery_analog = battery_analog / 10;
-      }
-      battery_count ++;
-    }
-    else if (battery_count < BATTERY_CHECK) battery_count++;
-    else if (battery_count >= BATTERY_CHECK) battery_count = 0;
-
-    if (battery_analog_last != battery_analog) {
-      battery_analog_last = battery_analog;
-      MenuFunctions::battery2();
-    }
-  }
-}
-void MenuFunctions::battery2(bool initial)
-{
-  uint16_t the_color;
-  if ( digitalRead(CHARGING_PIN) == 1) the_color = TFT_BLUE;
-  else if (battery_analog < 20) the_color = TFT_RED;
-  else if (battery_analog < 40)  the_color = TFT_YELLOW;
-  else the_color = TFT_GREEN;
-
-  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
-  display_obj.tft.fillRect(186, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-  display_obj.tft.drawXBitmap(186,
-                              0,
-                              menu_icons[STATUS_BAT],
-                              16,
-                              16,
-                              STATUSBAR_COLOR,
-                              the_color);
-  display_obj.tft.drawString((String) battery_analog + "%", 204, 0, 2);
-}
-#else
-void MenuFunctions::battery(bool initial)
-{
-  uint16_t the_color;
-  if (battery_obj.i2c_supported)
-  {
-    // Could use int compare maybe idk
-    if (((String)battery_obj.battery_level != "25") && ((String)battery_obj.battery_level != "0"))
-      the_color = TFT_GREEN;
-    else
-      the_color = TFT_RED;
-
-    if ((battery_obj.battery_level != battery_obj.old_level) || (initial)) {
-      battery_obj.old_level = battery_obj.battery_level;
-      display_obj.tft.fillRect(204, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-      display_obj.tft.setCursor(0, 1);
-      display_obj.tft.drawXBitmap(186,
-                                  0,
-                                  menu_icons[STATUS_BAT],
-                                  16,
-                                  16,
-                                  STATUSBAR_COLOR,
-                                  the_color);
-      display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2);
-    }
-  }
-}
-void MenuFunctions::battery2(bool initial)
-{
-  MenuFunctions::battery(initial);
-}
-#endif
-
-void MenuFunctions::updateStatusBar()
-{
-  display_obj.tft.setTextSize(1);
-  uint16_t the_color; 
-
-  // Draw temp info
-  if (temp_obj.current_temp < 70)
-    the_color = TFT_GREEN;
-  else if ((temp_obj.current_temp >= 70) && (temp_obj.current_temp < 80))
-    the_color = TFT_YELLOW;
-  else if ((temp_obj.current_temp >= 80) && (temp_obj.current_temp < 90))
-    the_color = TFT_ORANGE;
-  else if ((temp_obj.current_temp >= 90) && (temp_obj.current_temp < 100))
-    the_color = TFT_RED;
-  else
-    the_color = TFT_MAROON;
-
-  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
-  if (temp_obj.current_temp != temp_obj.old_temp) {
-    temp_obj.old_temp = temp_obj.current_temp;
-    display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-    display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2);
-  }
-  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
-
-  // WiFi Channel Stuff
-  if (wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) {
-    wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
-    display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-    display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
-  }
-
-  // RAM Stuff
-  wifi_scan_obj.freeRAM();
-  if (wifi_scan_obj.free_ram != wifi_scan_obj.old_free_ram) {
-    wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
-    display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-    display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
-  }
-
-  // Draw battery info
-  MenuFunctions::battery(false);
-
-  // Draw SD info
-  if (sd_obj.supported)
-    the_color = TFT_GREEN;
-  else
-    the_color = TFT_RED;
-
-  display_obj.tft.drawXBitmap(170,
-                              0,
-                              menu_icons[STATUS_SD],
-                              16,
-                              16,
-                              STATUSBAR_COLOR,
-                              the_color);
-  //display_obj.tft.print((String)battery_obj.battery_level + "%");
-}
-
-void MenuFunctions::drawStatusBar()
-{
-  display_obj.tft.setTextSize(1);
-  display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-  //display_obj.tft.fillRect(0, STATUS_BAR_WIDTH + 1, 240, 1, TFT_DARKGREY);
-  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
-  //display_obj.tft.setTextSize(2);
-
-  uint16_t the_color;
-
-  // Draw temp info
-  if (temp_obj.current_temp < 70)
-    the_color = TFT_GREEN;
-  else if ((temp_obj.current_temp >= 70) && (temp_obj.current_temp < 80))
-    the_color = TFT_YELLOW;
-  else if ((temp_obj.current_temp >= 80) && (temp_obj.current_temp < 90))
-    the_color = TFT_ORANGE;
-  else if ((temp_obj.current_temp >= 90) && (temp_obj.current_temp < 100))
-    the_color = TFT_RED;
-  else
-    the_color = TFT_MAROON;
-
-  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
-  temp_obj.old_temp = temp_obj.current_temp;
-  display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-  display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2);
-  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
-
-
-  // WiFi Channel Stuff
-  wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
-  display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-  display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
-
-  // RAM Stuff
-  wifi_scan_obj.freeRAM();
-  wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
-  display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
-  display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
-
-
-  MenuFunctions::battery2(true);
-
-  // Draw SD info
-  if (sd_obj.supported)
-    the_color = TFT_GREEN;
-  else
-    the_color = TFT_RED;
-
-  display_obj.tft.drawXBitmap(170,
-                              0,
-                              menu_icons[STATUS_SD],
-                              16,
-                              16,
-                              STATUSBAR_COLOR,
-                              the_color);
-  //display_obj.tft.print((String)battery_obj.battery_level + "%");
-}
-
-void MenuFunctions::orientDisplay()
-{
-  Serial.println(F("orientDisplay()"));
-  display_obj.tft.init();
-
-  display_obj.tft.setRotation(0); // Portrait
-
-  display_obj.tft.setCursor(0, 0);
-
-  //uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait
-  //uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
-
-#ifdef TFT_SHIELD
-  uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
-  Serial.println("Using TFT Shield");
-#else if defined(TFT_DIY)
-  uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
-  Serial.println("Using TFT DIY");
-#endif
-
-  display_obj.tft.setTouch(calData);
-
-  //display_obj.clearScreen();
-
-  changeMenu(current_menu);
-}
-
-void MenuFunctions::runBoolSetting(String key) {
-  Serial.println("Building bool setting screen...");
-  display_obj.tftDrawRedOnOffButton();
-  //display_obj.tftDrawGreenOnOffButton();
-}
-
-void MenuFunctions::callSetting(String key) {
-  specSettingMenu.name = key;
-  
-  String setting_type = settings_obj.getSettingType(key);
-
-  if (setting_type == "bool") {
-    this->runBoolSetting(key);
-  }
-}
-
-
-// Function to build the menus
-void MenuFunctions::RunSetup()
-{
-  this->initLVGL();
-  
-  // root menu stuff
-  mainMenu.list = new LinkedList<MenuNode>(); // Get list in first menu ready
-
-  // Main menu stuff
-  wifiMenu.list = new LinkedList<MenuNode>(); // Get list in second menu ready
-  bluetoothMenu.list = new LinkedList<MenuNode>(); // Get list in third menu ready
-  badusbMenu.list = new LinkedList<MenuNode>();
-  generalMenu.list = new LinkedList<MenuNode>();
-  deviceMenu.list = new LinkedList<MenuNode>();
-
-  // Device menu stuff
-  failedUpdateMenu.list = new LinkedList<MenuNode>();
-  whichUpdateMenu.list = new LinkedList<MenuNode>();
-  confirmMenu.list = new LinkedList<MenuNode>();
-  espUpdateMenu.list = new LinkedList<MenuNode>();
-  updateMenu.list = new LinkedList<MenuNode>();
-  settingsMenu.list = new LinkedList<MenuNode>();
-  specSettingMenu.list = new LinkedList<MenuNode>();
-  infoMenu.list = new LinkedList<MenuNode>();
-
-  // WiFi menu stuff
-  wifiSnifferMenu.list = new LinkedList<MenuNode>();
-  wifiAttackMenu.list = new LinkedList<MenuNode>();
-  wifiGeneralMenu.list = new LinkedList<MenuNode>();
-
-  // Bluetooth menu stuff
-  bluetoothSnifferMenu.list = new LinkedList<MenuNode>();
-  bluetoothGeneralMenu.list = new LinkedList<MenuNode>();
-
-  // Settings stuff
-  shutdownWiFiMenu.list = new LinkedList<MenuNode>();
-  shutdownBLEMenu.list = new LinkedList<MenuNode>();
-  generateSSIDsMenu.list = new LinkedList<MenuNode>();
-  clearSSIDsMenu.list = new LinkedList<MenuNode>();
-  clearAPsMenu.list = new LinkedList<MenuNode>();
-
-  // Work menu names
-  mainMenu.name = " ESP32 Marauder ";
-  wifiMenu.name = " WiFi ";
-  badusbMenu.name = " Bad USB ";
-  deviceMenu.name = " Device ";
-  generalMenu.name = " General Apps ";
-  failedUpdateMenu.name = " Updating... ";
-  whichUpdateMenu.name = "Select Method ";
-  confirmMenu.name = " Confirm Update ";
-  espUpdateMenu.name = " ESP8266 Update ";
-  updateMenu.name = " Update Firmware ";
-  infoMenu.name = " Device Info ";
-  settingsMenu.name = " Settings ";
-  bluetoothMenu.name = " Bluetooth ";
-  wifiSnifferMenu.name = " WiFi Sniffers ";
-  wifiAttackMenu.name = " WiFi Attacks ";
-  wifiGeneralMenu.name = " WiFi General ";
-  bluetoothSnifferMenu.name = " Bluetooth Sniffers ";
-  bluetoothGeneralMenu.name = " Bluetooth General ";
-  shutdownWiFiMenu.name = " Shutdown WiFi ";
-  shutdownBLEMenu.name = " Shutdown BLE ";
-  generateSSIDsMenu.name = " Generate SSIDs ";
-  clearSSIDsMenu.name = " Clear SSIDs ";
-  clearAPsMenu.name = " Clear APs ";
-  
-
-  // Build Main Menu
-  mainMenu.parentMenu = NULL;
-  addNodes(&mainMenu, "WiFi", TFT_GREEN, NULL, WIFI, [this]() {
-    changeMenu(&wifiMenu);
-  });
-  addNodes(&mainMenu, "Bluetooth", TFT_CYAN, NULL, BLUETOOTH, [this]() {
-    changeMenu(&bluetoothMenu);
-  });
-  if (a32u4_obj.supported) addNodes(&mainMenu, "Bad USB", TFT_RED, NULL, BAD_USB_ICO, [this]() {
-    changeMenu(&badusbMenu);
-  });
-  addNodes(&mainMenu, "General Apps", TFT_MAGENTA, NULL, GENERAL_APPS, [this]() {
-    changeMenu(&generalMenu);
-  });
-  addNodes(&mainMenu, "Device", TFT_BLUE, NULL, DEVICE, [this]() {
-    changeMenu(&deviceMenu);
-  });
-  addNodes(&mainMenu, "Reboot", TFT_LIGHTGREY, NULL, REBOOT, []() {
-    ESP.restart();
-  });
-
-  // Build WiFi Menu
-  wifiMenu.parentMenu = &mainMenu; // Main Menu is second menu parent
-  addNodes(&wifiMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(wifiMenu.parentMenu);
-  });
-  addNodes(&wifiMenu, "Sniffers", TFT_YELLOW, NULL, SNIFFERS, [this]() {
-    changeMenu(&wifiSnifferMenu);
-  });
-  //addNodes(&wifiMenu, "Scanners", TFT_ORANGE, NULL, SCANNERS, [this]() {
-  //  changeMenu(&wifiScannerMenu);
-  //});
-  addNodes(&wifiMenu, "Attacks", TFT_RED, NULL, ATTACKS, [this]() {
-    changeMenu(&wifiAttackMenu);
-  });
-  addNodes(&wifiMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
-    changeMenu(&wifiGeneralMenu);
-  });
-
-  // Build WiFi sniffer Menu
-  wifiSnifferMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
-  addNodes(&wifiSnifferMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(wifiSnifferMenu.parentMenu);
-  });
-  addNodes(&wifiSnifferMenu, "Probe Request Sniff", TFT_CYAN, NULL, PROBE_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_PROBE, TFT_CYAN);
-  });
-  addNodes(&wifiSnifferMenu, "Beacon Sniff", TFT_MAGENTA, NULL, BEACON_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_AP, TFT_MAGENTA);
-  });
-  addNodes(&wifiSnifferMenu, "Deauth Sniff", TFT_RED, NULL, DEAUTH_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_DEAUTH, TFT_RED);
-  });
-  addNodes(&wifiSnifferMenu, "Packet Monitor", TFT_BLUE, NULL, PACKET_MONITOR, [this]() {
-    wifi_scan_obj.StartScan(WIFI_PACKET_MONITOR, TFT_BLUE);
-  });
-  addNodes(&wifiSnifferMenu, "EAPOL/PMKID Scan", TFT_VIOLET, NULL, EAPOL, [this]() {
-    wifi_scan_obj.StartScan(WIFI_SCAN_EAPOL, TFT_VIOLET);
-  });
-  addNodes(&wifiSnifferMenu, "Detect Pwnagotchi", TFT_RED, NULL, PWNAGOTCHI, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_PWN, TFT_RED);
-  });
-  addNodes(&wifiSnifferMenu, "Detect Espressif", TFT_ORANGE, NULL, ESPRESSIF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_ESPRESSIF, TFT_ORANGE);
-  });
-  addNodes(&wifiSnifferMenu, "Scan APs", TFT_MAGENTA, NULL, BEACON_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA);
-  });
-
-  // Build WiFi attack menu
-  wifiAttackMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
-  addNodes(&wifiAttackMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(wifiAttackMenu.parentMenu);
-  });
-  addNodes(&wifiAttackMenu, "Beacon Spam List", TFT_RED, NULL, BEACON_LIST, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_LIST, TFT_RED);
-  });
-  addNodes(&wifiAttackMenu, "Beacon Spam Random", TFT_ORANGE, NULL, BEACON_SPAM, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_SPAM, TFT_ORANGE);
-  });
-  addNodes(&wifiAttackMenu, "Rick Roll Beacon", TFT_YELLOW, NULL, RICK_ROLL, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_RICK_ROLL, TFT_YELLOW);
-  });
-  addNodes(&wifiAttackMenu, "Probe Req Flood", TFT_RED, NULL, PROBE_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_AUTH, TFT_RED);
-  });
-  addNodes(&wifiAttackMenu, "Deauth Flood", TFT_RED, NULL, DEAUTH_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH, TFT_RED);
-  });
-  //addNodes(&wifiAttackMenu, "AP Mimic Flood", TFT_PURPLE, NULL, DEAUTH_SNIFF, [this]() {
-  //  display_obj.clearScreen();
-  //  this->drawStatusBar();
-  //  wifi_scan_obj.StartScan(WIFI_ATTACK_MIMIC, TFT_PURPLE);
-  //});
-
-  // Build WiFi General menu
-  wifiGeneralMenu.parentMenu = &wifiMenu;
-  addNodes(&wifiGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(wifiGeneralMenu.parentMenu);
-  });
-  addNodes(&wifiGeneralMenu, "Join WiFi", TFT_DARKCYAN, NULL, JOIN_WIFI, [this](){
-    display_obj.clearScreen(); 
-    wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; 
-    wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
-    joinWiFiGFX();
-  });
-  addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_CYAN, NULL, SHUTDOWN, [this]() {
-    changeMenu(&shutdownWiFiMenu);
-    wifi_scan_obj.RunShutdownWiFi();
-  });
-  addNodes(&wifiGeneralMenu, "Generate SSIDs", TFT_SKYBLUE, NULL, GENERATE, [this]() {
-    changeMenu(&generateSSIDsMenu);
-    wifi_scan_obj.RunGenerateSSIDs();
-  });
-  addNodes(&wifiGeneralMenu, "Add SSID", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
-    display_obj.clearScreen(); 
-    //wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
-    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_YELLOW); 
-    addSSIDGFX();
-  });
-  addNodes(&wifiGeneralMenu, "Clear SSIDs", TFT_SILVER, NULL, CLEAR_ICO, [this]() {
-    changeMenu(&clearSSIDsMenu);
-    wifi_scan_obj.RunClearSSIDs();
-  });
-  addNodes(&wifiGeneralMenu, "Clear APs", TFT_DARKGREY, NULL, CLEAR_ICO, [this]() {
-    changeMenu(&clearAPsMenu);
-    wifi_scan_obj.RunClearAPs();
-  });
-  addNodes(&wifiGeneralMenu, "Select APs", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
-    display_obj.clearScreen(); 
-    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
-    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
-    addAPGFX();
-  });
-
-  // Build shutdown wifi menu
-  shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
-  addNodes(&shutdownWiFiMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(shutdownWiFiMenu.parentMenu);
-  });
-
-  // Build generate ssids menu
-  generateSSIDsMenu.parentMenu = &wifiGeneralMenu;
-  addNodes(&generateSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(generateSSIDsMenu.parentMenu);
-  });
-
-  // Build clear ssids menu
-  clearSSIDsMenu.parentMenu = &wifiGeneralMenu;
-  addNodes(&clearSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(clearSSIDsMenu.parentMenu);
-  });
-  clearAPsMenu.parentMenu = &wifiGeneralMenu;
-  addNodes(&clearAPsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(clearAPsMenu.parentMenu);
-  });
-
-
-  // Build Bluetooth Menu
-  bluetoothMenu.parentMenu = &mainMenu; // Second Menu is third menu parent
-  addNodes(&bluetoothMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(bluetoothMenu.parentMenu);
-  });
-  addNodes(&bluetoothMenu, "Sniffers", TFT_YELLOW, NULL, SNIFFERS, [this]() {
-    changeMenu(&bluetoothSnifferMenu);
-  });
-  //addNodes(&bluetoothMenu, "Scanners", TFT_ORANGE, NULL, SCANNERS, [this]() {
-  //  changeMenu(&bluetoothScannerMenu);
-  //});
-  addNodes(&bluetoothMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
-    changeMenu(&bluetoothGeneralMenu);
-  });
-
-  // Build bluetooth sniffer Menu
-  bluetoothSnifferMenu.parentMenu = &bluetoothMenu; // Second Menu is third menu parent
-  addNodes(&bluetoothSnifferMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(bluetoothSnifferMenu.parentMenu);
-  });
-  addNodes(&bluetoothSnifferMenu, "Bluetooth Sniffer", TFT_GREEN, NULL, BLUETOOTH_SNIFF, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(BT_SCAN_ALL, TFT_GREEN);
-  });
-  addNodes(&bluetoothSnifferMenu, "Detect Card Skimmers", TFT_MAGENTA, NULL, CC_SKIMMERS, [this]() {
-    display_obj.clearScreen();
-    this->drawStatusBar();
-    wifi_scan_obj.StartScan(BT_SCAN_SKIMMERS, TFT_MAGENTA);
-  });
-
-  // Build bluetooth scanner Menu
-  //bluetoothScannerMenu.parentMenu = &bluetoothMenu; // Second Menu is third menu parent
-  //addNodes(&bluetoothScannerMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-  //  changeMenu(bluetoothScannerMenu.parentMenu);
-  //});
-
-  // Build bluetooth general menu
-  bluetoothGeneralMenu.parentMenu = &bluetoothMenu;
-  addNodes(&bluetoothGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(bluetoothGeneralMenu.parentMenu);
-  });
-  addNodes(&bluetoothGeneralMenu, "Shutdown BLE", TFT_ORANGE, NULL, SHUTDOWN, [this]() {
-    changeMenu(&shutdownBLEMenu);
-    wifi_scan_obj.RunShutdownBLE();
-  });
-
-  // Build shutdown BLE menu
-  shutdownBLEMenu.parentMenu = &bluetoothGeneralMenu;
-  addNodes(&shutdownBLEMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(shutdownBLEMenu.parentMenu);
-  });
-
-  // Bad USB Menu
-  badusbMenu.parentMenu = &mainMenu;
-  addNodes(&badusbMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(badusbMenu.parentMenu);
-  });
-  addNodes(&badusbMenu, "Test BadUSB", TFT_PURPLE, NULL, TEST_BAD_USB_ICO, [this]() {
-    a32u4_obj.test();
-  });
-  addNodes(&badusbMenu, "Run Ducky Script", TFT_RED, NULL, BAD_USB_ICO, [this](){
-    display_obj.clearScreen(); 
-    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
-    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED); 
-    writeBadUSB();
-  });
-
-  // General apps menu
-  generalMenu.parentMenu = &mainMenu;
-  addNodes(&generalMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    display_obj.draw_tft = false;
-    changeMenu(generalMenu.parentMenu);
-  });
-  addNodes(&generalMenu, "Draw", TFT_WHITE, NULL, DRAW, [this]() {
-    display_obj.clearScreen();
-    display_obj.setupDraw();
-    display_obj.draw_tft = true;
-  });
-
-  // Device menu
-  deviceMenu.parentMenu = &mainMenu;
-  addNodes(&deviceMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(deviceMenu.parentMenu);
-  });
-  //addNodes(&deviceMenu, "Update Firmware", TFT_ORANGE, NULL, UPDATE, [this](){wifi_scan_obj.currentScanMode = OTA_UPDATE; changeMenu(&updateMenu); web_obj.setupOTAupdate();});
-  addNodes(&deviceMenu, "Update Firmware", TFT_ORANGE, NULL, UPDATE, [this]() {
-    wifi_scan_obj.currentScanMode = OTA_UPDATE;
-    changeMenu(&whichUpdateMenu);
-  });
-  addNodes(&deviceMenu, "Device Info", TFT_WHITE, NULL, DEVICE_INFO, [this]() {
-    wifi_scan_obj.currentScanMode = SHOW_INFO;
-    changeMenu(&infoMenu);
-    wifi_scan_obj.RunInfo();
-  });
-  addNodes(&deviceMenu, "Settings", TFT_NAVY, NULL, KEYBOARD_ICO, [this]() {
-    changeMenu(&settingsMenu);
-  });
-  /*addNodes(&deviceMenu, "Settings", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
-    display_obj.clearScreen(); 
-    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
-    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
-    displaySettingsGFX();
-  });*/
-
-  // Settings menu
-  // Device menu
-  settingsMenu.parentMenu = &deviceMenu;
-  addNodes(&settingsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(settingsMenu.parentMenu);
-  });
-  for (int i = 0; i < settings_obj.getNumberSettings(); i++) {
-    addNodes(&settingsMenu, settings_obj.setting_index_to_name(i), TFT_LIGHTGREY, NULL, 0, [this, i]() {
-      changeMenu(&specSettingMenu);
-      this->callSetting(settings_obj.setting_index_to_name(i));
-    });
-  }
-
-  // Specific setting menu
-  specSettingMenu.parentMenu = &settingsMenu;
-  addNodes(&specSettingMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(specSettingMenu.parentMenu);
-  });
- 
-  // Select update
-  whichUpdateMenu.parentMenu = &deviceMenu;
-  addNodes(&whichUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(whichUpdateMenu.parentMenu);
-  });
-  addNodes(&whichUpdateMenu, "Web Update", TFT_GREEN, NULL, WEB_UPDATE, [this]() {
-    wifi_scan_obj.currentScanMode = OTA_UPDATE;
-    changeMenu(&updateMenu);
-    web_obj.setupOTAupdate();
-  });
-  if (sd_obj.supported) addNodes(&whichUpdateMenu, "SD Update", TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
-    wifi_scan_obj.currentScanMode = OTA_UPDATE;
-    changeMenu(&confirmMenu);
-  });
-  addNodes(&whichUpdateMenu, "ESP8266 Update", TFT_RED, NULL, ESP_UPDATE_ICO, [this]() {
-    wifi_scan_obj.currentScanMode = ESP_UPDATE;
-    changeMenu(&espUpdateMenu);
-    esp_obj.RunUpdate();
-  });
-
-  // ESP Update Menu
-  espUpdateMenu.parentMenu = &whichUpdateMenu;
-  addNodes(&espUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-    esp_obj.bootRunMode();
-    changeMenu(espUpdateMenu.parentMenu);
-  });
-
-  // Confirm SD update menu
-  confirmMenu.parentMenu = &whichUpdateMenu;
-  addNodes(&confirmMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    changeMenu(confirmMenu.parentMenu);
-  });
-  //addNodes(&confirmMenu, "Yes", TFT_ORANGE, NULL, UPDATE, [this](){wifi_scan_obj.currentScanMode = OTA_UPDATE; changeMenu(&updateMenu); sd_obj.runUpdate();});
-  addNodes(&confirmMenu, "Yes", TFT_ORANGE, NULL, UPDATE, [this]() {
-    wifi_scan_obj.currentScanMode = OTA_UPDATE;
-    changeMenu(&failedUpdateMenu);
-    sd_obj.runUpdate();
-  });
-
-  // Web Update
-  updateMenu.parentMenu = &deviceMenu;
-  addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-    changeMenu(updateMenu.parentMenu);
-    WiFi.softAPdisconnect(true);
-    web_obj.shutdownServer();
-  });
-  //addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this](){wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; changeMenu(updateMenu.parentMenu);});
-
-  // Failed update menu
-  failedUpdateMenu.parentMenu = &whichUpdateMenu;
-  addNodes(&failedUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-    changeMenu(failedUpdateMenu.parentMenu);
-  });
-
-  // Device info menu
-  infoMenu.parentMenu = &deviceMenu;
-  addNodes(&infoMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
-    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
-    changeMenu(infoMenu.parentMenu);
-  });
-
-  // Set the current menu to the mainMenu
-  changeMenu(&mainMenu);
-
-  this->initTime = millis();
-}
-
-// Function to change menu
-void MenuFunctions::changeMenu(Menu * menu)
-{
-  display_obj.initScrollValues();
-  display_obj.setupScrollArea(TOP_FIXED_AREA, BOT_FIXED_AREA);
-  display_obj.tft.init();
-  current_menu = menu;
-
-  buildButtons(menu);
-
-  displayCurrentMenu();
-}
-
-// Function to show all MenuNodes in a Menu
-void MenuFunctions::showMenuList(Menu * menu, int layer)
-{
-  // Iterate through all of the menu nodes in the menu
-  for (uint8_t i = 0; i < menu->list->size(); i++)
-  {
-    // Depending on layer, indent
-    for (uint8_t x = 0; x < layer * 4; x++)
-      Serial.print(" ");
-    Serial.print("Node: ");
-    Serial.println(menu->list->get(i).name);
-
-    // If the current menu node points to another menu, list that menu
-    //if (menu->list->get(i).childMenu != NULL)
-    //  showMenuList(menu->list->get(i).childMenu, layer+1);
-  }
-  Serial.println();
-}
-
-
-// Function to add MenuNodes to a menu
-void MenuFunctions::addNodes(Menu * menu, String name, uint16_t color, Menu * child, int place, std::function<void()> callable)
-{
-  TFT_eSPI_Button new_button;
-  menu->list->add(MenuNode{name, color, place, &new_button, callable});
-  //strcpy(menu->list->get(-1).icon, bluetooth_icon);
-}
-
-void MenuFunctions::buildButtons(Menu * menu)
-{
-  Serial.println("Bulding buttons...");
-  if (menu->list != NULL)
-  {
-    //for (int i = 0; i < sizeof(key); i++)
-    //  key[i] = NULL;
-    for (uint8_t i = 0; i < menu->list->size(); i++)
-    {
-      TFT_eSPI_Button new_button;
-      char buf[menu->list->get(i).name.length() + 1] = {};
-      menu->list->get(i).name.toCharArray(buf, menu->list->get(i).name.length() + 1);
-      display_obj.key[i].initButton(&display_obj.tft,
-                                    KEY_X + 0 * (KEY_W + KEY_SPACING_X),
-                                    KEY_Y + i * (KEY_H + KEY_SPACING_Y), // x, y, w, h, outline, fill, text
-                                    KEY_W,
-                                    KEY_H,
-                                    TFT_BLACK, // Outline
-                                    TFT_BLACK, // Fill
-                                    menu->list->get(i).color, // Text
-                                    buf,
-                                    KEY_TEXTSIZE);
-
-      display_obj.key[i].setLabelDatum(BUTTON_PADDING - (KEY_W / 2), 2, ML_DATUM);
-    }
-  }
-}
-
-
-void MenuFunctions::displayCurrentMenu()
-{
-  Serial.println(F("Displaying current menu..."));
-  display_obj.clearScreen();
-  display_obj.tft.setTextColor(TFT_LIGHTGREY, TFT_DARKGREY);
-  this->drawStatusBar();
-  //display_obj.tft.fillRect(0,0,240,16, TFT_DARKGREY);
-  //display_obj.tft.drawCentreString(" ESP32 Marauder ",120,0,2);
-  //Serial.println("Getting size...");
-  //char buf[&current_menu->parentMenu->name.length() + 1] = {};
-  //Serial.println("Got size...");
-  //current_menu->parentMenu->name.toCharArray(buf, current_menu->parentMenu->name.length() + 1);
-  //String current_name = &current_menu->parentMenu->name;
-  //Serial.println("gottem");
-  //display_obj.tft.drawCentreString(current_menu->name,120,0,2);
-  if (current_menu->list != NULL)
-  {
-    display_obj.tft.setFreeFont(MENU_FONT);
-    for (uint8_t i = 0; i < current_menu->list->size(); i++)
-    {
-      //display_obj.key[i].drawButton2(current_menu->list->get(i).name);
-      //display_obj.key[i].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(i).name);
-      //display_obj.key[i].drawButton(true);
-      display_obj.key[i].drawButton(false, current_menu->list->get(i).name);
-
-      if (current_menu->list->get(i).name != "Back")
-        display_obj.tft.drawXBitmap(0,
-                                    KEY_Y + i * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
-                                    menu_icons[current_menu->list->get(i).icon],
-                                    ICON_W,
-                                    ICON_H,
-                                    TFT_BLACK,
-                                    current_menu->list->get(i).color);
-    }
-    display_obj.tft.setFreeFont(NULL);
-  }
-}
+#include "MenuFunctions.h"
+//#include "icons.h"
+
+extern const unsigned char menu_icons[][66];
+PROGMEM lv_obj_t * slider_label;
+PROGMEM lv_obj_t * ta1;
+PROGMEM lv_obj_t * ta2;
+PROGMEM lv_obj_t * save_name;
+
+MenuFunctions::MenuFunctions()
+{
+}
+
+// LVGL Stuff
+/* Interrupt driven periodic handler */
+
+void MenuFunctions::lv_tick_handler()
+{
+  lv_tick_inc(LVGL_TICK_PERIOD);
+}
+
+/* Display flushing */
+void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p)
+{
+  extern Display display_obj;
+  uint16_t c;
+
+  display_obj.tft.startWrite();
+  display_obj.tft.setAddrWindow(area->x1, area->y1, (area->x2 - area->x1 + 1), (area->y2 - area->y1 + 1));
+  for (int y = area->y1; y <= area->y2; y++) {
+    for (int x = area->x1; x <= area->x2; x++) {
+      c = color_p->full;
+      display_obj.tft.writeColor(c, 1);
+      color_p++;
+    }
+  }
+  display_obj.tft.endWrite();
+  lv_disp_flush_ready(disp);
+}
+
+
+bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data)
+{
+  extern Display display_obj;
+  
+  uint16_t touchX, touchY;
+
+  bool touched = display_obj.tft.getTouch(&touchX, &touchY, 600);
+
+  if(!touched)
+  {
+    return false;
+  }
+
+  if(touchX>WIDTH_1 || touchY > HEIGHT_1)
+  {
+    Serial.println("Y or y outside of expected parameters..");
+    Serial.print("y:");
+    Serial.print(touchX);
+    Serial.print(" x:");
+    Serial.print(touchY);
+  }
+  else
+  {
+
+    data->state = touched ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; 
+
+    //if(data->state == LV_INDEV_STATE_PR) touchpad_get_xy(&last_x, &last_y);
+   
+    data->point.x = touchX;
+    data->point.y = touchY;
+
+    //Serial.print("Data x");
+    //Serial.println(touchX);
+    
+    //Serial.print("Data y");
+    //Serial.println(touchY);
+
+  }
+
+  return false;
+}
+
+void MenuFunctions::initLVGL() {
+  tick.attach_ms(LVGL_TICK_PERIOD, lv_tick_handler);
+  
+  lv_init();
+
+  lv_disp_buf_init(&disp_buf, buf, NULL, LV_HOR_RES_MAX * 10);
+
+  lv_disp_drv_t disp_drv;
+  lv_disp_drv_init(&disp_drv);
+  disp_drv.hor_res = WIDTH_1;
+  disp_drv.ver_res = HEIGHT_1;
+  disp_drv.flush_cb = my_disp_flush;
+  disp_drv.buffer = &disp_buf;
+  lv_disp_drv_register(&disp_drv);
+
+  lv_indev_drv_t indev_drv;
+  lv_indev_drv_init(&indev_drv);             
+  indev_drv.type = LV_INDEV_TYPE_POINTER;    
+  indev_drv.read_cb = my_touchpad_read;      
+  lv_indev_drv_register(&indev_drv);         
+}
+
+
+void MenuFunctions::deinitLVGL() {
+  Serial.println(F("Deinit LVGL"));
+  //lv_deinit();
+}
+
+void MenuFunctions::writeBadUSB(){
+  // Create a keyboard and apply the styles
+  kb = lv_keyboard_create(lv_scr_act(), NULL);
+  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
+  lv_obj_set_event_cb(kb, write_bad_usb_keyboard_event_cb);
+
+  // Create one text area
+  // Store all SSIDs
+  ta1 = lv_textarea_create(lv_scr_act(), NULL);
+  lv_textarea_set_cursor_hidden(ta1, false);
+  lv_textarea_set_one_line(ta1, false);
+  lv_obj_set_width(ta1, LV_HOR_RES);
+  lv_obj_set_height(ta1, (LV_VER_RES / 2) - 35);
+  lv_obj_set_pos(ta1, 5, 20);
+  lv_textarea_set_cursor_hidden(ta1, true);
+  lv_obj_align(ta1, NULL, LV_ALIGN_IN_TOP_MID, NULL, NULL);
+  lv_textarea_set_text(ta1, "");
+  lv_textarea_set_placeholder_text(ta1, "Ducky script");
+
+  if (sd_obj.supported) {
+    // Create load button
+    lv_obj_t * label;
+    lv_obj_t * load_btn = lv_btn_create(lv_scr_act(), NULL);
+    lv_obj_set_event_cb(load_btn, load_btn_cb);
+    lv_obj_set_height(load_btn, 35);
+    lv_obj_set_width(load_btn, LV_HOR_RES / 3);
+    lv_obj_align(load_btn, ta1, LV_ALIGN_IN_TOP_RIGHT, NULL, (LV_VER_RES / 2) - 35); // align to text area
+    label = lv_label_create(load_btn, NULL);
+    lv_label_set_text(label, "Load");
+  
+    // Create Save As button
+    lv_obj_t * label2;
+    lv_obj_t * save_as_btn = lv_btn_create(lv_scr_act(), NULL);
+    lv_obj_set_event_cb(save_as_btn, load_btn_cb);
+    lv_obj_set_height(save_as_btn, 35);
+    lv_obj_set_width(save_as_btn, LV_HOR_RES / 3);
+    lv_obj_align(save_as_btn, ta1, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35); // align to text area
+    label2 = lv_label_create(save_as_btn, NULL);
+    lv_label_set_text(label2, "Save As");
+  }
+  
+  // Focus it on one of the text areas to start
+  lv_keyboard_set_textarea(kb, ta1);
+  lv_keyboard_set_cursor_manage(kb, true);
+}
+
+// Event handler for settings drop down menus
+void setting_dropdown_cb(lv_obj_t * obj, lv_event_t event) {
+  //lv_event_code_t code = lv_event_get_code(event);
+  //lv_obj_t * obj = lv_event_get_target(event);
+  //lv_obj_t * list1 = lv_obj_get_parent(lv_obj_get_parent(obj));
+  //if(event == LV_EVENT_CLICKED) {
+  //    LV_LOG_USER("Clicked: %s", lv_list_get_btn_text(list1, obj));
+  //}
+}
+
+void settings_list_cb(lv_obj_t * btn, lv_event_t event) {
+  extern Settings settings_obj;
+  extern MenuFunctions menu_function_obj;
+
+  String btn_text = lv_list_get_btn_text(btn);
+  String display_string = "";
+  
+  if (event == LV_EVENT_CLICKED) {
+    if (btn_text == "Exit") {
+      Serial.println("Exiting...");
+      lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
+
+      printf("LV_EVENT_CANCEL\n");
+      Serial.println("Potato");
+      //menu_function_obj.deinitLVGL();
+      //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+      //display_obj.exit_draw = true; // set everything back to normal
+    }
+    else {
+      // Build base obj to host buttons
+      Serial.println("Creating base object...");
+      lv_obj_t * obj;
+      obj = lv_obj_create(lv_scr_act(), NULL);
+      lv_obj_set_size(obj, LV_HOR_RES, LV_VER_RES);
+      
+      lv_obj_t * exit_btn;
+
+      lv_obj_t * label;
+      
+      // Build the generic Exit button
+      exit_btn = lv_btn_create(obj, NULL);
+      lv_obj_set_event_cb(exit_btn, settings_list_cb);
+      lv_label_set_text(label, "Exit");
+      //lv_obj_center(label);
+
+      label = lv_label_create(exit_btn, NULL);
+
+      // Create the type specific device
+      if (settings_obj.getSettingType(btn_text) == "bool") {
+        lv_obj_t * sw = lv_switch_create(obj, NULL);
+        lv_obj_align(sw, NULL, LV_ALIGN_CENTER, 0, 0);
+      }
+    }
+  }
+
+  /*
+  if (event == LV_EVENT_VALUE_CHANGED) {      
+    if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
+      //Serial.print("Toggle on: ");
+      //Serial.println(btn_text);
+      for (int i = 0; i < access_points->size(); i++) {
+        if (access_points->get(i).essid == btn_text) {
+          Serial.println("Adding AP: " + (String)access_points->get(i).essid);
+          AccessPoint ap = access_points->get(i);
+          ap.selected = true;
+          access_points->set(i, ap);
+        }
+      }
+    }
+    else {
+      //Serial.print("Toggle off: ");
+      //Serial.println(btn_text);
+      for (int i = 0; i < access_points->size(); i++) {
+        if (access_points->get(i).essid == btn_text) {
+          Serial.println("Removing AP: " + (String)access_points->get(i).essid);
+          AccessPoint ap = access_points->get(i);
+          ap.selected = false;
+          access_points->set(i, ap);
+        }
+      }
+    }
+  }*/
+}
+
+void MenuFunctions::displaySettingsGFX(){
+  extern Settings settings_obj;
+
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, settings_obj.getSettingsString())) {
+    Serial.println("\nCould not parse json");
+  }
+  
+  lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
+  lv_obj_set_size(list1, 160, 200);
+  lv_obj_set_width(list1, LV_HOR_RES);
+  lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
+
+  lv_obj_t * list_btn;
+
+  lv_obj_t * label;
+
+  lv_obj_t * sw;
+
+  list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Exit");
+  lv_obj_set_event_cb(list_btn, ap_list_cb);
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    char buf[json["Settings"][i]["name"].as<String>().length() + 1] = {};
+    json["Settings"][i]["name"].as<String>().toCharArray(buf, json["Settings"][i]["name"].as<String>().length() + 1);
+    
+    list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, buf);
+    lv_btn_set_checkable(list_btn, false);
+    lv_obj_set_event_cb(list_btn, settings_list_cb);
+
+    //lv_list_add_text(list1, buf);
+
+    // Create the dropdown menu
+    /*lv_obj_t * dd = lv_dropdown_create(list1, NULL);
+    lv_dropdown_set_options(dd, "Apple\n"
+                                "Banana\n"
+                                "Orange\n"
+                                "Cherry\n"
+                                "Grape\n"
+                                "Raspberry\n"
+                                "Melon\n"
+                                "Orange\n"
+                                "Lemon\n"
+                                "Nuts");
+
+    //lv_obj_align(dd, LV_ALIGN_IN_RIGHT_MID, 0, 20);
+    lv_obj_align(dd, NULL, LV_ALIGN_IN_RIGHT_MID, 0, 0);
+    lv_obj_set_width(dd, LV_HOR_RES / 3);
+    lv_obj_set_event_cb(dd, setting_dropdown_cb);
+    //lv_obj_add_event_cb(dd, setting_dropdown_cb, LV_EVENT_ALL, NULL);*/
+    
+    //if (access_points->get(i).selected)
+    //  lv_btn_toggle(list_btn);
+
+    //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
+    //lv_obj_set_event_cb(btn1, ap_list_cb);
+    //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
+    //lv_btn_set_checkable(btn1, true);
+  }
+}
+
+// GFX Function to build a list showing all APs scanned
+void MenuFunctions::addAPGFX(){
+  extern LinkedList<AccessPoint>* access_points;
+
+  lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
+  lv_obj_set_size(list1, 160, 200);
+  lv_obj_set_width(list1, LV_HOR_RES);
+  lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
+
+  lv_obj_t * list_btn;
+
+  lv_obj_t * label;
+
+  list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Exit");
+  lv_obj_set_event_cb(list_btn, ap_list_cb);
+
+  for (int i = 0; i < access_points->size(); i++) {
+    char buf[access_points->get(i).essid.length() + 1] = {};
+    access_points->get(i).essid.toCharArray(buf, access_points->get(i).essid.length() + 1);
+    
+    list_btn = lv_list_add_btn(list1, LV_SYMBOL_WIFI, buf);
+    lv_btn_set_checkable(list_btn, true);
+    lv_obj_set_event_cb(list_btn, ap_list_cb);
+
+    if (access_points->get(i).selected)
+      lv_btn_toggle(list_btn);
+
+    //lv_obj_t * btn1 = lv_btn_create(list_btn, NULL);
+    //lv_obj_set_event_cb(btn1, ap_list_cb);
+    //lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
+    //lv_btn_set_checkable(btn1, true);
+
+    //label = lv_label_create(btn1, NULL);
+    //lv_label_set_text(label, buf);
+  }
+}
+
+
+
+void ap_list_cb(lv_obj_t * btn, lv_event_t event) {
+  extern LinkedList<AccessPoint>* access_points;
+  extern MenuFunctions menu_function_obj;
+
+  String btn_text = lv_list_get_btn_text(btn);
+  String display_string = "";
+  
+  if (event == LV_EVENT_CLICKED) {
+    if (btn_text != "Exit") {
+      //lv_list_focus_btn(lv_obj_get_parent(lv_obj_get_parent(btn)), btn);
+    }
+    else {
+      Serial.println("Exiting...");
+      lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
+
+      for (int i = 0; i < access_points->size(); i++) {
+        if (access_points->get(i).selected) {
+          Serial.println("Selected: " + (String)access_points->get(i).essid);
+        }
+      }
+
+      printf("LV_EVENT_CANCEL\n");
+      menu_function_obj.deinitLVGL();
+      wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+      display_obj.exit_draw = true; // set everything back to normal
+    }
+  }
+  
+  if (event == LV_EVENT_VALUE_CHANGED) {      
+    if (lv_btn_get_state(btn) == LV_BTN_STATE_CHECKED_RELEASED) {
+      //Serial.print("Toggle on: ");
+      //Serial.println(btn_text);
+      for (int i = 0; i < access_points->size(); i++) {
+        if (access_points->get(i).essid == btn_text) {
+          Serial.println("Adding AP: " + (String)access_points->get(i).essid);
+          AccessPoint ap = access_points->get(i);
+          ap.selected = true;
+          access_points->set(i, ap);
+        }
+      }
+    }
+    else {
+      //Serial.print("Toggle off: ");
+      //Serial.println(btn_text);
+      for (int i = 0; i < access_points->size(); i++) {
+        if (access_points->get(i).essid == btn_text) {
+          Serial.println("Removing AP: " + (String)access_points->get(i).essid);
+          AccessPoint ap = access_points->get(i);
+          ap.selected = false;
+          access_points->set(i, ap);
+        }
+      }
+    }
+  }
+}
+
+void MenuFunctions::addSSIDGFX(){
+  extern LinkedList<ssid>* ssids;
+  
+  String display_string = "";
+  // Create a keyboard and apply the styles
+  kb = lv_keyboard_create(lv_scr_act(), NULL);
+  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
+  lv_obj_set_event_cb(kb, add_ssid_keyboard_event_cb);
+
+  // Create one text area
+  // Store all SSIDs
+  ta1 = lv_textarea_create(lv_scr_act(), NULL);
+  lv_textarea_set_one_line(ta1, false);
+  lv_obj_set_width(ta1, LV_HOR_RES);
+  lv_obj_set_height(ta1, (LV_VER_RES / 2) - 35);
+  lv_obj_set_pos(ta1, 5, 20);
+  lv_textarea_set_cursor_hidden(ta1, true);
+  lv_obj_align(ta1, NULL, LV_ALIGN_IN_TOP_MID, NULL, NULL);
+  lv_textarea_set_placeholder_text(ta1, "SSID List");
+
+  // Create second text area
+  // Add SSIDs
+  ta2 = lv_textarea_create(lv_scr_act(), ta1);
+  lv_textarea_set_cursor_hidden(ta2, false);
+  lv_textarea_set_one_line(ta2, true);
+  lv_obj_align(ta2, NULL, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35);
+  lv_textarea_set_text(ta2, "");
+  lv_textarea_set_placeholder_text(ta2, "Add SSIDs");
+
+  // After generating text areas, add text to first text box
+  for (int i = 0; i < ssids->size(); i++)
+    display_string.concat((String)ssids->get(i).essid + "\n");
+    
+  lv_textarea_set_text(ta1, display_string.c_str());
+
+  // Focus it on one of the text areas to start
+  lv_keyboard_set_textarea(kb, ta2);
+  lv_keyboard_set_cursor_manage(kb, true);
+  
+}
+
+void MenuFunctions::joinWiFiGFX(){
+
+  // Create one text area
+  ta1 = lv_textarea_create(lv_scr_act(), NULL);
+  lv_textarea_set_one_line(ta1, true);
+  lv_obj_set_width(ta1, LV_HOR_RES / 2 - 20);
+  lv_obj_set_pos(ta1, 5, 20);
+  //lv_ta_set_cursor_type(ta, LV_CURSOR_BLOCK);
+  lv_textarea_set_text(ta1, "");
+  lv_obj_set_event_cb(ta1, ta_event_cb);
+
+  // Create first label
+  lv_obj_t * ssid_label = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text(ssid_label, "SSID:");
+  lv_obj_align(ssid_label, ta1, LV_ALIGN_OUT_TOP_LEFT, 0, 0);
+
+  // Create second text area
+  ta2 = lv_textarea_create(lv_scr_act(), ta1);
+  //lv_textarea_set_pwd_mode(ta2, true); // This shit makes it so backspace does not work
+  //lv_textarea_set_pwd_show_time(ta2, 1000);
+  lv_textarea_set_cursor_hidden(ta2, true);
+  lv_obj_align(ta2, NULL, LV_ALIGN_IN_TOP_RIGHT, -5, 20);
+
+  // Create second label
+  lv_obj_t * pw_label = lv_label_create(lv_scr_act(), NULL);
+  lv_label_set_text(pw_label, "Password:");
+  lv_obj_align(pw_label, ta2, LV_ALIGN_OUT_TOP_LEFT, 0, 0);
+
+  // Create a keyboard and apply the styles
+  kb = lv_keyboard_create(lv_scr_act(), NULL);
+  lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2);
+  lv_obj_set_event_cb(kb, join_wifi_keyboard_event_cb);
+
+  // Focus it on one of the text areas to start
+  lv_keyboard_set_textarea(kb, ta1);
+  lv_keyboard_set_cursor_manage(kb, true);
+  
+}
+
+// Function to create keyboard for saving file name
+void save_as_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) {
+  extern MenuFunctions menu_function_obj;
+
+  lv_keyboard_def_event_cb(save_as_kb, event);
+
+  // User canceled so we will get rid of the keyboard and text box
+  if (event == LV_EVENT_CANCEL) {
+    lv_obj_del_async(save_as_kb);
+    lv_obj_del_async(save_name);
+  }
+
+  // Save content from ta1 to file name in save_name
+  else if(event == LV_EVENT_APPLY){
+      String display_string = "";
+      printf("LV_EVENT_APPLY\n");
+
+      // Get ducky script
+      String content = lv_textarea_get_text(ta1);
+
+      String target_file_name = "/SCRIPTS/" + (String)lv_textarea_get_text(save_name);
+
+      Serial.println("Writing to target file: " + (String)target_file_name);
+
+      // Open file with the given name
+      File script = SD.open(target_file_name, FILE_WRITE);
+
+      if (script) {
+        menu_function_obj.loaded_file = target_file_name;
+
+        Serial.println("Writing content: ");
+        Serial.println(content);
+
+        script.print(content);
+
+        script.close();
+      }
+
+      lv_obj_del_async(save_as_kb);
+      lv_obj_del_async(save_name);
+
+      // Create Save button
+      lv_obj_t * save_label;
+      lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL);
+      lv_obj_set_event_cb(save_btn, load_btn_cb);
+      lv_obj_set_height(save_btn, 35);
+      lv_obj_set_width(save_btn, LV_HOR_RES / 3);
+      lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area
+      save_label = lv_label_create(save_btn, NULL);
+      lv_label_set_text(save_label, "Save");
+  }
+}
+
+
+void test_btn_cb(lv_obj_t * btn, lv_event_t event) {
+  extern MenuFunctions menu_function_obj;
+  
+  if (event == LV_EVENT_CLICKED) {
+    String btn_text = lv_list_get_btn_text(btn);
+    String display_string = "";
+    //printf("Clicked: %s\n", btn_text);
+    Serial.print("Clicked: ");
+    Serial.println(btn_text);
+
+    // Get file content and send to text area
+    if (btn_text != "Cancel") {
+      File script = SD.open(btn_text);
+
+      if (script) {
+        while (script.available()) {
+          display_string.concat((char)script.read());
+        }
+        script.close();
+
+        Serial.println(display_string);
+
+        char buf[display_string.length() + 1] = {};
+        display_string.toCharArray(buf, display_string.length() + 1);
+        
+        lv_textarea_set_text(ta1, buf);
+
+        // Create Save button
+        lv_obj_t * save_label;
+        lv_obj_t * save_btn = lv_btn_create(lv_scr_act(), NULL);
+        lv_obj_set_event_cb(save_btn, load_btn_cb);
+        lv_obj_set_height(save_btn, 35);
+        lv_obj_set_width(save_btn, LV_HOR_RES / 3);
+        lv_obj_align(save_btn, ta1, LV_ALIGN_IN_TOP_LEFT, NULL, (LV_VER_RES / 2) - 35); // align to text area
+        save_label = lv_label_create(save_btn, NULL);
+        lv_label_set_text(save_label, "Save");
+      }
+    }
+
+    // Delete the file list obj
+    lv_obj_del_async(lv_obj_get_parent(lv_obj_get_parent(btn)));
+    menu_function_obj.loaded_file = btn_text;
+  }
+}
+
+void load_btn_cb(lv_obj_t * load_btn, lv_event_t event) {
+  extern SDInterface sd_obj;
+  extern MenuFunctions menu_function_obj;
+
+  String btn_text = lv_list_get_btn_text(load_btn);
+
+  if (btn_text == "Load") {
+    if (event == LV_EVENT_CLICKED)
+      Serial.println("Load button pressed");
+    else if (event == LV_EVENT_RELEASED) {
+      Serial.println("Load button released");
+      /*Create a list*/
+      lv_obj_t * list1 = lv_list_create(lv_scr_act(), NULL);
+      lv_obj_set_size(list1, 160, 200);
+      lv_obj_set_width(list1, LV_HOR_RES);
+      lv_obj_align(list1, NULL, LV_ALIGN_CENTER, 0, 0);
+      //lv_list_set_anim_time(list1, 0);
+  
+      // Load file names into buttons
+      File scripts = SD.open("/SCRIPTS");
+  
+      // Build list of files from the SD card
+      lv_obj_t * list_btn;
+
+      list_btn = lv_list_add_btn(list1, LV_SYMBOL_CLOSE, "Cancel");
+      lv_obj_set_event_cb(list_btn, test_btn_cb);
+  
+      while (true) {
+        File entity = scripts.openNextFile();
+  
+        if (!entity)
+          break;
+  
+        if (!entity.isDirectory()) {
+          String file_name = entity.name();
+  
+          // Fancy button text time
+          char buf[file_name.length() + 1] = {};
+          file_name.toCharArray(buf, file_name.length() + 1);
+          
+          list_btn = lv_list_add_btn(list1, LV_SYMBOL_FILE, buf);
+          lv_obj_set_event_cb(list_btn, test_btn_cb);
+        }
+  
+        entity.close();
+      }
+  
+      scripts.close();
+    }
+  }
+
+  // Save current text bod content to new file
+  else if (btn_text == "Save As") {
+    if (event == LV_EVENT_CLICKED)
+      Serial.println("Save button pressed");
+    else if (event == LV_EVENT_RELEASED) {
+      Serial.println("Save button released");
+
+      save_name = lv_textarea_create(lv_scr_act(), ta2);
+      lv_textarea_set_cursor_hidden(save_name, false);
+      lv_textarea_set_one_line(save_name, true);
+      lv_obj_align(save_name, NULL, LV_ALIGN_IN_TOP_MID, NULL, (LV_VER_RES / 2) - 35);
+      lv_textarea_set_text(save_name, "");
+      lv_textarea_set_placeholder_text(save_name, "File Name");
+
+      // Create a keyboard and apply the styles
+      save_as_kb = lv_keyboard_create(lv_scr_act(), NULL);
+      lv_obj_set_size(save_as_kb, LV_HOR_RES, LV_VER_RES / 2);
+      lv_obj_set_event_cb(save_as_kb, save_as_keyboard_event_cb);
+
+      lv_keyboard_set_textarea(save_as_kb, save_name);
+      lv_keyboard_set_cursor_manage(save_as_kb, true);
+    }
+  }
+
+  // Save current text box content to current loaded file
+  else if (btn_text == "Save") {
+    if (event == LV_EVENT_CLICKED)
+      Serial.println("Save button pressed");
+    else if (event == LV_EVENT_RELEASED) {
+      Serial.println("Save button released");
+
+      Serial.println("Writing to file: " + (String)menu_function_obj.loaded_file);
+
+      File script = SD.open(menu_function_obj.loaded_file, FILE_WRITE);
+
+      // Write data to file
+      if (script) {
+        String content = lv_textarea_get_text(ta1);
+
+        Serial.println("Writing content:");
+        Serial.println(content);
+        Serial.println("to file: " + (String)menu_function_obj.loaded_file);
+        script.print(lv_textarea_get_text(ta1));
+        script.close();
+      }
+    }
+  }
+}
+
+void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event) {
+  extern Display display_obj;
+  extern MenuFunctions menu_function_obj;
+  extern A32u4Interface a32u4_obj;
+  extern WiFiScan wifi_scan_obj;
+  
+  lv_keyboard_def_event_cb(kb, event);
+  if(event == LV_EVENT_APPLY){
+      String display_string = "";
+      printf("LV_EVENT_APPLY\n");
+
+    String ta1_text = lv_textarea_get_text(ta1);
+  
+    Serial.println(ta1_text);
+  
+    a32u4_obj.runScript(ta1_text);
+  }
+  else if(event == LV_EVENT_CANCEL) {
+    printf("LV_EVENT_CANCEL\n");
+    menu_function_obj.deinitLVGL();
+    wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+    display_obj.exit_draw = true; // set everything back to normal
+  }
+}
+
+// Keyboard callback dedicated to joining wifi
+void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){
+  extern Display display_obj;
+  extern MenuFunctions menu_function_obj;
+  extern WiFiScan wifi_scan_obj;
+  extern LinkedList<ssid>* ssids;
+  
+  lv_keyboard_def_event_cb(kb, event);
+
+  // User has applied text box
+  if(event == LV_EVENT_APPLY){
+    String display_string = "";
+    printf("LV_EVENT_APPLY\n");
+
+    // Get text from SSID text box
+    String ta2_text = lv_textarea_get_text(ta2);
+    //Serial.println(ta1_text);
+    Serial.println(ta2_text);
+
+    // Add text box text to list of SSIDs
+    wifi_scan_obj.addSSID(ta2_text);
+
+    // Update large text box with ssid
+    for (int i = 0; i < ssids->size(); i++)
+      display_string.concat((String)ssids->get(i).essid + "\n");
+    lv_textarea_set_text(ta1, display_string.c_str());
+
+    lv_textarea_set_text(ta2, "");
+  }else if(event == LV_EVENT_CANCEL){
+    printf("LV_EVENT_CANCEL\n");
+    //lv_textarea_set_text(lv_keyboard_get_textarea(kb), "");
+    menu_function_obj.deinitLVGL();
+    //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+    display_obj.exit_draw = true; // set everything back to normal
+  }
+}
+
+// Keyboard callback dedicated to joining wifi
+void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event){
+  extern Display display_obj;
+  extern MenuFunctions menu_function_obj;
+  extern WiFiScan wifi_scan_obj;
+  lv_keyboard_def_event_cb(kb, event);
+  if(event == LV_EVENT_APPLY){
+    printf("LV_EVENT_APPLY\n");
+    //String ta1_text = lv_textarea_get_text(lv_keyboard_get_textarea(kb));
+    String ta1_text = lv_textarea_get_text(ta1);
+    String ta2_text = lv_textarea_get_text(ta2);
+    Serial.println(ta1_text);
+    Serial.println(ta2_text);
+    wifi_scan_obj.joinWiFi(ta1_text, ta2_text);
+  }else if(event == LV_EVENT_CANCEL){
+    printf("LV_EVENT_CANCEL\n");
+    //lv_textarea_set_text(lv_keyboard_get_textarea(kb), "");
+    menu_function_obj.deinitLVGL();
+    //wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+    display_obj.exit_draw = true; // set everything back to normal
+  }
+}
+
+
+void ta_event_cb(lv_obj_t * ta, lv_event_t event)
+{
+  if(event == LV_EVENT_CLICKED) {
+    if(kb != NULL)
+      lv_keyboard_set_textarea(kb, ta);
+  }
+
+  //else if(event == LV_EVENT_INSERT) {
+  //  const char * str = lv_event_get_data();
+  //  if(str[0] == '\n') {
+  //    printf("Ready\n");
+  //  }
+  //}
+}
+
+// Function to check menu input
+void MenuFunctions::main(uint32_t currentTime)
+{
+  // Some function exited and we need to go back to normal
+  if (display_obj.exit_draw) {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+    display_obj.exit_draw = false;
+    this->orientDisplay();
+    //changeMenu(current_menu);
+  }
+  if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF) ||
+      (wifi_scan_obj.currentScanMode == OTA_UPDATE) ||
+      (wifi_scan_obj.currentScanMode == ESP_UPDATE) ||
+      (wifi_scan_obj.currentScanMode == SHOW_INFO)) {
+    if (wifi_scan_obj.orient_display) {
+      this->orientDisplay();
+      wifi_scan_obj.orient_display = false;
+    }
+    //if ((display_obj.current_banner_pos <= 0) || (display_obj.current_banner_pos == SCREEN_WIDTH))
+    //{
+    //  this->drawStatusBar();
+    //}
+    if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) &&
+        (wifi_scan_obj.currentScanMode != LV_ADD_SSID))
+      display_obj.updateBanner(current_menu->name);
+  }
+
+  if (currentTime != 0) {
+    if (currentTime - initTime >= 100) {
+      this->initTime = millis();
+      if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) &&
+          (wifi_scan_obj.currentScanMode != LV_ADD_SSID))
+        this->updateStatusBar();
+    }
+  }
+
+  //this->displayCurrentMenu();
+
+  boolean pressed = false;
+  // This is code from bodmer's keypad example
+  uint16_t t_x = 0, t_y = 0; // To store the touch coordinates
+
+  // Get the display buffer out of the way
+  if ((wifi_scan_obj.currentScanMode != WIFI_SCAN_OFF ) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_SPAM) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
+      //(wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_LIST))
+    display_obj.displayBuffer();
+  //Serial.println(wifi_scan_obj.freeRAM());
+
+
+  // Pressed will be set true is there is a valid touch on the screen
+  int pre_getTouch = millis();
+
+  // getTouch causes a 10ms delay which makes beacon spam less effective
+  //if (wifi_scan_obj.currentScanMode == WIFI_SCAN_OFF)
+  pressed = display_obj.tft.getTouch(&t_x, &t_y);
+
+  //if (pressed)
+  //  Serial.println("Pressed, son");
+  //boolean pressed = false;
+
+  //Serial.print("getTouch: ");
+  //Serial.print(millis() - pre_getTouch);
+  //Serial.println("ms");
+
+
+  // This is if there are scans/attacks going on
+  if ((wifi_scan_obj.currentScanMode != WIFI_SCAN_OFF) &&
+      (pressed) &&
+      (wifi_scan_obj.currentScanMode != OTA_UPDATE) &&
+      (wifi_scan_obj.currentScanMode != ESP_UPDATE) &&
+      (wifi_scan_obj.currentScanMode != SHOW_INFO))
+  {
+    // Stop the current scan
+    if ((wifi_scan_obj.currentScanMode == WIFI_SCAN_PROBE) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_AP) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_TARGET_AP) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_PWN) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_ESPRESSIF) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_ALL) ||
+        (wifi_scan_obj.currentScanMode == WIFI_SCAN_DEAUTH) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_SPAM) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_AUTH) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_DEAUTH) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_MIMIC) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_RICK_ROLL) ||
+        (wifi_scan_obj.currentScanMode == WIFI_ATTACK_BEACON_LIST) ||
+        (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
+        (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS))
+    {
+      Serial.println("Stopping scan...");
+      wifi_scan_obj.StartScan(WIFI_SCAN_OFF);
+
+      // If we don't do this, the text and button coordinates will be off
+      display_obj.tft.init();
+
+      // Take us back to the menu
+      changeMenu(current_menu);
+    }
+
+    x = -1;
+    y = -1;
+
+    return;
+  }
+
+  // Check if any key coordinate boxes contain the touch coordinates
+  // This is for when on a menu
+  if ((wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_SPAM) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_AUTH) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_DEAUTH) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_MIMIC) &&
+      (wifi_scan_obj.currentScanMode != WIFI_ATTACK_RICK_ROLL))
+      //(wifi_scan_obj.currentScanMode != WIFI_ATTACK_BEACON_LIST))
+  {
+    // Need this to set all keys to false
+    for (uint8_t b = 0; b < BUTTON_ARRAY_LEN; b++) {
+      if (pressed && display_obj.key[b].contains(t_x, t_y)) {
+        display_obj.key[b].press(true);  // tell the button it is pressed
+      } else {
+        display_obj.key[b].press(false);  // tell the button it is NOT pressed
+      }
+    }
+
+    // Check if any key has changed state
+    for (uint8_t b = 0; b < current_menu->list->size(); b++) {
+      display_obj.tft.setFreeFont(MENU_FONT);
+      if (display_obj.key[b].justPressed()) {
+        //display_obj.key[b].drawButton2(current_menu->list->get(b).name, true);  // draw invert
+        //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name, true);
+        display_obj.key[b].drawButton(true, current_menu->list->get(b).name);
+        if (current_menu->list->get(b).name != "Back")
+          display_obj.tft.drawXBitmap(0,
+                                      KEY_Y + b * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
+                                      menu_icons[current_menu->list->get(b).icon],
+                                      ICON_W,
+                                      ICON_H,
+                                      current_menu->list->get(b).color,
+                                      TFT_BLACK);
+      }
+      //else if (pressed)
+      //  display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
+
+      // If button was just release, execute the button's function
+      if ((display_obj.key[b].justReleased()) && (!pressed))
+      {
+        //display_obj.key[b].drawButton2(current_menu->list->get(b).name);     // draw normal
+        //display_obj.key[b].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(b).name);
+        display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
+        current_menu->list->get(b).callable();
+      }
+      // This
+      else if ((display_obj.key[b].justReleased()) && (pressed)) {
+        display_obj.key[b].drawButton(false, current_menu->list->get(b).name);
+        if (current_menu->list->get(b).name != "Back")
+          display_obj.tft.drawXBitmap(0,
+                                      KEY_Y + b * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
+                                      menu_icons[current_menu->list->get(b).icon],
+                                      ICON_W,
+                                      ICON_H,
+                                      TFT_BLACK,
+                                      current_menu->list->get(b).color);
+      }
+
+      display_obj.tft.setFreeFont(NULL);
+    }
+  }
+  x = -1;
+  y = -1;
+}
+
+#if BATTERY_ANALOG_ON == 1
+byte battery_analog_array[10];
+byte battery_count = 0;
+byte battery_analog_last = 101;
+#define BATTERY_CHECK 50
+uint16_t battery_analog = 0;
+void MenuFunctions::battery(bool initial)
+{
+  if (BATTERY_ANALOG_ON) {
+    uint8_t n = 0;
+    byte battery_analog_sample[10];
+    byte deviation;
+    if (battery_count == BATTERY_CHECK - 5)  digitalWrite(BATTERY_PIN, HIGH);
+    else if (battery_count == 5) digitalWrite(BATTERY_PIN, LOW);
+    if (battery_count == 0) {
+      battery_analog = 0;
+      for (n = 9; n > 0; n--)battery_analog_array[n] = battery_analog_array[n - 1];
+      for (n = 0; n < 10; n++) {
+        battery_analog_sample[n] = map((analogRead(ANALOG_PIN) * 5), 2400, 4200, 0, 100);
+        if (battery_analog_sample[n] > 100) battery_analog_sample[n] = 100;
+        else if (battery_analog_sample[n] < 0) battery_analog_sample[n] = 0;
+        battery_analog += battery_analog_sample[n];
+      }
+      battery_analog = battery_analog / 10;
+      for (n = 0; n < 10; n++) {
+        deviation = abs(battery_analog - battery_analog_sample[n]);
+        if (deviation >= 10) battery_analog_sample[n] = battery_analog;
+      }
+      battery_analog = 0;
+      for (n = 0; n < 10; n++) battery_analog += battery_analog_sample[n];
+      battery_analog = battery_analog / 10;
+      battery_analog_array[0] = battery_analog;
+      if (battery_analog_array[9] > 0 ) {
+        battery_analog = 0;
+        for (n = 0; n < 10; n++) battery_analog += battery_analog_array[n];
+        battery_analog = battery_analog / 10;
+      }
+      battery_count ++;
+    }
+    else if (battery_count < BATTERY_CHECK) battery_count++;
+    else if (battery_count >= BATTERY_CHECK) battery_count = 0;
+
+    if (battery_analog_last != battery_analog) {
+      battery_analog_last = battery_analog;
+      MenuFunctions::battery2();
+    }
+  }
+}
+void MenuFunctions::battery2(bool initial)
+{
+  uint16_t the_color;
+  if ( digitalRead(CHARGING_PIN) == 1) the_color = TFT_BLUE;
+  else if (battery_analog < 20) the_color = TFT_RED;
+  else if (battery_analog < 40)  the_color = TFT_YELLOW;
+  else the_color = TFT_GREEN;
+
+  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
+  display_obj.tft.fillRect(186, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+  display_obj.tft.drawXBitmap(186,
+                              0,
+                              menu_icons[STATUS_BAT],
+                              16,
+                              16,
+                              STATUSBAR_COLOR,
+                              the_color);
+  display_obj.tft.drawString((String) battery_analog + "%", 204, 0, 2);
+}
+#else
+void MenuFunctions::battery(bool initial)
+{
+  uint16_t the_color;
+  if (battery_obj.i2c_supported)
+  {
+    // Could use int compare maybe idk
+    if (((String)battery_obj.battery_level != "25") && ((String)battery_obj.battery_level != "0"))
+      the_color = TFT_GREEN;
+    else
+      the_color = TFT_RED;
+
+    if ((battery_obj.battery_level != battery_obj.old_level) || (initial)) {
+      battery_obj.old_level = battery_obj.battery_level;
+      display_obj.tft.fillRect(204, 0, SCREEN_WIDTH, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+      display_obj.tft.setCursor(0, 1);
+      display_obj.tft.drawXBitmap(186,
+                                  0,
+                                  menu_icons[STATUS_BAT],
+                                  16,
+                                  16,
+                                  STATUSBAR_COLOR,
+                                  the_color);
+      display_obj.tft.drawString((String)battery_obj.battery_level + "%", 204, 0, 2);
+    }
+  }
+}
+void MenuFunctions::battery2(bool initial)
+{
+  MenuFunctions::battery(initial);
+}
+#endif
+
+void MenuFunctions::updateStatusBar()
+{
+  display_obj.tft.setTextSize(1);
+  uint16_t the_color; 
+
+  // Draw temp info
+  if (temp_obj.current_temp < 70)
+    the_color = TFT_GREEN;
+  else if ((temp_obj.current_temp >= 70) && (temp_obj.current_temp < 80))
+    the_color = TFT_YELLOW;
+  else if ((temp_obj.current_temp >= 80) && (temp_obj.current_temp < 90))
+    the_color = TFT_ORANGE;
+  else if ((temp_obj.current_temp >= 90) && (temp_obj.current_temp < 100))
+    the_color = TFT_RED;
+  else
+    the_color = TFT_MAROON;
+
+  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
+  if (temp_obj.current_temp != temp_obj.old_temp) {
+    temp_obj.old_temp = temp_obj.current_temp;
+    display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+    display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2);
+  }
+  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
+
+  // WiFi Channel Stuff
+  if (wifi_scan_obj.set_channel != wifi_scan_obj.old_channel) {
+    wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
+    display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+    display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
+  }
+
+  // RAM Stuff
+  wifi_scan_obj.freeRAM();
+  if (wifi_scan_obj.free_ram != wifi_scan_obj.old_free_ram) {
+    wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
+    display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+    display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
+  }
+
+  // Draw battery info
+  MenuFunctions::battery(false);
+
+  // Draw SD info
+  if (sd_obj.supported)
+    the_color = TFT_GREEN;
+  else
+    the_color = TFT_RED;
+
+  display_obj.tft.drawXBitmap(170,
+                              0,
+                              menu_icons[STATUS_SD],
+                              16,
+                              16,
+                              STATUSBAR_COLOR,
+                              the_color);
+  //display_obj.tft.print((String)battery_obj.battery_level + "%");
+}
+
+void MenuFunctions::drawStatusBar()
+{
+  display_obj.tft.setTextSize(1);
+  display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+  //display_obj.tft.fillRect(0, STATUS_BAR_WIDTH + 1, 240, 1, TFT_DARKGREY);
+  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
+  //display_obj.tft.setTextSize(2);
+
+  uint16_t the_color;
+
+  // Draw temp info
+  if (temp_obj.current_temp < 70)
+    the_color = TFT_GREEN;
+  else if ((temp_obj.current_temp >= 70) && (temp_obj.current_temp < 80))
+    the_color = TFT_YELLOW;
+  else if ((temp_obj.current_temp >= 80) && (temp_obj.current_temp < 90))
+    the_color = TFT_ORANGE;
+  else if ((temp_obj.current_temp >= 90) && (temp_obj.current_temp < 100))
+    the_color = TFT_RED;
+  else
+    the_color = TFT_MAROON;
+
+  display_obj.tft.setTextColor(the_color, STATUSBAR_COLOR);
+  temp_obj.old_temp = temp_obj.current_temp;
+  display_obj.tft.fillRect(0, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+  display_obj.tft.drawString((String)temp_obj.current_temp + " C", 4, 0, 2);
+  display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
+
+
+  // WiFi Channel Stuff
+  wifi_scan_obj.old_channel = wifi_scan_obj.set_channel;
+  display_obj.tft.fillRect(50, 0, 50, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+  display_obj.tft.drawString("CH: " + (String)wifi_scan_obj.set_channel, 50, 0, 2);
+
+  // RAM Stuff
+  wifi_scan_obj.freeRAM();
+  wifi_scan_obj.old_free_ram = wifi_scan_obj.free_ram;
+  display_obj.tft.fillRect(100, 0, 60, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
+  display_obj.tft.drawString((String)wifi_scan_obj.free_ram + "B", 100, 0, 2);
+
+
+  MenuFunctions::battery2(true);
+
+  // Draw SD info
+  if (sd_obj.supported)
+    the_color = TFT_GREEN;
+  else
+    the_color = TFT_RED;
+
+  display_obj.tft.drawXBitmap(170,
+                              0,
+                              menu_icons[STATUS_SD],
+                              16,
+                              16,
+                              STATUSBAR_COLOR,
+                              the_color);
+  //display_obj.tft.print((String)battery_obj.battery_level + "%");
+}
+
+void MenuFunctions::orientDisplay()
+{
+  Serial.println(F("orientDisplay()"));
+  display_obj.tft.init();
+
+  display_obj.tft.setRotation(0); // Portrait
+
+  display_obj.tft.setCursor(0, 0);
+
+  //uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait
+  //uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
+
+#ifdef TFT_SHIELD
+  uint16_t calData[5] = { 275, 3494, 361, 3528, 4 }; // tft.setRotation(0); // Portrait with TFT Shield
+  Serial.println("Using TFT Shield");
+#else if defined(TFT_DIY)
+  uint16_t calData[5] = { 339, 3470, 237, 3438, 2 }; // tft.setRotation(0); // Portrait with DIY TFT
+  Serial.println("Using TFT DIY");
+#endif
+
+  display_obj.tft.setTouch(calData);
+
+  //display_obj.clearScreen();
+
+  changeMenu(current_menu);
+}
+
+void MenuFunctions::runBoolSetting(String key) {
+  Serial.println("Building bool setting screen...");
+  display_obj.tftDrawRedOnOffButton();
+  //display_obj.tftDrawGreenOnOffButton();
+}
+
+String MenuFunctions::callSetting(String key) {
+  specSettingMenu.name = key;
+  
+  String setting_type = settings_obj.getSettingType(key);
+
+  if (setting_type == "bool") {
+    return "bool";
+  }
+}
+
+void MenuFunctions::displaySetting(String key) {
+  specSettingMenu.name = key;
+
+  bool setting_value = settings_obj.loadSetting<bool>(key);
+
+  display_obj.tft.setTextWrap(false);
+  display_obj.tft.setFreeFont(NULL);
+  display_obj.tft.setCursor(0, 100);
+  display_obj.tft.setTextSize(1);
+    
+  if (!setting_value) {
+    display_obj.tft.setTextColor(TFT_RED);
+    display_obj.tft.println(F("Setting disabled"));
+  }
+  else {
+    display_obj.tft.setTextColor(TFT_GREEN);
+    display_obj.tft.println(F("Setting on"));
+  }
+    
+}
+
+
+// Function to build the menus
+void MenuFunctions::RunSetup()
+{
+  this->initLVGL();
+  
+  // root menu stuff
+  mainMenu.list = new LinkedList<MenuNode>(); // Get list in first menu ready
+
+  // Main menu stuff
+  wifiMenu.list = new LinkedList<MenuNode>(); // Get list in second menu ready
+  bluetoothMenu.list = new LinkedList<MenuNode>(); // Get list in third menu ready
+  badusbMenu.list = new LinkedList<MenuNode>();
+  generalMenu.list = new LinkedList<MenuNode>();
+  deviceMenu.list = new LinkedList<MenuNode>();
+
+  // Device menu stuff
+  failedUpdateMenu.list = new LinkedList<MenuNode>();
+  whichUpdateMenu.list = new LinkedList<MenuNode>();
+  confirmMenu.list = new LinkedList<MenuNode>();
+  espUpdateMenu.list = new LinkedList<MenuNode>();
+  updateMenu.list = new LinkedList<MenuNode>();
+  settingsMenu.list = new LinkedList<MenuNode>();
+  specSettingMenu.list = new LinkedList<MenuNode>();
+  infoMenu.list = new LinkedList<MenuNode>();
+
+  // WiFi menu stuff
+  wifiSnifferMenu.list = new LinkedList<MenuNode>();
+  wifiAttackMenu.list = new LinkedList<MenuNode>();
+  wifiGeneralMenu.list = new LinkedList<MenuNode>();
+
+  // Bluetooth menu stuff
+  bluetoothSnifferMenu.list = new LinkedList<MenuNode>();
+  bluetoothGeneralMenu.list = new LinkedList<MenuNode>();
+
+  // Settings stuff
+  shutdownWiFiMenu.list = new LinkedList<MenuNode>();
+  shutdownBLEMenu.list = new LinkedList<MenuNode>();
+  generateSSIDsMenu.list = new LinkedList<MenuNode>();
+  clearSSIDsMenu.list = new LinkedList<MenuNode>();
+  clearAPsMenu.list = new LinkedList<MenuNode>();
+
+  // Work menu names
+  mainMenu.name = " ESP32 Marauder ";
+  wifiMenu.name = " WiFi ";
+  badusbMenu.name = " Bad USB ";
+  deviceMenu.name = " Device ";
+  generalMenu.name = " General Apps ";
+  failedUpdateMenu.name = " Updating... ";
+  whichUpdateMenu.name = "Select Method ";
+  confirmMenu.name = " Confirm Update ";
+  espUpdateMenu.name = " ESP8266 Update ";
+  updateMenu.name = " Update Firmware ";
+  infoMenu.name = " Device Info ";
+  settingsMenu.name = " Settings ";
+  bluetoothMenu.name = " Bluetooth ";
+  wifiSnifferMenu.name = " WiFi Sniffers ";
+  wifiAttackMenu.name = " WiFi Attacks ";
+  wifiGeneralMenu.name = " WiFi General ";
+  bluetoothSnifferMenu.name = " Bluetooth Sniffers ";
+  bluetoothGeneralMenu.name = " Bluetooth General ";
+  shutdownWiFiMenu.name = " Shutdown WiFi ";
+  shutdownBLEMenu.name = " Shutdown BLE ";
+  generateSSIDsMenu.name = " Generate SSIDs ";
+  clearSSIDsMenu.name = " Clear SSIDs ";
+  clearAPsMenu.name = " Clear APs ";
+  
+
+  // Build Main Menu
+  mainMenu.parentMenu = NULL;
+  addNodes(&mainMenu, "WiFi", TFT_GREEN, NULL, WIFI, [this]() {
+    changeMenu(&wifiMenu);
+  });
+  addNodes(&mainMenu, "Bluetooth", TFT_CYAN, NULL, BLUETOOTH, [this]() {
+    changeMenu(&bluetoothMenu);
+  });
+  if (a32u4_obj.supported) addNodes(&mainMenu, "Bad USB", TFT_RED, NULL, BAD_USB_ICO, [this]() {
+    changeMenu(&badusbMenu);
+  });
+  addNodes(&mainMenu, "General Apps", TFT_MAGENTA, NULL, GENERAL_APPS, [this]() {
+    changeMenu(&generalMenu);
+  });
+  addNodes(&mainMenu, "Device", TFT_BLUE, NULL, DEVICE, [this]() {
+    changeMenu(&deviceMenu);
+  });
+  addNodes(&mainMenu, "Reboot", TFT_LIGHTGREY, NULL, REBOOT, []() {
+    ESP.restart();
+  });
+
+  // Build WiFi Menu
+  wifiMenu.parentMenu = &mainMenu; // Main Menu is second menu parent
+  addNodes(&wifiMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(wifiMenu.parentMenu);
+  });
+  addNodes(&wifiMenu, "Sniffers", TFT_YELLOW, NULL, SNIFFERS, [this]() {
+    changeMenu(&wifiSnifferMenu);
+  });
+  //addNodes(&wifiMenu, "Scanners", TFT_ORANGE, NULL, SCANNERS, [this]() {
+  //  changeMenu(&wifiScannerMenu);
+  //});
+  addNodes(&wifiMenu, "Attacks", TFT_RED, NULL, ATTACKS, [this]() {
+    changeMenu(&wifiAttackMenu);
+  });
+  addNodes(&wifiMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
+    changeMenu(&wifiGeneralMenu);
+  });
+
+  // Build WiFi sniffer Menu
+  wifiSnifferMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
+  addNodes(&wifiSnifferMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(wifiSnifferMenu.parentMenu);
+  });
+  addNodes(&wifiSnifferMenu, "Probe Request Sniff", TFT_CYAN, NULL, PROBE_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_PROBE, TFT_CYAN);
+  });
+  addNodes(&wifiSnifferMenu, "Beacon Sniff", TFT_MAGENTA, NULL, BEACON_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_AP, TFT_MAGENTA);
+  });
+  addNodes(&wifiSnifferMenu, "Deauth Sniff", TFT_RED, NULL, DEAUTH_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_DEAUTH, TFT_RED);
+  });
+  addNodes(&wifiSnifferMenu, "Packet Monitor", TFT_BLUE, NULL, PACKET_MONITOR, [this]() {
+    wifi_scan_obj.StartScan(WIFI_PACKET_MONITOR, TFT_BLUE);
+  });
+  addNodes(&wifiSnifferMenu, "EAPOL/PMKID Scan", TFT_VIOLET, NULL, EAPOL, [this]() {
+    wifi_scan_obj.StartScan(WIFI_SCAN_EAPOL, TFT_VIOLET);
+  });
+  addNodes(&wifiSnifferMenu, "Detect Pwnagotchi", TFT_RED, NULL, PWNAGOTCHI, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_PWN, TFT_RED);
+  });
+  addNodes(&wifiSnifferMenu, "Detect Espressif", TFT_ORANGE, NULL, ESPRESSIF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_ESPRESSIF, TFT_ORANGE);
+  });
+  addNodes(&wifiSnifferMenu, "Scan APs", TFT_MAGENTA, NULL, BEACON_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_SCAN_TARGET_AP, TFT_MAGENTA);
+  });
+
+  // Build WiFi attack menu
+  wifiAttackMenu.parentMenu = &wifiMenu; // Main Menu is second menu parent
+  addNodes(&wifiAttackMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(wifiAttackMenu.parentMenu);
+  });
+  addNodes(&wifiAttackMenu, "Beacon Spam List", TFT_RED, NULL, BEACON_LIST, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_LIST, TFT_RED);
+  });
+  addNodes(&wifiAttackMenu, "Beacon Spam Random", TFT_ORANGE, NULL, BEACON_SPAM, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_BEACON_SPAM, TFT_ORANGE);
+  });
+  addNodes(&wifiAttackMenu, "Rick Roll Beacon", TFT_YELLOW, NULL, RICK_ROLL, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_RICK_ROLL, TFT_YELLOW);
+  });
+  addNodes(&wifiAttackMenu, "Probe Req Flood", TFT_RED, NULL, PROBE_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_AUTH, TFT_RED);
+  });
+  addNodes(&wifiAttackMenu, "Deauth Flood", TFT_RED, NULL, DEAUTH_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(WIFI_ATTACK_DEAUTH, TFT_RED);
+  });
+  //addNodes(&wifiAttackMenu, "AP Mimic Flood", TFT_PURPLE, NULL, DEAUTH_SNIFF, [this]() {
+  //  display_obj.clearScreen();
+  //  this->drawStatusBar();
+  //  wifi_scan_obj.StartScan(WIFI_ATTACK_MIMIC, TFT_PURPLE);
+  //});
+
+  // Build WiFi General menu
+  wifiGeneralMenu.parentMenu = &wifiMenu;
+  addNodes(&wifiGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(wifiGeneralMenu.parentMenu);
+  });
+  addNodes(&wifiGeneralMenu, "Join WiFi", TFT_DARKCYAN, NULL, JOIN_WIFI, [this](){
+    display_obj.clearScreen(); 
+    wifi_scan_obj.currentScanMode = LV_JOIN_WIFI; 
+    wifi_scan_obj.StartScan(LV_JOIN_WIFI, TFT_YELLOW); 
+    joinWiFiGFX();
+  });
+  addNodes(&wifiGeneralMenu, "Shutdown WiFi", TFT_CYAN, NULL, SHUTDOWN, [this]() {
+    changeMenu(&shutdownWiFiMenu);
+    wifi_scan_obj.RunShutdownWiFi();
+  });
+  addNodes(&wifiGeneralMenu, "Generate SSIDs", TFT_SKYBLUE, NULL, GENERATE, [this]() {
+    changeMenu(&generateSSIDsMenu);
+    wifi_scan_obj.RunGenerateSSIDs();
+  });
+  addNodes(&wifiGeneralMenu, "Add SSID", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
+    display_obj.clearScreen(); 
+    //wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
+    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_YELLOW); 
+    addSSIDGFX();
+  });
+  addNodes(&wifiGeneralMenu, "Clear SSIDs", TFT_SILVER, NULL, CLEAR_ICO, [this]() {
+    changeMenu(&clearSSIDsMenu);
+    wifi_scan_obj.RunClearSSIDs();
+  });
+  addNodes(&wifiGeneralMenu, "Clear APs", TFT_DARKGREY, NULL, CLEAR_ICO, [this]() {
+    changeMenu(&clearAPsMenu);
+    wifi_scan_obj.RunClearAPs();
+  });
+  addNodes(&wifiGeneralMenu, "Select APs", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
+    display_obj.clearScreen(); 
+    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
+    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
+    addAPGFX();
+  });
+
+  // Build shutdown wifi menu
+  shutdownWiFiMenu.parentMenu = &wifiGeneralMenu;
+  addNodes(&shutdownWiFiMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(shutdownWiFiMenu.parentMenu);
+  });
+
+  // Build generate ssids menu
+  generateSSIDsMenu.parentMenu = &wifiGeneralMenu;
+  addNodes(&generateSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(generateSSIDsMenu.parentMenu);
+  });
+
+  // Build clear ssids menu
+  clearSSIDsMenu.parentMenu = &wifiGeneralMenu;
+  addNodes(&clearSSIDsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(clearSSIDsMenu.parentMenu);
+  });
+  clearAPsMenu.parentMenu = &wifiGeneralMenu;
+  addNodes(&clearAPsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(clearAPsMenu.parentMenu);
+  });
+
+
+  // Build Bluetooth Menu
+  bluetoothMenu.parentMenu = &mainMenu; // Second Menu is third menu parent
+  addNodes(&bluetoothMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(bluetoothMenu.parentMenu);
+  });
+  addNodes(&bluetoothMenu, "Sniffers", TFT_YELLOW, NULL, SNIFFERS, [this]() {
+    changeMenu(&bluetoothSnifferMenu);
+  });
+  //addNodes(&bluetoothMenu, "Scanners", TFT_ORANGE, NULL, SCANNERS, [this]() {
+  //  changeMenu(&bluetoothScannerMenu);
+  //});
+  addNodes(&bluetoothMenu, "General", TFT_PURPLE, NULL, GENERAL_APPS, [this]() {
+    changeMenu(&bluetoothGeneralMenu);
+  });
+
+  // Build bluetooth sniffer Menu
+  bluetoothSnifferMenu.parentMenu = &bluetoothMenu; // Second Menu is third menu parent
+  addNodes(&bluetoothSnifferMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(bluetoothSnifferMenu.parentMenu);
+  });
+  addNodes(&bluetoothSnifferMenu, "Bluetooth Sniffer", TFT_GREEN, NULL, BLUETOOTH_SNIFF, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(BT_SCAN_ALL, TFT_GREEN);
+  });
+  addNodes(&bluetoothSnifferMenu, "Detect Card Skimmers", TFT_MAGENTA, NULL, CC_SKIMMERS, [this]() {
+    display_obj.clearScreen();
+    this->drawStatusBar();
+    wifi_scan_obj.StartScan(BT_SCAN_SKIMMERS, TFT_MAGENTA);
+  });
+
+  // Build bluetooth scanner Menu
+  //bluetoothScannerMenu.parentMenu = &bluetoothMenu; // Second Menu is third menu parent
+  //addNodes(&bluetoothScannerMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+  //  changeMenu(bluetoothScannerMenu.parentMenu);
+  //});
+
+  // Build bluetooth general menu
+  bluetoothGeneralMenu.parentMenu = &bluetoothMenu;
+  addNodes(&bluetoothGeneralMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(bluetoothGeneralMenu.parentMenu);
+  });
+  addNodes(&bluetoothGeneralMenu, "Shutdown BLE", TFT_ORANGE, NULL, SHUTDOWN, [this]() {
+    changeMenu(&shutdownBLEMenu);
+    wifi_scan_obj.RunShutdownBLE();
+  });
+
+  // Build shutdown BLE menu
+  shutdownBLEMenu.parentMenu = &bluetoothGeneralMenu;
+  addNodes(&shutdownBLEMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(shutdownBLEMenu.parentMenu);
+  });
+
+  // Bad USB Menu
+  badusbMenu.parentMenu = &mainMenu;
+  addNodes(&badusbMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(badusbMenu.parentMenu);
+  });
+  addNodes(&badusbMenu, "Test BadUSB", TFT_PURPLE, NULL, TEST_BAD_USB_ICO, [this]() {
+    a32u4_obj.test();
+  });
+  addNodes(&badusbMenu, "Run Ducky Script", TFT_RED, NULL, BAD_USB_ICO, [this](){
+    display_obj.clearScreen(); 
+    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
+    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED); 
+    writeBadUSB();
+  });
+
+  // General apps menu
+  generalMenu.parentMenu = &mainMenu;
+  addNodes(&generalMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    display_obj.draw_tft = false;
+    changeMenu(generalMenu.parentMenu);
+  });
+  addNodes(&generalMenu, "Draw", TFT_WHITE, NULL, DRAW, [this]() {
+    display_obj.clearScreen();
+    display_obj.setupDraw();
+    display_obj.draw_tft = true;
+  });
+
+  // Device menu
+  deviceMenu.parentMenu = &mainMenu;
+  addNodes(&deviceMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(deviceMenu.parentMenu);
+  });
+  //addNodes(&deviceMenu, "Update Firmware", TFT_ORANGE, NULL, UPDATE, [this](){wifi_scan_obj.currentScanMode = OTA_UPDATE; changeMenu(&updateMenu); web_obj.setupOTAupdate();});
+  addNodes(&deviceMenu, "Update Firmware", TFT_ORANGE, NULL, UPDATE, [this]() {
+    wifi_scan_obj.currentScanMode = OTA_UPDATE;
+    changeMenu(&whichUpdateMenu);
+  });
+  addNodes(&deviceMenu, "Device Info", TFT_WHITE, NULL, DEVICE_INFO, [this]() {
+    wifi_scan_obj.currentScanMode = SHOW_INFO;
+    changeMenu(&infoMenu);
+    wifi_scan_obj.RunInfo();
+  });
+  addNodes(&deviceMenu, "Settings", TFT_NAVY, NULL, KEYBOARD_ICO, [this]() {
+    changeMenu(&settingsMenu);
+  });
+  /*addNodes(&deviceMenu, "Settings", TFT_NAVY, NULL, KEYBOARD_ICO, [this](){
+    display_obj.clearScreen(); 
+    wifi_scan_obj.currentScanMode = LV_ADD_SSID; 
+    wifi_scan_obj.StartScan(LV_ADD_SSID, TFT_RED);  
+    displaySettingsGFX();
+  });*/
+
+  // Settings menu
+  // Device menu
+  settingsMenu.parentMenu = &deviceMenu;
+  addNodes(&settingsMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(settingsMenu.parentMenu);
+  });
+  for (int i = 0; i < settings_obj.getNumberSettings(); i++) {
+    if (this->callSetting(settings_obj.setting_index_to_name(i)) == "bool")
+      addNodes(&settingsMenu, settings_obj.setting_index_to_name(i), TFT_LIGHTGREY, NULL, 0, [this, i]() {
+      settings_obj.toggleSetting(settings_obj.setting_index_to_name(i));
+      changeMenu(&specSettingMenu);
+      //this->callSetting(settings_obj.setting_index_to_name(i));
+      this->displaySetting(settings_obj.setting_index_to_name(i));
+    }, settings_obj.loadSetting<bool>(settings_obj.setting_index_to_name(i)));
+  }
+
+  // Specific setting menu
+  specSettingMenu.parentMenu = &settingsMenu;
+  addNodes(&specSettingMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(specSettingMenu.parentMenu);
+  });
+ 
+  // Select update
+  whichUpdateMenu.parentMenu = &deviceMenu;
+  addNodes(&whichUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(whichUpdateMenu.parentMenu);
+  });
+  addNodes(&whichUpdateMenu, "Web Update", TFT_GREEN, NULL, WEB_UPDATE, [this]() {
+    wifi_scan_obj.currentScanMode = OTA_UPDATE;
+    changeMenu(&updateMenu);
+    web_obj.setupOTAupdate();
+  });
+  if (sd_obj.supported) addNodes(&whichUpdateMenu, "SD Update", TFT_MAGENTA, NULL, SD_UPDATE, [this]() {
+    wifi_scan_obj.currentScanMode = OTA_UPDATE;
+    changeMenu(&confirmMenu);
+  });
+  addNodes(&whichUpdateMenu, "ESP8266 Update", TFT_RED, NULL, ESP_UPDATE_ICO, [this]() {
+    wifi_scan_obj.currentScanMode = ESP_UPDATE;
+    changeMenu(&espUpdateMenu);
+    esp_obj.RunUpdate();
+  });
+
+  // ESP Update Menu
+  espUpdateMenu.parentMenu = &whichUpdateMenu;
+  addNodes(&espUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+    esp_obj.bootRunMode();
+    changeMenu(espUpdateMenu.parentMenu);
+  });
+
+  // Confirm SD update menu
+  confirmMenu.parentMenu = &whichUpdateMenu;
+  addNodes(&confirmMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    changeMenu(confirmMenu.parentMenu);
+  });
+  //addNodes(&confirmMenu, "Yes", TFT_ORANGE, NULL, UPDATE, [this](){wifi_scan_obj.currentScanMode = OTA_UPDATE; changeMenu(&updateMenu); sd_obj.runUpdate();});
+  addNodes(&confirmMenu, "Yes", TFT_ORANGE, NULL, UPDATE, [this]() {
+    wifi_scan_obj.currentScanMode = OTA_UPDATE;
+    changeMenu(&failedUpdateMenu);
+    sd_obj.runUpdate();
+  });
+
+  // Web Update
+  updateMenu.parentMenu = &deviceMenu;
+  addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+    changeMenu(updateMenu.parentMenu);
+    WiFi.softAPdisconnect(true);
+    web_obj.shutdownServer();
+  });
+  //addNodes(&updateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this](){wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF; changeMenu(updateMenu.parentMenu);});
+
+  // Failed update menu
+  failedUpdateMenu.parentMenu = &whichUpdateMenu;
+  addNodes(&failedUpdateMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+    changeMenu(failedUpdateMenu.parentMenu);
+  });
+
+  // Device info menu
+  infoMenu.parentMenu = &deviceMenu;
+  addNodes(&infoMenu, "Back", TFT_LIGHTGREY, NULL, 0, [this]() {
+    wifi_scan_obj.currentScanMode = WIFI_SCAN_OFF;
+    changeMenu(infoMenu.parentMenu);
+  });
+
+  // Set the current menu to the mainMenu
+  changeMenu(&mainMenu);
+
+  this->initTime = millis();
+}
+
+// Function to change menu
+void MenuFunctions::changeMenu(Menu * menu)
+{
+  display_obj.initScrollValues();
+  display_obj.setupScrollArea(TOP_FIXED_AREA, BOT_FIXED_AREA);
+  display_obj.tft.init();
+  current_menu = menu;
+
+  buildButtons(menu);
+
+  displayCurrentMenu();
+}
+
+// Function to show all MenuNodes in a Menu
+void MenuFunctions::showMenuList(Menu * menu, int layer)
+{
+  // Iterate through all of the menu nodes in the menu
+  for (uint8_t i = 0; i < menu->list->size(); i++)
+  {
+    // Depending on layer, indent
+    for (uint8_t x = 0; x < layer * 4; x++)
+      Serial.print(" ");
+    Serial.print("Node: ");
+    Serial.println(menu->list->get(i).name);
+
+    // If the current menu node points to another menu, list that menu
+    //if (menu->list->get(i).childMenu != NULL)
+    //  showMenuList(menu->list->get(i).childMenu, layer+1);
+  }
+  Serial.println();
+}
+
+
+// Function to add MenuNodes to a menu
+void MenuFunctions::addNodes(Menu * menu, String name, uint16_t color, Menu * child, int place, std::function<void()> callable, bool selected)
+{
+  TFT_eSPI_Button new_button;
+  menu->list->add(MenuNode{name, color, place, &new_button, selected, callable});
+  //menu->list->add(MenuNode{name, color, place, callable});
+}
+
+void MenuFunctions::buildButtons(Menu * menu)
+{
+  Serial.println("Bulding buttons...");
+  if (menu->list != NULL)
+  {
+    //for (int i = 0; i < sizeof(key); i++)
+    //  key[i] = NULL;
+    for (uint8_t i = 0; i < menu->list->size(); i++)
+    {
+      TFT_eSPI_Button new_button;
+      char buf[menu->list->get(i).name.length() + 1] = {};
+      menu->list->get(i).name.toCharArray(buf, menu->list->get(i).name.length() + 1);
+      display_obj.key[i].initButton(&display_obj.tft,
+                                    KEY_X + 0 * (KEY_W + KEY_SPACING_X),
+                                    KEY_Y + i * (KEY_H + KEY_SPACING_Y), // x, y, w, h, outline, fill, text
+                                    KEY_W,
+                                    KEY_H,
+                                    TFT_BLACK, // Outline
+                                    TFT_BLACK, // Fill
+                                    menu->list->get(i).color, // Text
+                                    buf,
+                                    KEY_TEXTSIZE);
+
+      display_obj.key[i].setLabelDatum(BUTTON_PADDING - (KEY_W / 2), 2, ML_DATUM);
+    }
+  }
+}
+
+
+void MenuFunctions::displayCurrentMenu()
+{
+  Serial.println(F("Displaying current menu..."));
+  display_obj.clearScreen();
+  display_obj.tft.setTextColor(TFT_LIGHTGREY, TFT_DARKGREY);
+  this->drawStatusBar();
+  //display_obj.tft.fillRect(0,0,240,16, TFT_DARKGREY);
+  //display_obj.tft.drawCentreString(" ESP32 Marauder ",120,0,2);
+  //Serial.println("Getting size...");
+  //char buf[&current_menu->parentMenu->name.length() + 1] = {};
+  //Serial.println("Got size...");
+  //current_menu->parentMenu->name.toCharArray(buf, current_menu->parentMenu->name.length() + 1);
+  //String current_name = &current_menu->parentMenu->name;
+  //Serial.println("gottem");
+  //display_obj.tft.drawCentreString(current_menu->name,120,0,2);
+  if (current_menu->list != NULL)
+  {
+    display_obj.tft.setFreeFont(MENU_FONT);
+    for (uint8_t i = 0; i < current_menu->list->size(); i++)
+    {
+      //display_obj.key[i].drawButton2(current_menu->list->get(i).name);
+      //display_obj.key[i].drawButton(ML_DATUM, BUTTON_PADDING, current_menu->list->get(i).name);
+      //display_obj.key[i].drawButton(true);
+      //if (!current_menu->list->get(i).selected)
+        display_obj.key[i].drawButton(false, current_menu->list->get(i).name);
+      //else
+      //  display_obj.key[i].drawButton(true, current_menu->list->get(i).name);
+        
+      if (current_menu->list->get(i).name != "Back")
+        display_obj.tft.drawXBitmap(0,
+                                    KEY_Y + i * (KEY_H + KEY_SPACING_Y) - (ICON_H / 2),
+                                    menu_icons[current_menu->list->get(i).icon],
+                                    ICON_W,
+                                    ICON_H,
+                                    TFT_BLACK,
+                                    current_menu->list->get(i).color);
+    }
+    display_obj.tft.setFreeFont(NULL);
+  }
+}
diff --git a/esp32_marauder/MenuFunctions.h b/esp32_marauder/MenuFunctions.h
index c7efbf2..72059de 100644
--- a/esp32_marauder/MenuFunctions.h
+++ b/esp32_marauder/MenuFunctions.h
@@ -1,215 +1,217 @@
-#ifndef MenuFunctions_h
-#define MenuFunctions_h
-
-#define BATTERY_ANALOG_ON 0
-
-#include "WiFiScan.h"
-#include "Display.h"
-#include "BatteryInterface.h"
-#include "SDInterface.h"
-#include "Web.h"
-#include "esp_interface.h"
-#include "a32u4_interface.h"
-#include "settings.h"
-
-
-extern Display display_obj;
-extern WiFiScan wifi_scan_obj;
-extern Web web_obj;
-extern SDInterface sd_obj;
-extern BatteryInterface battery_obj;
-extern EspInterface esp_obj;
-extern A32u4Interface a32u4_obj;
-extern Settings settings_obj;
-
-// Keypad start position, key sizes and spacing
-#define KEY_X 120 // Centre of key
-#define KEY_Y 50
-#define KEY_W 240 // Width and height
-#define KEY_H 22
-#define KEY_SPACING_X 0 // X and Y gap
-#define KEY_SPACING_Y 1
-#define KEY_TEXTSIZE 1   // Font size multiplier
-#define ICON_W 22
-#define ICON_H 22
-#define BUTTON_PADDING 22
-//#define BUTTON_ARRAY_LEN 5
-
-#define FLASH_BUTTON 0
-
-#if BATTERY_ANALOG_ON == 1
-#define BATTERY_PIN 13
-#define ANALOG_PIN 34
-#define CHARGING_PIN 27
-#endif
-
-// Icon definitions
-#define ATTACKS 0
-#define BEACON_SNIFF 1
-#define BLUETOOTH 2
-#define BLUETOOTH_SNIFF 3
-#define DEAUTH_SNIFF 4
-#define DRAW 5
-#define PACKET_MONITOR 6
-#define PROBE_SNIFF 7
-#define SCANNERS 8
-#define CC_SKIMMERS 9
-#define SNIFFERS 10
-#define WIFI 11
-#define BEACON_SPAM 12
-#define RICK_ROLL 13
-#define REBOOT 14
-#define GENERAL_APPS 15
-#define UPDATE 16
-#define DEVICE 17
-#define DEVICE_INFO 18
-#define SD_UPDATE 19
-#define WEB_UPDATE 20
-#define EAPOL 21
-#define STATUS_BAT 22
-#define STATUS_SD 23
-#define PWNAGOTCHI 24
-#define ESPRESSIF 25
-#define SHUTDOWN 26
-#define BEACON_LIST 27
-#define GENERATE 28
-#define CLEAR_ICO 29
-#define KEYBOARD_ICO 30
-#define JOIN_WIFI 31
-#define ESP_UPDATE_ICO 32
-#define BAD_USB_ICO 33
-#define TEST_BAD_USB_ICO 34
-
-PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
-PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
-
-PROGMEM static lv_disp_buf_t disp_buf;
-PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];
-
-PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
-PROGMEM static void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
-PROGMEM static void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
-PROGMEM static void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
-PROGMEM static void load_btn_cb(lv_obj_t * load_btn, lv_event_t event);
-PROGMEM static void test_btn_cb(lv_obj_t * load_btn, lv_event_t event);
-PROGMEM static void ap_list_cb(lv_obj_t * btn, lv_event_t event);
-PROGMEM static void setting_dropdown_cb(lv_obj_t * btn, lv_event_t event);
-PROGMEM static void save_as_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
-
-// lvgl stuff
-PROGMEM static lv_obj_t *kb;
-PROGMEM static lv_obj_t * save_as_kb;
-
-struct Menu;
-
-// Individual Nodes of a menu
-
-struct MenuNode {
-  String name;
-  uint16_t color;
-  int icon;
-  TFT_eSPI_Button* button;
-  std::function<void()> callable;
-};
-
-// Full Menus
-struct Menu {
-  String name;
-  LinkedList<MenuNode>* list;
-  Menu                * parentMenu;
-  //uint8_t               selected;
-};
-
-
-class MenuFunctions
-{
-  private:
-
-    String u_result = "";
-
-    uint32_t initTime = 0;
-
-    //Menu* current_menu;
-
-    // Main menu stuff
-    Menu mainMenu;
-
-    Menu wifiMenu;
-    Menu bluetoothMenu;
-    Menu badusbMenu;
-    Menu generalMenu;
-    Menu deviceMenu;
-
-    // Device menu stuff
-    Menu whichUpdateMenu;
-    Menu failedUpdateMenu;
-    Menu confirmMenu;
-    Menu espUpdateMenu;
-    Menu updateMenu;
-    Menu settingsMenu;
-    Menu specSettingMenu;
-    Menu infoMenu;
-
-    // WiFi menu stuff
-    Menu wifiSnifferMenu;
-    Menu wifiAttackMenu;
-    Menu wifiGeneralMenu;
-
-    // Bluetooth menu stuff
-    Menu bluetoothSnifferMenu;
-    Menu bluetoothGeneralMenu;
-
-    // Settings things menus
-    Menu shutdownWiFiMenu;
-    Menu shutdownBLEMenu;
-    Menu generateSSIDsMenu;
-    Menu clearSSIDsMenu;
-    Menu clearAPsMenu;
-
-    static void lv_tick_handler();
-
-    // Menu icons
-
-
-    //TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
-
-    void addNodes(Menu* menu, String name, uint16_t color, Menu* child, int place, std::function<void()> callable);
-    void drawStatusBar();
-    void updateStatusBar();
-    void battery(bool initial = false);
-    void battery2(bool initial = false);
-    void showMenuList(Menu* menu, int layer);
-    void callSetting(String key);
-    void runBoolSetting(String ley);
-
-  public:
-    MenuFunctions();
-
-    Menu* current_menu;
-
-    Ticker tick;
-
-    uint16_t x = -1, y = -1;
-    boolean pressed = false;
-
-    String loaded_file = "";
-
-    void initLVGL();
-    void deinitLVGL();
-    void joinWiFiGFX();
-    void addSSIDGFX();
-    void addAPGFX();
-    void displaySettingsGFX();
-    void writeBadUSB();
-
-    void buildButtons(Menu* menu);
-    void changeMenu(Menu* menu);
-    void displayCurrentMenu();
-    void main(uint32_t currentTime);
-    void RunSetup();
-    void orientDisplay();
-};
-
-
-
-#endif
+#ifndef MenuFunctions_h
+#define MenuFunctions_h
+
+#define BATTERY_ANALOG_ON 0
+
+#include "WiFiScan.h"
+#include "Display.h"
+#include "BatteryInterface.h"
+#include "SDInterface.h"
+#include "Web.h"
+#include "esp_interface.h"
+#include "a32u4_interface.h"
+#include "settings.h"
+
+
+extern Display display_obj;
+extern WiFiScan wifi_scan_obj;
+extern Web web_obj;
+extern SDInterface sd_obj;
+extern BatteryInterface battery_obj;
+extern EspInterface esp_obj;
+extern A32u4Interface a32u4_obj;
+extern Settings settings_obj;
+
+// Keypad start position, key sizes and spacing
+#define KEY_X 120 // Centre of key
+#define KEY_Y 50
+#define KEY_W 240 // Width and height
+#define KEY_H 22
+#define KEY_SPACING_X 0 // X and Y gap
+#define KEY_SPACING_Y 1
+#define KEY_TEXTSIZE 1   // Font size multiplier
+#define ICON_W 22
+#define ICON_H 22
+#define BUTTON_PADDING 22
+//#define BUTTON_ARRAY_LEN 5
+
+#define FLASH_BUTTON 0
+
+#if BATTERY_ANALOG_ON == 1
+#define BATTERY_PIN 13
+#define ANALOG_PIN 34
+#define CHARGING_PIN 27
+#endif
+
+// Icon definitions
+#define ATTACKS 0
+#define BEACON_SNIFF 1
+#define BLUETOOTH 2
+#define BLUETOOTH_SNIFF 3
+#define DEAUTH_SNIFF 4
+#define DRAW 5
+#define PACKET_MONITOR 6
+#define PROBE_SNIFF 7
+#define SCANNERS 8
+#define CC_SKIMMERS 9
+#define SNIFFERS 10
+#define WIFI 11
+#define BEACON_SPAM 12
+#define RICK_ROLL 13
+#define REBOOT 14
+#define GENERAL_APPS 15
+#define UPDATE 16
+#define DEVICE 17
+#define DEVICE_INFO 18
+#define SD_UPDATE 19
+#define WEB_UPDATE 20
+#define EAPOL 21
+#define STATUS_BAT 22
+#define STATUS_SD 23
+#define PWNAGOTCHI 24
+#define ESPRESSIF 25
+#define SHUTDOWN 26
+#define BEACON_LIST 27
+#define GENERATE 28
+#define CLEAR_ICO 29
+#define KEYBOARD_ICO 30
+#define JOIN_WIFI 31
+#define ESP_UPDATE_ICO 32
+#define BAD_USB_ICO 33
+#define TEST_BAD_USB_ICO 34
+
+PROGMEM void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color_p);
+PROGMEM bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data);
+
+PROGMEM static lv_disp_buf_t disp_buf;
+PROGMEM static lv_color_t buf[LV_HOR_RES_MAX * 10];
+
+PROGMEM static void ta_event_cb(lv_obj_t * ta, lv_event_t event);
+PROGMEM static void join_wifi_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+PROGMEM static void add_ssid_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+PROGMEM static void write_bad_usb_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+PROGMEM static void load_btn_cb(lv_obj_t * load_btn, lv_event_t event);
+PROGMEM static void test_btn_cb(lv_obj_t * load_btn, lv_event_t event);
+PROGMEM static void ap_list_cb(lv_obj_t * btn, lv_event_t event);
+PROGMEM static void setting_dropdown_cb(lv_obj_t * btn, lv_event_t event);
+PROGMEM static void save_as_keyboard_event_cb(lv_obj_t * keyboard, lv_event_t event);
+
+// lvgl stuff
+PROGMEM static lv_obj_t *kb;
+PROGMEM static lv_obj_t * save_as_kb;
+
+struct Menu;
+
+// Individual Nodes of a menu
+
+struct MenuNode {
+  String name;
+  uint16_t color;
+  int icon;
+  TFT_eSPI_Button* button;
+  bool selected;
+  std::function<void()> callable;
+};
+
+// Full Menus
+struct Menu {
+  String name;
+  LinkedList<MenuNode>* list;
+  Menu                * parentMenu;
+  //uint8_t               selected;
+};
+
+
+class MenuFunctions
+{
+  private:
+
+    String u_result = "";
+
+    uint32_t initTime = 0;
+
+    //Menu* current_menu;
+
+    // Main menu stuff
+    Menu mainMenu;
+
+    Menu wifiMenu;
+    Menu bluetoothMenu;
+    Menu badusbMenu;
+    Menu generalMenu;
+    Menu deviceMenu;
+
+    // Device menu stuff
+    Menu whichUpdateMenu;
+    Menu failedUpdateMenu;
+    Menu confirmMenu;
+    Menu espUpdateMenu;
+    Menu updateMenu;
+    Menu settingsMenu;
+    Menu specSettingMenu;
+    Menu infoMenu;
+
+    // WiFi menu stuff
+    Menu wifiSnifferMenu;
+    Menu wifiAttackMenu;
+    Menu wifiGeneralMenu;
+
+    // Bluetooth menu stuff
+    Menu bluetoothSnifferMenu;
+    Menu bluetoothGeneralMenu;
+
+    // Settings things menus
+    Menu shutdownWiFiMenu;
+    Menu shutdownBLEMenu;
+    Menu generateSSIDsMenu;
+    Menu clearSSIDsMenu;
+    Menu clearAPsMenu;
+
+    static void lv_tick_handler();
+
+    // Menu icons
+
+
+    //TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
+
+    void addNodes(Menu* menu, String name, uint16_t color, Menu* child, int place, std::function<void()> callable, bool selected = false);
+    void drawStatusBar();
+    void updateStatusBar();
+    void battery(bool initial = false);
+    void battery2(bool initial = false);
+    void showMenuList(Menu* menu, int layer);
+    String callSetting(String key);
+    void runBoolSetting(String ley);
+    void displaySetting(String key);
+
+  public:
+    MenuFunctions();
+
+    Menu* current_menu;
+
+    Ticker tick;
+
+    uint16_t x = -1, y = -1;
+    boolean pressed = false;
+
+    String loaded_file = "";
+
+    void initLVGL();
+    void deinitLVGL();
+    void joinWiFiGFX();
+    void addSSIDGFX();
+    void addAPGFX();
+    void displaySettingsGFX();
+    void writeBadUSB();
+
+    void buildButtons(Menu* menu);
+    void changeMenu(Menu* menu);
+    void displayCurrentMenu();
+    void main(uint32_t currentTime);
+    void RunSetup();
+    void orientDisplay();
+};
+
+
+
+#endif
diff --git a/esp32_marauder/settings.cpp b/esp32_marauder/settings.cpp
index 5550214..3bf7b80 100644
--- a/esp32_marauder/settings.cpp
+++ b/esp32_marauder/settings.cpp
@@ -1,234 +1,304 @@
-#include "settings.h"
-
-String Settings::getSettingsString() {
-  return this->json_settings_string;
-}
-
-bool Settings::begin() {
-  if(!SPIFFS.begin(FORMAT_SPIFFS_IF_FAILED)){
-    Serial.println("Settings SPIFFS Mount Failed");
-    return false;
-  }
-
-  File settingsFile;
-
-  //SPIFFS.remove("/settings.json"); // NEED TO REMOVE THIS LINE
-
-  if (SPIFFS.exists("/settings.json")) {
-    settingsFile = SPIFFS.open("/settings.json", FILE_READ);
-    
-    if (!settingsFile) {
-      settingsFile.close();
-      Serial.println(F("Could not find settings file"));
-      if (this->createDefaultSettings(SPIFFS))
-        return true;
-      else
-        return false;    
-    }
-  }
-  else {
-    Serial.println("Settings file does not exist");
-    if (this->createDefaultSettings(SPIFFS))
-      return true;
-    else
-      return false;
-  }
-
-  String json_string;
-  DynamicJsonDocument jsonBuffer(1024);
-  DeserializationError error = deserializeJson(jsonBuffer, settingsFile);
-  serializeJson(jsonBuffer, json_string);
-  Serial.println("Settings: " + (String)json_string + "\n");
-  this->printJsonSettings(json_string);
-
-  this->json_settings_string = json_string;
-  
-  return true;
-}
-
-template <typename T>
-T Settings::loadSetting(String key) {}
-
-// Get type int settings
-template<>
-int Settings::loadSetting<int>(String key) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    if (json["Settings"][i]["name"].as<String>() == key)
-      return json["Settings"][i]["value"];
-  }
-
-  return 0;
-}
-
-// Get type string settings
-template<>
-String Settings::loadSetting<String>(String key) {
-  //return this->json_settings_string;
-  
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    if (json["Settings"][i]["name"].as<String>() == key)
-      return json["Settings"][i]["value"];
-  }
-
-  return "";
-}
-
-// Get type bool settings
-template<>
-bool Settings::loadSetting<bool>(String key) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    if (json["Settings"][i]["name"].as<String>() == key)
-      return json["Settings"][i]["value"];
-  }
-
-  return false;
-}
-
-//Get type uint8_t settings
-template<>
-uint8_t Settings::loadSetting<uint8_t>(String key) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    if (json["Settings"][i]["name"].as<String>() == key)
-      return json["Settings"][i]["value"];
-  }
-
-  return 0;
-}
-
-String Settings::setting_index_to_name(int i) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  return json["Settings"][i]["name"];
-}
-
-int Settings::getNumberSettings() {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-
-  return json["Settings"].size();
-}
-
-String Settings::getSettingType(String key) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, this->json_settings_string)) {
-    Serial.println("\nCould not parse json");
-  }
-  
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    if (json["Settings"][i]["name"].as<String>() == key)
-      return json["Settings"][i]["type"];
-  }
-}
-
-void Settings::printJsonSettings(String json_string) {
-  DynamicJsonDocument json(1024); // ArduinoJson v6
-
-  if (deserializeJson(json, json_string)) {
-    Serial.println("\nCould not parse json");
-  }
-  
-  Serial.println("Settings\n----------------------------------------------");
-  for (int i = 0; i < json["Settings"].size(); i++) {
-    Serial.println("Name: " + json["Settings"][i]["name"].as<String>());
-    Serial.println("Type: " + json["Settings"][i]["type"].as<String>());
-    Serial.println("Value: " + json["Settings"][i]["value"].as<String>());
-    Serial.println("----------------------------------------------");
-  }
-}
-
-bool Settings::createDefaultSettings(fs::FS &fs) {
-  Serial.println(F("Creating default settings file: settings.json"));
-  
-  File settingsFile = fs.open("/settings.json", FILE_WRITE);
-
-  if (!settingsFile) {
-    Serial.println(F("Failed to create settings file"));
-    return false;
-  }
-
-  DynamicJsonDocument jsonBuffer(1024);
-  String settings_string;
-
-  jsonBuffer["Settings"][0]["name"] = "Channel";
-  jsonBuffer["Settings"][0]["type"] = "uint8_t";
-  jsonBuffer["Settings"][0]["value"] = 11;
-  jsonBuffer["Settings"][0]["range"]["min"] = 1;
-  jsonBuffer["Settings"][0]["range"]["max"] = 14;
-
-  jsonBuffer["Settings"][1]["name"] = "Channel Hop Delay";
-  jsonBuffer["Settings"][1]["type"] = "int";
-  jsonBuffer["Settings"][1]["value"] = 1;
-  jsonBuffer["Settings"][1]["range"]["min"] = 1;
-  jsonBuffer["Settings"][1]["range"]["max"] = 10;
-
-  jsonBuffer["Settings"][2]["name"] = "Force PMKID";
-  jsonBuffer["Settings"][2]["type"] = "bool";
-  jsonBuffer["Settings"][2]["value"] = true;
-  jsonBuffer["Settings"][2]["range"]["min"] = false;
-  jsonBuffer["Settings"][2]["range"]["max"] = true;
-
-  jsonBuffer["Settings"][3]["name"] = "Force Probe";
-  jsonBuffer["Settings"][3]["type"] = "bool";
-  jsonBuffer["Settings"][3]["value"] = true;
-  jsonBuffer["Settings"][3]["range"]["min"] = false;
-  jsonBuffer["Settings"][3]["range"]["max"] = true;
-
-  jsonBuffer["Settings"][4]["name"] = "Save PCAP";
-  jsonBuffer["Settings"][4]["type"] = "bool";
-  jsonBuffer["Settings"][4]["value"] = true;
-  jsonBuffer["Settings"][4]["range"]["min"] = false;
-  jsonBuffer["Settings"][4]["range"]["max"] = true;
-
-  //jsonBuffer.printTo(settingsFile);
-  if (serializeJson(jsonBuffer, settingsFile) == 0) {
-    Serial.println(F("Failed to write to file"));
-  }
-  if (serializeJson(jsonBuffer, settings_string) == 0) {
-    Serial.println(F("Failed to write to string"));
-  }
-
-  // Close the file
-  settingsFile.close();
-
-  this->json_settings_string = settings_string;
-
-  this->printJsonSettings(settings_string);
-
-  return true;
-}
-
-void Settings::main(uint32_t currentTime) {
-  
-}
+#include "settings.h"
+
+String Settings::getSettingsString() {
+  return this->json_settings_string;
+}
+
+bool Settings::begin() {
+  if(!SPIFFS.begin(FORMAT_SPIFFS_IF_FAILED)){
+    Serial.println("Settings SPIFFS Mount Failed");
+    return false;
+  }
+
+  File settingsFile;
+
+  //SPIFFS.remove("/settings.json"); // NEED TO REMOVE THIS LINE
+
+  if (SPIFFS.exists("/settings.json")) {
+    settingsFile = SPIFFS.open("/settings.json", FILE_READ);
+    
+    if (!settingsFile) {
+      settingsFile.close();
+      Serial.println(F("Could not find settings file"));
+      if (this->createDefaultSettings(SPIFFS))
+        return true;
+      else
+        return false;    
+    }
+  }
+  else {
+    Serial.println("Settings file does not exist");
+    if (this->createDefaultSettings(SPIFFS))
+      return true;
+    else
+      return false;
+  }
+
+  String json_string;
+  DynamicJsonDocument jsonBuffer(1024);
+  DeserializationError error = deserializeJson(jsonBuffer, settingsFile);
+  serializeJson(jsonBuffer, json_string);
+  Serial.println("Settings: " + (String)json_string + "\n");
+  this->printJsonSettings(json_string);
+
+  this->json_settings_string = json_string;
+  
+  return true;
+}
+
+template <typename T>
+T Settings::loadSetting(String key) {}
+
+// Get type int settings
+template<>
+int Settings::loadSetting<int>(String key) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key)
+      return json["Settings"][i]["value"];
+  }
+
+  return 0;
+}
+
+// Get type string settings
+template<>
+String Settings::loadSetting<String>(String key) {
+  //return this->json_settings_string;
+  
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key)
+      return json["Settings"][i]["value"];
+  }
+
+  return "";
+}
+
+// Get type bool settings
+template<>
+bool Settings::loadSetting<bool>(String key) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key)
+      return json["Settings"][i]["value"];
+  }
+
+  return false;
+}
+
+//Get type uint8_t settings
+template<>
+uint8_t Settings::loadSetting<uint8_t>(String key) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key)
+      return json["Settings"][i]["value"];
+  }
+
+  return 0;
+}
+
+template <typename T>
+T Settings::saveSetting(String key, bool value) {}
+
+template<>
+bool Settings::saveSetting<bool>(String key, bool value) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  String settings_string;
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key) {
+      json["Settings"][i]["value"] = value;
+
+      Serial.println("Saving setting...");
+
+      File settingsFile = SPIFFS.open("/settings.json", FILE_WRITE);
+
+      if (!settingsFile) {
+        Serial.println(F("Failed to create settings file"));
+        return false;
+      }
+
+      if (serializeJson(json, settingsFile) == 0) {
+        Serial.println(F("Failed to write to file"));
+      }
+      if (serializeJson(json, settings_string) == 0) {
+        Serial.println(F("Failed to write to string"));
+      }
+    
+      // Close the file
+      settingsFile.close();
+    
+      this->json_settings_string = settings_string;
+    
+      this->printJsonSettings(settings_string);
+      
+      return true;
+    }
+  }
+}
+
+bool Settings::toggleSetting(String key) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key) {
+      if (json["Settings"][i]["value"]) {
+        saveSetting<bool>(key, false);
+        Serial.println("Setting value to false");
+        return false;
+      }
+      else {
+        saveSetting<bool>(key, true);
+        Serial.println("Setting value to true");
+        return true;
+      }
+
+      return false;
+    }
+  }
+}
+
+String Settings::setting_index_to_name(int i) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  return json["Settings"][i]["name"];
+}
+
+int Settings::getNumberSettings() {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+
+  return json["Settings"].size();
+}
+
+String Settings::getSettingType(String key) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, this->json_settings_string)) {
+    Serial.println("\nCould not parse json");
+  }
+  
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    if (json["Settings"][i]["name"].as<String>() == key)
+      return json["Settings"][i]["type"];
+  }
+}
+
+void Settings::printJsonSettings(String json_string) {
+  DynamicJsonDocument json(1024); // ArduinoJson v6
+
+  if (deserializeJson(json, json_string)) {
+    Serial.println("\nCould not parse json");
+  }
+  
+  Serial.println("Settings\n----------------------------------------------");
+  for (int i = 0; i < json["Settings"].size(); i++) {
+    Serial.println("Name: " + json["Settings"][i]["name"].as<String>());
+    Serial.println("Type: " + json["Settings"][i]["type"].as<String>());
+    Serial.println("Value: " + json["Settings"][i]["value"].as<String>());
+    Serial.println("----------------------------------------------");
+  }
+}
+
+bool Settings::createDefaultSettings(fs::FS &fs) {
+  Serial.println(F("Creating default settings file: settings.json"));
+  
+  File settingsFile = fs.open("/settings.json", FILE_WRITE);
+
+  if (!settingsFile) {
+    Serial.println(F("Failed to create settings file"));
+    return false;
+  }
+
+  DynamicJsonDocument jsonBuffer(1024);
+  String settings_string;
+
+  //jsonBuffer["Settings"][0]["name"] = "Channel";
+  //jsonBuffer["Settings"][0]["type"] = "uint8_t";
+  //jsonBuffer["Settings"][0]["value"] = 11;
+  //jsonBuffer["Settings"][0]["range"]["min"] = 1;
+  //jsonBuffer["Settings"][0]["range"]["max"] = 14;
+
+  //jsonBuffer["Settings"][1]["name"] = "Channel Hop Delay";
+  //jsonBuffer["Settings"][1]["type"] = "int";
+  //jsonBuffer["Settings"][1]["value"] = 1;
+  //jsonBuffer["Settings"][1]["range"]["min"] = 1;
+  //jsonBuffer["Settings"][1]["range"]["max"] = 10;
+
+  jsonBuffer["Settings"][0]["name"] = "Force PMKID";
+  jsonBuffer["Settings"][0]["type"] = "bool";
+  jsonBuffer["Settings"][0]["value"] = true;
+  jsonBuffer["Settings"][0]["range"]["min"] = false;
+  jsonBuffer["Settings"][0]["range"]["max"] = true;
+
+  jsonBuffer["Settings"][1]["name"] = "Force Probe";
+  jsonBuffer["Settings"][1]["type"] = "bool";
+  jsonBuffer["Settings"][1]["value"] = true;
+  jsonBuffer["Settings"][1]["range"]["min"] = false;
+  jsonBuffer["Settings"][1]["range"]["max"] = true;
+
+  jsonBuffer["Settings"][2]["name"] = "Save PCAP";
+  jsonBuffer["Settings"][2]["type"] = "bool";
+  jsonBuffer["Settings"][2]["value"] = true;
+  jsonBuffer["Settings"][2]["range"]["min"] = false;
+  jsonBuffer["Settings"][2]["range"]["max"] = true;
+
+  //jsonBuffer.printTo(settingsFile);
+  if (serializeJson(jsonBuffer, settingsFile) == 0) {
+    Serial.println(F("Failed to write to file"));
+  }
+  if (serializeJson(jsonBuffer, settings_string) == 0) {
+    Serial.println(F("Failed to write to string"));
+  }
+
+  // Close the file
+  settingsFile.close();
+
+  this->json_settings_string = settings_string;
+
+  this->printJsonSettings(settings_string);
+
+  return true;
+}
+
+void Settings::main(uint32_t currentTime) {
+  
+}
diff --git a/esp32_marauder/settings.h b/esp32_marauder/settings.h
index fa7f4d6..7a29fb3 100644
--- a/esp32_marauder/settings.h
+++ b/esp32_marauder/settings.h
@@ -1,48 +1,52 @@
-#ifndef Settings_h
-#define Settings_h
-
-#include "SPIFFS.h"
-#include <FS.h>
-#include <ArduinoJson.h>
-
-#define FORMAT_SPIFFS_IF_FAILED true
-
-#include "Display.h"
-
-extern Display display_obj;
-
-class Settings {
-
-  private:
-    String json_settings_string;
-    
-    void printJsonSettings(String json_string);
-    bool createDefaultSettings(fs::FS &fs);
-
-  public:
-    bool begin();
-
-    template <typename T>
-    T loadSetting(String name);
-
-    String getSettingType(String key);
-    String setting_index_to_name(int i);
-    int getNumberSettings();
-
-    //template<>
-    //int loadSetting<int>(String key);
-    
-    //template<>
-    //String loadSetting<String>(String key);
-    
-    //template<>
-    //bool loadSetting<bool>(String key);
-    
-    //template<>
-    //uint8_t loadSetting<uint8_t>(String key);
-
-    String getSettingsString();
-    void main(uint32_t currentTime);
-};
-
-#endif
+#ifndef Settings_h
+#define Settings_h
+
+#include "SPIFFS.h"
+#include <FS.h>
+#include <ArduinoJson.h>
+
+#define FORMAT_SPIFFS_IF_FAILED true
+
+#include "Display.h"
+
+extern Display display_obj;
+
+class Settings {
+
+  private:
+    String json_settings_string;
+    
+    void printJsonSettings(String json_string);
+    bool createDefaultSettings(fs::FS &fs);
+
+  public:
+    bool begin();
+
+    template <typename T>
+    T loadSetting(String name);
+
+    template <typename T>
+    T saveSetting(String key, bool value);
+
+    bool toggleSetting(String key);
+    String getSettingType(String key);
+    String setting_index_to_name(int i);
+    int getNumberSettings();
+
+    //template<>
+    //int loadSetting<int>(String key);
+    
+    //template<>
+    //String loadSetting<String>(String key);
+    
+    //template<>
+    //bool loadSetting<bool>(String key);
+    
+    //template<>
+    //uint8_t loadSetting<uint8_t>(String key);
+
+    String getSettingsString();
+    void main(uint32_t currentTime);
+};
+
+#endif