diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp
index 44fa7af68..003c14e98 100644
--- a/esp32_marauder/EvilPortal.cpp
+++ b/esp32_marauder/EvilPortal.cpp
@@ -92,6 +92,7 @@ bool EvilPortal::setHtml() {
     return true;
   }
   Serial.println("Setting HTML...");
+#ifdef HAS_SD
   File html_file = sd_obj.getFile("/" + this->target_html_name);
   if (!html_file) {
     #ifdef HAS_SCREEN
@@ -123,6 +124,7 @@ bool EvilPortal::setHtml() {
     html_file.close();
     return true;
   }
+#endif
 
 }
 
@@ -136,6 +138,7 @@ bool EvilPortal::setAP(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_
       break;
     }
   }
+#ifdef HAS_SD
   // If there are no SSIDs and there are no APs selected, pull from file
   // This means the file is last resort
   if ((ssids->size() <= 0) && (temp_ap_name == "")) {
@@ -177,9 +180,10 @@ bool EvilPortal::setAP(LinkedList<ssid>* ssids, LinkedList<AccessPoint>* access_
       ap_config_file.close();
     }
   }
+#endif
   // There are SSIDs in the list but there could also be an AP selected
   // Priority is SSID list before AP selected and config file
-  else if (ssids->size() > 0) {
+  if (ssids->size() > 0) {
     ap_config = ssids->get(0).essid;
     if (ap_config.length() > MAX_AP_NAME_SIZE) {
       #ifdef HAS_SCREEN
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
index 3e7eee4b3..8670a4ef8 100644
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -10,7 +10,7 @@
   //#define MARAUDER_M5STICKC
   //#define MARAUDER_MINI
   //#define MARAUDER_V4
-  #define MARAUDER_V6
+  //#define MARAUDER_V6
   //#define MARAUDER_V6_1
   //#define MARAUDER_KIT
   //#define GENERIC_ESP32
@@ -18,6 +18,7 @@
   //#define ESP32_LDDB
   //#define MARAUDER_DEV_BOARD_PRO
   //#define XIAO_ESP32_S3
+  #define MARAUDER_FEBERIS_BOARD
   //// END BOARD TARGETS
 
   #define MARAUDER_VERSION "v0.13.7"
@@ -43,6 +44,8 @@
     #define HARDWARE_NAME "Flipper Zero Dev Board Pro"
   #elif defined(XIAO_ESP32_S3)
     #define HARDWARE_NAME "XIAO ESP32 S3"
+  #elif defined(MARAUDER_FEBERIS_BOARD)
+    #define HARDWARE_NAME "BPM Circuits FEBERIS"
   #else
     #define HARDWARE_NAME "ESP32"
   #endif
@@ -188,6 +191,20 @@
     //#define HAS_TEMP_SENSOR
     //#define HAS_GPS
   #endif
+
+  #ifdef MARAUDER_FEBERIS_BOARD
+    #define FLIPPER_ZERO_HAT
+    //#define HAS_BATTERY
+    #define HAS_BT
+    //#define HAS_BUTTONS
+    #define HAS_NEOPIXEL_LED
+    //#define HAS_PWR_MGMT
+    //#define HAS_SCREEN
+    //#define HAS_SD
+    //#define USE_SD
+    //#define HAS_TEMP_SENSOR
+    //#define HAS_GPS
+  #endif
   //// END BOARD FEATURES
 
   //// POWER MANAGEMENT
@@ -740,6 +757,8 @@
     #define MEM_LOWER_LIM 20000
   #elif defined(XIAO_ESP32_S3)
     #define MEM_LOWER_LIM 20000
+  #elif defined(MARAUDER_FEBERIS_BOARD)
+    #define MEM_LOWER_LIM 20000
   #endif
   //// END MEMORY LOWER LIMIT STUFF
 
@@ -778,6 +797,8 @@
     #define MAX_HTML_SIZE 20000
   #elif defined(XIAO_ESP32_S3)
     #define MAX_HTML_SIZE 20000
+  #elif defined(MARAUDER_FEBERIS_BOARD)
+    #define MAX_HTML_SIZE 11400
   #else
     #define MAX_HTML_SIZE 20000
   #endif
@@ -820,6 +841,11 @@
       #define GPS_TX 33
       #define GPS_RX 32
       #define mac_history_len 512
+    #elif defined(MARAUDER_FEBERIS_BOARD)
+      #define GPS_SERIAL_INDEX 2
+      #define GPS_TX 4
+      #define GPS_RX 13
+      #define mac_history_len 512
     #endif
   #else
     #define mac_history_len 512
@@ -835,6 +861,8 @@
     #define MARAUDER_TITLE_BYTES 13578
   #elif defined(MARAUDER_MINI)
     #define MARAUDER_TITLE_BYTES 13578
+  #elif defined(MARAUDER_FEBERIS_BOARD)
+    #define MARAUDER_TITLE_BYTES 13578
   #else
     #define MARAUDER_TITLE_BYTES 13578
   #endif