diff --git a/src/core/display.cpp b/src/core/display.cpp
index 8bce7c0..6d34660 100644
--- a/src/core/display.cpp
+++ b/src/core/display.cpp
@@ -88,7 +88,7 @@ void displayRedStripe(String text, uint16_t fgcolor, uint16_t bgcolor) {
     tft.println(text);
 }
 
-void displayError(String txt)   { 
+void displayError(String txt)   {
   #ifndef HAS_SCREEN
     Serial.println("ERR: " + txt);
     return;
@@ -351,7 +351,7 @@ void drawOptions(int index,std::vector<Option>& options, uint16_t fgcolor, uint1
     if(index>=MAX_MENU_SIZE) init=index-MAX_MENU_SIZE+1;
     for(i=0;i<menuSize;i++) {
       if(i>=init) {
-        if(options[i].selected) tft.setTextColor(fgcolor-0x1111,bgcolor); // if selected, change Text color
+        if(options[i].selected) tft.setTextColor(getColorVariation(fgcolor),bgcolor); // if selected, change Text color
         else tft.setTextColor(fgcolor,bgcolor);
 
         String text="";
@@ -396,9 +396,16 @@ void drawSubmenu(int index,std::vector<Option>& options, String system) {
       tft.setTextColor(FGCOLOR-0x2000);
       tft.drawCentreString(options[menuSize-1].label.c_str(),WIDTH/2, 42+(HEIGHT-134)/2,SMOOTH_FONT);
     }
-      tft.setTextSize(FG);
-      tft.setTextColor(FGCOLOR);
-      tft.drawCentreString(options[index].label.c_str(),WIDTH/2, 67+(HEIGHT-134)/2,SMOOTH_FONT);
+
+    int selectedTextSize = options[index].label.length() <= WIDTH/(LW*FG)-1 ? FG : FM;
+    tft.setTextSize(selectedTextSize);
+    tft.setTextColor(FGCOLOR);
+    tft.drawCentreString(
+      options[index].label.c_str(),
+      WIDTH/2,
+      67+(HEIGHT-134)/2+((selectedTextSize-1)%2)*LH/2,
+      SMOOTH_FONT
+    );
 
     if (index+1<menuSize) {
       tft.setTextSize(FM);
@@ -409,7 +416,13 @@ void drawSubmenu(int index,std::vector<Option>& options, String system) {
       tft.setTextColor(FGCOLOR-0x2000);
       tft.drawCentreString(options[0].label.c_str(),WIDTH/2, 102+(HEIGHT-134)/2,SMOOTH_FONT);
     }
-    tft.drawFastHLine(WIDTH/2 - options[index].label.size()*FG*LW/2, 67+FG*LH+(HEIGHT-134)/2,options[index].label.size()*FG*LW,FGCOLOR);
+
+    tft.drawFastHLine(
+      WIDTH/2 - options[index].label.size()*selectedTextSize*LW/2,
+      67+(HEIGHT-134)/2+((selectedTextSize-1)%2)*LH/2+selectedTextSize*LH,
+      options[index].label.size()*selectedTextSize*LW,
+      FGCOLOR
+    );
     tft.fillRect(WIDTH-5,0,5,HEIGHT,BGCOLOR);
     tft.fillRect(WIDTH-5,index*HEIGHT/menuSize,5,HEIGHT/menuSize,FGCOLOR);
 
@@ -577,7 +590,7 @@ void listFiles(int index, std::vector<FileList> fileList) {
     while(i<arraySize) {
         if(i>=start) {
             tft.setCursor(10,tft.getCursorY());
-            if(fileList[i].folder==true) tft.setTextColor(FGCOLOR-0x1111, BGCOLOR);
+            if(fileList[i].folder==true) tft.setTextColor(getColorVariation(FGCOLOR), BGCOLOR);
             else if(fileList[i].operation==true) tft.setTextColor(ALCOLOR, BGCOLOR);
             else { tft.setTextColor(FGCOLOR,BGCOLOR); }
 
@@ -659,7 +672,7 @@ void jpegRender(int xpos, int ypos) {
 
   bool swapBytes = tft.getSwapBytes();
   tft.setSwapBytes(true);
-  
+
   // Jpeg images are draw as a set of image block (tiles) called Minimum Coding Units (MCUs)
   // Typically these MCUs are 16x16 pixel blocks
   // Determine the width and height of the right and bottom edge image blocks
@@ -736,13 +749,13 @@ void jpegRender(int xpos, int ypos) {
 
 bool showJpeg(FS fs, String filename, int x, int y) {
   File picture;
-  if(fs.exists(filename)) 
+  if(fs.exists(filename))
     picture = fs.open(filename, FILE_READ);
-  else 
+  else
     return false;
 
   const size_t data_size = picture.size();
-  
+
   // Alloc memory into heap
   uint8_t* data_array = new uint8_t[data_size];
   if (data_array == nullptr) {
@@ -754,20 +767,20 @@ bool showJpeg(FS fs, String filename, int x, int y) {
   uint8_t data;
   int i = 0;
   byte line_len = 0;
-  
+
   while (picture.available()) {
     data = picture.read();
-    data_array[i] = data; 
+    data_array[i] = data;
     i++;
 
     //print array on Serial
     /*
-    Serial.print("0x"); 
+    Serial.print("0x");
     if (abs(data) < 16) {
-      Serial.print("0"); 
+      Serial.print("0");
     }
-    
-    Serial.print(data, HEX); 
+
+    Serial.print(data, HEX);
     Serial.print(","); // Add value and comma
     line_len++;
     if (line_len >= 32) {
@@ -775,25 +788,111 @@ bool showJpeg(FS fs, String filename, int x, int y) {
       Serial.println();
     }
     */
-  }  
-  
+  }
+
   picture.close();
 
   bool decoded = false;
   if (data_array) {
     decoded = JpegDec.decodeArray(data_array, data_size);
-  } else { 
+  } else {
     displayError(filename + " Fail");
     delay(2500);
     delete[] data_array; // free heap before leaving
     return false;
   }
-  
+
   if (decoded) {
     jpegRender(x, y);
   }
-  
+
   delete[] data_array; // free heap before leaving
-  return true; 
+  return true;
 }
 
+
+/***************************************************************************************
+** Function name: getComplementaryColor
+** Description:   Get complementary color in RGB565 format
+***************************************************************************************/
+uint16_t getComplementaryColor(uint16_t color) {
+  double r = ((color >> 11) & 0x1F) / 31.0;
+  double g = ((color >> 5) & 0x3F) / 63.0;
+  double b = (color & 0x1F) / 31.0;
+
+  double cmax = fmax(r, fmax(g, b));
+  double cmin = fmin(r, fmin(g, b));
+  double delta = cmax - cmin;
+
+  double hue = 0.0;
+  if (delta == 0) hue = 0.0;
+  else if (cmax == r) hue = 60 * fmod((g-b) / delta, 6);
+  else if (cmax == g) hue = 60 * ((b-r) / delta + 2);
+  else hue = 60 * ((r-g) / delta + 4);
+
+  if (hue < 0) hue += 360;
+
+  double lightness = (cmax + cmin) / 2;
+  double saturation = (delta == 0) ? 0 : delta / (1 - std::abs(2 * lightness - 1));
+
+  double compHue = fmod(hue + 180, 360);
+
+  double c = (1 - std::abs(2 * lightness - 1)) * saturation;
+  double x = c * (1 - std::abs(fmod(compHue / 60, 2) - 1));
+  double m = lightness - c / 2;
+
+  double compR = 0, compG = 0, compB = 0;
+  if (compHue >= 0 && compHue < 60) {
+    compR = c;
+    compG = x;
+  } else if (compHue >= 60 && compHue < 120) {
+    compR = x;
+    compG = c;
+  } else if (compHue >= 120 && compHue < 180) {
+    compG = c;
+    compB = x;
+  } else if (compHue >= 180 && compHue < 240) {
+    compG = x;
+    compB = c;
+  } else if (compHue >= 240 && compHue < 300) {
+    compB = c;
+    compR = x;
+  } else {
+    compB = x;
+    compR = c;
+  }
+
+  uint16_t compl_color = uint8_t(compR * 31) << 11 | uint8_t(compG * 63) << 5 | uint8_t(compB * 31);
+
+  // change black color
+  if (compl_color == 0) compl_color = color - 0x1111;
+
+  return compl_color;
+}
+
+
+/***************************************************************************************
+** Function name: getColorVariation
+** Description:   Get a variation of color in RGB565 format
+***************************************************************************************/
+uint16_t getColorVariation(uint16_t color, int delta, int direction) {
+  uint8_t r = ((color >> 11) & 0x1F);
+  uint8_t g = ((color >> 5) & 0x3F);
+  uint8_t b = (color & 0x1F);
+
+  float brightness = 0.299*r/31 + 0.587*g/63 + 0.114*b/31;
+
+  if (direction < 0 || (direction == 0 && brightness >= 0.5)) {
+    r = max(0, r-delta);
+    g = max(0, g-2*delta);
+    b = max(0, b-delta);
+  } else {
+    r = min(31, r+delta);
+    g = min(63, g+2*delta);
+    b = min(31, b+delta);
+  }
+
+  uint16_t compl_color = r << 11 | g << 5 | b;
+
+  return compl_color;
+}
diff --git a/src/core/display.h b/src/core/display.h
index 1b38971..8402a6c 100644
--- a/src/core/display.h
+++ b/src/core/display.h
@@ -15,6 +15,9 @@
 
 bool showJpeg(FS fs,String filename, int x=0, int y=0);
 
+uint16_t getComplementaryColor(uint16_t color);
+uint16_t getColorVariation(uint16_t color, int delta = 10, int direction = 0);
+
 void resetTftDisplay(int x = 0, int y = 0, uint16_t fc = FGCOLOR, int size = FM, uint16_t bg = BGCOLOR, uint16_t screen = BGCOLOR);
 void setTftDisplay(int x = 0, int y = 0, uint16_t fc = tft.textcolor, int size = tft.textsize, uint16_t bg = tft.textbgcolor);
 
diff --git a/src/core/eeprom.cpp b/src/core/eeprom.cpp
index 6dfd5e0..03d4210 100644
--- a/src/core/eeprom.cpp
+++ b/src/core/eeprom.cpp
@@ -56,7 +56,7 @@ void load_eeprom() {
         IrRx = GROVE_SCL;
         RfTx = GROVE_SDA;
         RfRx = GROVE_SCL;
-        FGCOLOR = 0xA80F;
+        FGCOLOR = DEFAULTFGCOLOR;
         tmz = 0;
         RfModule = M5_RF_MODULE;
         RfidModule = M5_RFID2_MODULE;
diff --git a/src/core/globals.h b/src/core/globals.h
index 9187902..e4e066d 100644
--- a/src/core/globals.h
+++ b/src/core/globals.h
@@ -3,6 +3,7 @@
 
 //#define FGCOLOR TFT_PURPLE+0x3000
 extern char16_t FGCOLOR;
+#define DEFAULTFGCOLOR 0xA80F
 #define ALCOLOR TFT_RED
 #define BGCOLOR TFT_BLACK
 
diff --git a/src/core/main_menu.cpp b/src/core/main_menu.cpp
index 82cbdee..2a7c95b 100644
--- a/src/core/main_menu.cpp
+++ b/src/core/main_menu.cpp
@@ -11,14 +11,14 @@ MainMenu::MainMenu() {
         &rfidMenu,
         &irMenu,
         &fmMenu,
-        &othersMenu,
-        &clockMenu,
-    #if !defined(CORE) && !defined(CORE2)
-        &scriptsMenu,
-    #endif
     #if defined(USE_NRF24_VIA_SPI)
         &nrf24Menu,
     #endif
+    #if !defined(CORE) && !defined(CORE2)
+        &scriptsMenu,
+    #endif
+        &othersMenu,
+        &clockMenu,
         &configMenu,
     };
 
diff --git a/src/core/menu_items/ScriptsMenu.cpp b/src/core/menu_items/ScriptsMenu.cpp
index ebc99f2..e2b2ef1 100644
--- a/src/core/menu_items/ScriptsMenu.cpp
+++ b/src/core/menu_items/ScriptsMenu.cpp
@@ -5,37 +5,62 @@
 #include "modules/bjs_interpreter/interpreter.h" // for JavaScript interpreter
 
 
-void ScriptsMenu::optionsMenu() {
-        
-    String Folder = "/scripts";
-    FS* fs = NULL;
-    if(SD.exists(Folder)) fs = &SD;
-    if(LittleFS.exists(Folder)) fs = &LittleFS;
-    if(!fs) return;  // dir not found
-    
-    //String fileList[MAXFILES][3];
-    //readFs(fs, Folder, fileList, "bjs");
-
-    options = { };
-    
-    File root = fs->open(Folder);
-    if (!root || !root.isDirectory()) return; // not a dir
+String getScriptsFolder(FS *&fs) {
+    String folder;
+    String possibleFolders[] = {"/scripts", "/BruceScripts", "/BruceJS"};
+    int listSize = sizeof(possibleFolders) / sizeof(possibleFolders[0]);
+
+    for (int i = 0; i < listSize; i++) {
+        if(SD.exists(possibleFolders[i])) {
+            fs = &SD;
+            return possibleFolders[i];
+        }
+        if(LittleFS.exists(possibleFolders[i])) {
+            fs = &LittleFS;
+            return possibleFolders[i];
+        }
+    }
+    return "";
+}
+
+
+std::vector<Option> getScriptsOptionsList() {
+    std::vector<Option> opt = {};
+    FS* fs;
+    String folder = getScriptsFolder(fs);
+    if(folder == "") return opt;  // did not find
+
+
+    File root = fs->open(folder);
+    if (!root || !root.isDirectory()) return opt; // not a dir
     File file2 = root.openNextFile();
-    
+
     while (file2) {
         if (file2.isDirectory()) continue;
+
         String fileName = String(file2.name());
         if( ! fileName.endsWith(".js") && ! fileName.endsWith(".bjs")) continue;
-        // else append to the choices
-        String entry_title = String(file2.name()); entry_title = entry_title.substring(0, entry_title.lastIndexOf("."));  // remove the extension
-        options.push_back({entry_title.c_str(), [=]() { run_bjs_script_headless(*fs, file2.path()); }});
+
+        String entry_title = String(file2.name());
+        entry_title = entry_title.substring(0, entry_title.lastIndexOf("."));  // remove the extension
+        opt.push_back(
+            {entry_title.c_str(), [=]() { run_bjs_script_headless(*fs, file2.path()); }}
+        );
+
         file2 = root.openNextFile();
     }
     file2.close();
     root.close();
-    
-    options.push_back({"Load...", [=]()   { run_bjs_script(); }});
-    options.push_back({"Main Menu", [=]() { backToMenu(); }});
+
+    return opt;
+}
+
+
+void ScriptsMenu::optionsMenu() {
+    options = getScriptsOptionsList();
+
+    options.push_back({"Load...",   [=]() { run_bjs_script(); }});
+    options.push_back({"Main Menu", [=]() { backToMenu();     }});
 
     delay(200);
     loopOptions(options,false,true,"Scripts");
@@ -46,11 +71,16 @@ String ScriptsMenu::getName() {
 }
 
 void ScriptsMenu::draw() {
-    // draw the icon
     tft.fillRect(iconX,iconY,80,80,BGCOLOR);
-    int i=0;
-    for(i=0;i<6;i++) {
-        tft.drawArc(40+iconX,40+iconY,30,20,15+60*i,45+60*i,FGCOLOR,BGCOLOR,true);
-    }
-    tft.drawArc(40+iconX,40+iconY,22,8,0,360,FGCOLOR,BGCOLOR,false);
+
+    tft.drawRect(15+iconX, 5+iconY, 50, 70, FGCOLOR);
+    tft.fillRect(50+iconX, 5+iconY, 15, 15, BGCOLOR);
+    tft.drawTriangle(50+iconX, 5+iconY, 50+iconX, 19+iconY, 64+iconX, 19+iconY, FGCOLOR);
+
+    tft.drawLine(25+iconX, 45+iconY, 30+iconX, 50+iconY, FGCOLOR);
+    tft.drawLine(25+iconX, 45+iconY, 30+iconX, 40+iconY, FGCOLOR);
+    tft.drawLine(35+iconX, 50+iconY, 45+iconX, 40+iconY, FGCOLOR);
+    tft.drawLine(55+iconX, 45+iconY, 50+iconX, 50+iconY, FGCOLOR);
+    tft.drawLine(55+iconX, 45+iconY, 50+iconX, 40+iconY, FGCOLOR);
+
 }
\ No newline at end of file
diff --git a/src/core/sd_functions.cpp b/src/core/sd_functions.cpp
index 3530af7..45ac1cd 100644
--- a/src/core/sd_functions.cpp
+++ b/src/core/sd_functions.cpp
@@ -310,7 +310,7 @@ String readSmallFile(FS &fs, String filepath) {
       return "";
   }
   // TODO: if(psramFound()) -> use PSRAM instead
-  
+
   fileContent = file.readString();
 
   file.close();
@@ -399,7 +399,7 @@ void readFs(FS fs, String folder, String allowed_ext) {
     int allFilesCount = 0;
     fileList.clear();
     FileList object;
-    
+
     File root = fs.open(folder);
     if (!root || !root.isDirectory()) {
         //Serial.println("Não foi possível abrir o diretório");
@@ -425,7 +425,7 @@ void readFs(FS fs, String folder, String allowed_ext) {
     int new_sort_start=fileList.size();
 
     //Add files to the list
-    root = fs.open(folder);    
+    root = fs.open(folder);
     File file2 = root.openNextFile();
     while (file2) {
         String fileName = file2.name();
@@ -448,7 +448,7 @@ void readFs(FS fs, String folder, String allowed_ext) {
 
     // Order file list
     std::sort(fileList.begin()+new_sort_start, fileList.end(), sortList);
-    
+
     // Adds Operational btn at the botton
     object.filename = "> Back";
     object.folder=false;
@@ -640,7 +640,7 @@ String loopSD(FS &fs, bool filePicker, String allowed_ext) {
               showJpeg(fs, filepath);
               delay(750);
               while(!checkAnyKeyPress()) yield();
-            }});          
+            }});
           if(filepath.endsWith(".ir")) options.insert(options.begin(), {"IR Tx SpamAll",  [&]() {
               delay(200);
               txIrFile(&fs, filepath);
@@ -832,7 +832,7 @@ void viewFile(FS fs, String filepath) {
   while(1) {
     if(updateContent) {
       tft.fillScreen(BGCOLOR);
-      tft.setCursor(0,0);
+      tft.setCursor(0,4);
       tft.setTextSize(FP);
 
       displayText = fileContent.substring(
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index f043119..56d25b9 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -141,11 +141,11 @@ void setBrightnessMenu() {
   else if(bright== 1) idx=4;
 
   options = {
-    {"100%", [=]() { setBrightness(100); }, bright == 100 ? true:false },
-    {"75 %", [=]() { setBrightness(75);  }, bright == 75 ? true:false},
-    {"50 %", [=]() { setBrightness(50);  }, bright == 50 ? true:false},
-    {"25 %", [=]() { setBrightness(25);  }, bright == 25 ? true:false},
-    {" 0 %", [=]() { setBrightness(1);   }, bright == 1 ? true:false},
+    {"100%", [=]() { setBrightness(100); }, bright == 100 },
+    {"75 %", [=]() { setBrightness(75);  }, bright == 75 },
+    {"50 %", [=]() { setBrightness(50);  }, bright == 50 },
+    {"25 %", [=]() { setBrightness(25);  }, bright == 25 },
+    {" 1 %", [=]() { setBrightness(1);   }, bright == 1 },
     {"Main Menu", [=]() { backToMenu(); }},
   };
   delay(200);
@@ -201,26 +201,29 @@ void setDimmerTimeMenu() {
 **  Function: setUIColor
 **  Set and store main UI color
 **********************************************************************/
+#define LIGHT_BLUE 0x96FE
 void setUIColor(){
   int idx=0;
-  if(FGCOLOR==0xA80F) idx=0;
+  if(FGCOLOR==DEFAULTFGCOLOR) idx=0;
   else if(FGCOLOR==TFT_WHITE) idx=1;
   else if(FGCOLOR==TFT_RED) idx=2;
   else if(FGCOLOR==TFT_DARKGREEN) idx=3;
   else if(FGCOLOR==TFT_BLUE) idx=4;
-  else if(FGCOLOR==TFT_YELLOW) idx=5;
-  else if(FGCOLOR==TFT_MAGENTA) idx=6;
-  else if(FGCOLOR==TFT_ORANGE) idx=7;
+  else if(FGCOLOR==LIGHT_BLUE) idx=5;
+  else if(FGCOLOR==TFT_YELLOW) idx=6;
+  else if(FGCOLOR==TFT_MAGENTA) idx=7;
+  else if(FGCOLOR==TFT_ORANGE) idx=8;
 
   options = {
-    {"Default",   [&]() { FGCOLOR=0xA80F;        }, FGCOLOR==0xA80F        ? true:false},
-    {"White",     [&]() { FGCOLOR=TFT_WHITE;     }, FGCOLOR==TFT_WHITE     ? true:false},
-    {"Red",       [&]() { FGCOLOR=TFT_RED;       }, FGCOLOR==TFT_RED       ? true:false},
-    {"Green",     [&]() { FGCOLOR=TFT_DARKGREEN; }, FGCOLOR==TFT_DARKGREEN ? true:false},
-    {"Blue",      [&]() { FGCOLOR=TFT_BLUE;      }, FGCOLOR==TFT_BLUE      ? true:false},
-    {"Yellow",    [&]() { FGCOLOR=TFT_YELLOW;    }, FGCOLOR==TFT_YELLOW    ? true:false},
-    {"Magenta",   [&]() { FGCOLOR=TFT_MAGENTA;   }, FGCOLOR==TFT_MAGENTA   ? true:false},
-    {"Orange",    [&]() { FGCOLOR=TFT_ORANGE;    }, FGCOLOR==TFT_ORANGE    ? true:false},
+    {"Default",   [&]() { FGCOLOR=DEFAULTFGCOLOR;}, FGCOLOR==DEFAULTFGCOLOR},
+    {"White",     [&]() { FGCOLOR=TFT_WHITE;     }, FGCOLOR==TFT_WHITE     },
+    {"Red",       [&]() { FGCOLOR=TFT_RED;       }, FGCOLOR==TFT_RED       },
+    {"Green",     [&]() { FGCOLOR=TFT_DARKGREEN; }, FGCOLOR==TFT_DARKGREEN },
+    {"Blue",      [&]() { FGCOLOR=TFT_BLUE;      }, FGCOLOR==TFT_BLUE      },
+    {"Light Blue",[&]() { FGCOLOR=LIGHT_BLUE;    }, FGCOLOR==LIGHT_BLUE    },
+    {"Yellow",    [&]() { FGCOLOR=TFT_YELLOW;    }, FGCOLOR==TFT_YELLOW    },
+    {"Magenta",   [&]() { FGCOLOR=TFT_MAGENTA;   }, FGCOLOR==TFT_MAGENTA   },
+    {"Orange",    [&]() { FGCOLOR=TFT_ORANGE;    }, FGCOLOR==TFT_ORANGE    },
     {"Main Menu", [=]() { backToMenu(); }},
   };
   delay(200);
diff --git a/src/modules/wifi/evil_portal.cpp b/src/modules/wifi/evil_portal.cpp
index 268e71f..53502ef 100644
--- a/src/modules/wifi/evil_portal.cpp
+++ b/src/modules/wifi/evil_portal.cpp
@@ -9,33 +9,32 @@ WebServer* ep= nullptr;               // initialise webserver
 DNSServer dnsServer;
 
 String html_file, last_cred;
+String output_file = "creds.csv";
 String AP_name = "Free Wifi";
 int totalCapturedCredentials = 0;
 int previousTotalCapturedCredentials = -1;  // stupid hack but wtfe
 String capturedCredentialsHtml = "";
 
 void handleCreds() {
-      String html_temp = "<li>";
-      String csvLine = "";
-      last_cred="";
-      for (int i = 0; i < ep->args(); i++) {
+    String html_temp = "<li>";
+    String csvLine = "";
+    last_cred="";
+    for (int i = 0; i < ep->args(); i++) {
         String tmp=ep->argName(i);
         if(tmp=="q" || tmp.startsWith("cup2") || tmp.startsWith("plain") || tmp=="P1" || tmp=="P2" || tmp=="P3" || tmp=="P4") continue;
         else {
-          html_temp += ep->argName(i) + ": " + ep->arg(i) + "<br>\n";
-          // Prepara dados para salvar no SD
-          if (i != 0) {
-            csvLine += ",";
-          }
-          csvLine += ep->argName(i) + ": " + ep->arg(i);
-          last_cred += ep->argName(i).substring(0,3) + ": " + ep->arg(i) + "\n";
+            html_temp += ep->argName(i) + ": " + ep->arg(i) + "<br>\n";
+            // Prepara dados para salvar no SD
+            if (i != 0) csvLine += ",";
+            csvLine += ep->argName(i) + ": " + ep->arg(i);
+            last_cred += ep->argName(i).substring(0,3) + ": " + ep->arg(i) + "\n";
         }
-      }
-      html_temp += "</li>\n";
-      saveToCSV("/Bruce_creds.csv", csvLine);
-      capturedCredentialsHtml = html_temp + capturedCredentialsHtml;
-      totalCapturedCredentials++;
-      ep->send(200, "text/html", getHtmlContents("Please, Wait a few minutes. Soon you'll be able to access internet."));
+    }
+    html_temp += "</li>\n";
+    saveToCSV(csvLine);
+    capturedCredentialsHtml = html_temp + capturedCredentialsHtml;
+    totalCapturedCredentials++;
+    ep->send(200, "text/html", getHtmlContents("Please, Wait a few minutes. Soon you'll be able to access internet."));
 }
 
 void startEvilPortal(String tssid, uint8_t channel, bool deauth) {
@@ -86,7 +85,7 @@ void startEvilPortal(String tssid, uint8_t channel, bool deauth) {
 
         tmp=millis();
         while(millis() - tmp < 3000) yield();
-      
+
         if(psramFound()) ep=(WebServer*)ps_malloc(sizeof(WebServer));
         else ep=(WebServer*)malloc(sizeof(WebServer));
 
@@ -199,18 +198,22 @@ void startEvilPortal(String tssid, uint8_t channel, bool deauth) {
 }
 
 // Função para salvar dados no arquivo CSV
-void saveToCSV(const String &filename, const String &csvLine) {
-  FS *fs;
-  if(setupSdCard()) fs=&SD;
-  else fs=&LittleFS;
-  File file = (*fs).open(filename, FILE_APPEND);
-  if (!file) {
-    log_i("Error to open file");
-    return;
-  }
-  file.println(csvLine);
-  file.close();
-  log_i("data saved");
+void saveToCSV(const String &csvLine) {
+    FS *fs;
+    if(!getFsStorage(fs)) {
+        log_i("Error getting FS storage");
+        return;
+    }
+
+    if (!(*fs).exists("/BruceEvilCreds")) (*fs).mkdir("/BruceEvilCreds");
+    File file = (*fs).open("/BruceEvilCreds/"+output_file, FILE_APPEND);
+    if (!file) {
+        log_i("Error to open file");
+        return;
+    }
+    file.println(csvLine);
+    file.close();
+    log_i("data saved");
 }
 
 String getDefaultHtml() {
@@ -272,26 +275,33 @@ String clear_GET() {
 }
 
 void chooseHtml(bool def) {
-  FS *fs;
-  if(def) {
-    if(setupSdCard()) {
-      options = {
-        {"SD Card", [&]()  { fs=&SD; }},
-        {"LittleFS", [&]()   { fs=&LittleFS; }},
-      };
-      delay(200);
-      loopOptions(options);
-    } else fs=&LittleFS;
-
-    html_file = loopSD(*fs,true);
-    if(html_file.endsWith(".html")) {
-      File html = (*fs).open(html_file, FILE_READ);
-      html_file = html.readString();
-      html.close();
+    FS *fs;
+    if(def) {
+        if(setupSdCard()) {
+            options = {
+                {"SD Card",  [&]() { fs=&SD; }},
+                {"LittleFS", [&]() { fs=&LittleFS; }},
+            };
+            delay(200);
+            loopOptions(options);
+        } else fs=&LittleFS;
+
+        html_file = loopSD(*fs,true);
+        if(html_file.endsWith(".html")) {
+            String html_name = html_file.substring(html_file.lastIndexOf("/"), html_file.length()-5);
+            html_name.toLowerCase();
+
+            File html = (*fs).open(html_file, FILE_READ);
+            html_file = html.readString();
+            html.close();
+            output_file = html_name + "_creds.csv";
+        } else {
+            html_file = index_GET();
+            output_file = "default_creds.csv";
+        }
     } else {
-      html_file = index_GET();
+        html_file = index_GET();
+        output_file = "default_creds.csv";
     }
-  } else {
-    html_file = index_GET();
-  }
+    Serial.println("Evil Portal output file "+output_file);
 }
diff --git a/src/modules/wifi/evil_portal.h b/src/modules/wifi/evil_portal.h
index 7ce1cc5..c1e0f84 100644
--- a/src/modules/wifi/evil_portal.h
+++ b/src/modules/wifi/evil_portal.h
@@ -24,5 +24,5 @@ String ssid_GET();
 
 String ssid_POST();
 
-void saveToCSV(const String &filename, const String &csvLine);
+void saveToCSV(const String &csvLine);