diff --git a/esp32/lib/ESP32-sveltekit/APSettingsService.h b/esp32/lib/ESP32-sveltekit/APSettingsService.h
index e5edddf..81f6042 100644
--- a/esp32/lib/ESP32-sveltekit/APSettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/APSettingsService.h
@@ -21,6 +21,7 @@
 #include <JsonUtils.h>
 #include <WiFi.h>
 #include <Timing.h>
+#include <ESPFS.h>
 
 #include <DNSServer.h>
 #include <IPAddress.h>
@@ -61,7 +62,6 @@
 #define FACTORY_AP_MAX_CLIENTS 4
 #endif
 
-#define AP_SETTINGS_FILE "/config/apSettings.json"
 #define AP_SETTINGS_SERVICE_PATH "/api/apSettings"
 
 #define AP_MODE_ALWAYS 0
diff --git a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
index e8c7def..a336806 100644
--- a/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/CameraSettingsService.h
@@ -13,8 +13,8 @@ namespace Camera {
 #include <SettingValue.h>
 #include <StatefulService.h>
 #include <esp_camera.h>
+#include <ESPFS.h>
 
-#define CAMERA_SETTINGS_FILE "/config/cameraSettings.json"
 #define EVENT_CAMERA_SETTINGS "CameraSettings"
 #define CAMERA_SETTINGS_PATH "/api/camera/settings"
 
diff --git a/esp32/lib/ESP32-sveltekit/ESPFS.h b/esp32/lib/ESP32-sveltekit/ESPFS.h
index 3ec3a6c..46e5ac5 100644
--- a/esp32/lib/ESP32-sveltekit/ESPFS.h
+++ b/esp32/lib/ESP32-sveltekit/ESPFS.h
@@ -1,21 +1,13 @@
-#ifndef ESPFS_H_
-#define ESPFS_H_
-
-/**
- *   ESP32 SvelteKit
- *
- *   A simple, secure and extensible framework for IoT projects for ESP32 platforms
- *   with responsive Sveltekit front-end built with TailwindCSS and DaisyUI.
- *   https://github.com/theelims/ESP32-sveltekit
- *
- *   Copyright (C) 2018 - 2023 rjwats
- *   Copyright (C) 2023 theelims
- *
- *   All Rights Reserved. This software may be modified and distributed under
- *   the terms of the LGPL v3 license. See the LICENSE file for details.
- **/
+#pragma once
 
 #include <LittleFS.h>
+
 #define ESPFS LittleFS
 
-#endif
\ No newline at end of file
+#define AP_SETTINGS_FILE "/config/apSettings.json"
+#define CAMERA_SETTINGS_FILE "/config/cameraSettings.json"
+#define FS_CONFIG_DIRECTORY "/config"
+#define NTP_SETTINGS_FILE "/config/ntpSettings.json"
+#define DEVICE_CONFIG_FILE "/config/peripheral.json"
+#define SECURITY_SETTINGS_FILE "/config/securitySettings.json"
+#define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
\ No newline at end of file
diff --git a/esp32/lib/ESP32-sveltekit/FactoryResetService.h b/esp32/lib/ESP32-sveltekit/FactoryResetService.h
index 18b4396..9111583 100644
--- a/esp32/lib/ESP32-sveltekit/FactoryResetService.h
+++ b/esp32/lib/ESP32-sveltekit/FactoryResetService.h
@@ -21,8 +21,8 @@
 #include <SecurityManager.h>
 #include <RestartService.h>
 #include <FS.h>
+#include <ESPFS.h>
 
-#define FS_CONFIG_DIRECTORY "/config"
 #define FACTORY_RESET_SERVICE_PATH "/api/factoryReset"
 
 class FactoryResetService {
diff --git a/esp32/lib/ESP32-sveltekit/NTPSettingsService.h b/esp32/lib/ESP32-sveltekit/NTPSettingsService.h
index 5eeabd2..a7c80a8 100644
--- a/esp32/lib/ESP32-sveltekit/NTPSettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/NTPSettingsService.h
@@ -18,6 +18,7 @@
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
 #include <WiFi.h>
+#include <ESPFS.h>
 
 #include <time.h>
 #include <lwip/apps/sntp.h>
@@ -38,7 +39,6 @@
 #define FACTORY_NTP_SERVER "time.google.com"
 #endif
 
-#define NTP_SETTINGS_FILE "/config/ntpSettings.json"
 #define NTP_SETTINGS_SERVICE_PATH "/api/ntpSettings"
 
 #define TIME_PATH "/api/time"
diff --git a/esp32/lib/ESP32-sveltekit/Peripherals.h b/esp32/lib/ESP32-sveltekit/Peripherals.h
index 5da1af2..cd36b74 100644
--- a/esp32/lib/ESP32-sveltekit/Peripherals.h
+++ b/esp32/lib/ESP32-sveltekit/Peripherals.h
@@ -8,6 +8,7 @@
 #include <StatefulService.h>
 #include <MathUtils.h>
 #include <Timing.h>
+#include <ESPFS.h>
 
 #include <list>
 #include <SPI.h>
@@ -21,7 +22,6 @@
 #include <Adafruit_ADS1X15.h>
 #include <NewPing.h>
 
-#define DEVICE_CONFIG_FILE "/config/peripheral.json"
 #define EVENT_CONFIGURATION_SETTINGS "peripheralSettings"
 #define CONFIGURATION_SETTINGS_PATH "/api/peripheral/settings"
 
diff --git a/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h b/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h
index 3b29f9c..f8ef463 100644
--- a/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/SecuritySettingsService.h
@@ -20,6 +20,7 @@
 #include <SecurityManager.h>
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
+#include <ESPFS.h>
 
 #ifndef FACTORY_JWT_SECRET
 #define FACTORY_JWT_SECRET "#{random}-#{random}"
@@ -41,7 +42,6 @@
 #define FACTORY_GUEST_PASSWORD "guest"
 #endif
 
-#define SECURITY_SETTINGS_FILE "/config/securitySettings.json"
 #define SECURITY_SETTINGS_PATH "/api/securitySettings"
 
 #define GENERATE_TOKEN_PATH "/api/generateToken"
diff --git a/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h b/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h
index aa7082b..aa2eb2f 100644
--- a/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h
+++ b/esp32/lib/ESP32-sveltekit/WiFiSettingsService.h
@@ -28,6 +28,7 @@
 #include <WiFiMulti.h>
 #include <vector>
 #include <Timing.h>
+#include <ESPFS.h>
 
 #ifndef FACTORY_WIFI_SSID
 #define FACTORY_WIFI_SSID ""
@@ -45,7 +46,6 @@
 #define FACTORY_WIFI_RSSI_THRESHOLD -80
 #endif
 
-#define WIFI_SETTINGS_FILE "/config/wifiSettings.json"
 #define WIFI_SETTINGS_SERVICE_PATH "/api/wifiSettings"
 
 #define WIFI_RECONNECTION_DELAY 1000 * 30