diff --git a/Tactility/Source/app/chat/ChatSettings.cpp b/Tactility/Source/app/chat/ChatSettings.cpp
index 4cfe01a0f..e597fafad 100644
--- a/Tactility/Source/app/chat/ChatSettings.cpp
+++ b/Tactility/Source/app/chat/ChatSettings.cpp
@@ -7,10 +7,10 @@
 #include <Tactility/app/chat/ChatSettings.h>
 #include <Tactility/app/chat/ChatProtocol.h>
 
-#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 
+#include <app/paths.h>
 #include <crypt/crypt.h>
 
 #include <esp_random.h>
@@ -28,7 +28,11 @@ namespace tt::app::chat {
 constexpr auto* TAG = "ChatSettings";
 
 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/chat.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("Chat", "chat.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }
 
 constexpr auto* KEY_SENDER_ID = "senderId";
diff --git a/Tactility/Source/service/development/DevelopmentSettings.cpp b/Tactility/Source/service/development/DevelopmentSettings.cpp
index 676545130..b863b2b3d 100644
--- a/Tactility/Source/service/development/DevelopmentSettings.cpp
+++ b/Tactility/Source/service/development/DevelopmentSettings.cpp
@@ -1,11 +1,11 @@
 #ifdef ESP_PLATFORM
-#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/service/development/DevelopmentSettings.h>
 #include <map>
 #include <string>
 
+#include <app/paths.h>
 #include <tactility/log.h>
 
 namespace tt::service::development {
@@ -13,7 +13,11 @@ namespace tt::service::development {
 constexpr auto* TAG = "DevSettings";
 
 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/development.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("Development", "development.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }
 
 constexpr auto* SETTINGS_KEY_ENABLE_ON_BOOT = "enableOnBoot";
diff --git a/Tactility/Source/settings/DisplaySettings.cpp b/Tactility/Source/settings/DisplaySettings.cpp
index e0ac8b4b5..25d7e192f 100644
--- a/Tactility/Source/settings/DisplaySettings.cpp
+++ b/Tactility/Source/settings/DisplaySettings.cpp
@@ -2,7 +2,8 @@
 
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/DeprecatedPaths.h>
+
+#include <app/paths.h>
 
 #include <map>
 #include <string>
@@ -11,7 +12,11 @@
 namespace tt::settings::display {
 
 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/display.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("Display", "display.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }
 
 constexpr auto* SETTINGS_KEY_ORIENTATION = "orientation";
diff --git a/Tactility/Source/settings/TrackballSettings.cpp b/Tactility/Source/settings/TrackballSettings.cpp
index 938127f5e..d5e8c0d56 100644
--- a/Tactility/Source/settings/TrackballSettings.cpp
+++ b/Tactility/Source/settings/TrackballSettings.cpp
@@ -1,7 +1,8 @@
 #include <Tactility/settings/TrackballSettings.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/DeprecatedPaths.h>
+
+#include <app/paths.h>
 
 #include <map>
 #include <string>
@@ -10,7 +11,11 @@
 namespace tt::settings::trackball {
 
 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/trackball.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("TrackballSettings", "trackball.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }
 
 constexpr auto* KEY_TRACKBALL_ENABLED = "trackballEnabled";
diff --git a/Tactility/Source/settings/WebServerSettings.cpp b/Tactility/Source/settings/WebServerSettings.cpp
index 3a3817a28..09312e539 100644
--- a/Tactility/Source/settings/WebServerSettings.cpp
+++ b/Tactility/Source/settings/WebServerSettings.cpp
@@ -1,8 +1,8 @@
-#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/settings/WebServerSettings.h>
 
+#include <app/paths.h>
 #include <tactility/log.h>
 
 #include <charconv>
@@ -22,7 +22,11 @@ namespace tt::settings::webserver {
 constexpr auto* TAG = "WebServerSettings";
 
 static std::string getSettingsFilePath() {
-    return getUserDataPath() + "/settings/webserver.properties";
+    char path[256];
+    if (app_paths_get_user_data_path("WebServerSettings", "webserver.properties", path, sizeof(path)) != ERROR_NONE) {
+        return "";
+    }
+    return path;
 }
 
 // Property keys