Index: leahi.pro
===================================================================
diff -u -r9363dbc93c2be5d664c0ca2a565d8206679d9bf3 -r721e055ca19c92525a45be953ad1cffdc2d69abb
--- leahi.pro	(.../leahi.pro)	(revision 9363dbc93c2be5d664c0ca2a565d8206679d9bf3)
+++ leahi.pro	(.../leahi.pro)	(revision 721e055ca19c92525a45be953ad1cffdc2d69abb)
@@ -289,6 +289,7 @@
     \ # ---------- Views - Settings
     sources/view/settings/VDateTime.h \
     sources/view/settings/VSettings.h \
+    sources/view/settings/VLocalization.h \
     sources/view/settings/VBluetooth.h \
     sources/view/settings/VNetworkModel.h \
     sources/view/settings/VAdjustmentVersions.h \
@@ -559,6 +560,7 @@
     sources/view/hd/alarm/VAlarmActiveList.cpp \
     \ # ---------- Views - Settings
     sources/view/settings/VSettings.cpp \
+    sources/view/settings/VLocalization.cpp \
     sources/view/settings/VDateTime.cpp \
     sources/view/settings/VBluetooth.cpp \
     sources/view/settings/VNetworkModel.cpp \
Index: leahi.qrc
===================================================================
diff -u -r9363dbc93c2be5d664c0ca2a565d8206679d9bf3 -r721e055ca19c92525a45be953ad1cffdc2d69abb
--- leahi.qrc	(.../leahi.qrc)	(revision 9363dbc93c2be5d664c0ca2a565d8206679d9bf3)
+++ leahi.qrc	(.../leahi.qrc)	(revision 721e055ca19c92525a45be953ad1cffdc2d69abb)
@@ -26,6 +26,7 @@
         <file alias="SettingsFactoryReset.qml">sources/gui/qml/pages/settings/SettingsFactoryReset.qml</file>
         <file alias="SettingsDecommission.qml">sources/gui/qml/pages/settings/SettingsDecommission.qml</file>
         <file alias="SettingsInstitutionalRecord.qml">sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml</file>
+        <file alias="SettingsLocalization.qml">sources/gui/qml/pages/settings/SettingsLocalization.qml</file>
     </qresource>
     <qresource prefix="/dialogs">
         <file alias="ConfirmDialog.qml">sources/gui/qml/dialogs/ConfirmDialog.qml</file>
Index: sources/ApplicationController.cpp
===================================================================
diff -u -rf8c7febe2e4131b8c7e68fd9849027ba8596dbc6 -r721e055ca19c92525a45be953ad1cffdc2d69abb
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision f8c7febe2e4131b8c7e68fd9849027ba8596dbc6)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision 721e055ca19c92525a45be953ad1cffdc2d69abb)
@@ -49,7 +49,7 @@
     _init = true;
 
     initConnections();
-    LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG(QString("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -526,14 +526,9 @@
  */
 void ApplicationController::initSettings()
 {
-    // That is enough to call to the I function here to create the object in the thread that Settings is leaving in,
-    // which currently is Application_Thread, since the Settings is created in that thread.
-    _Settings;
-
     QFuture<int> mFuture = QtConcurrent::run( [=]() -> int { // made the call a lambda to make sure there is no function to accidentally being called, out of thread [developer safety].
         //TODO  The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
-        Storage::Settings settings;
-        return settings.read();
+        return Storage::Settings::readConfigurations();
     });
     _settingsWatcher.setFuture(mFuture);
 }
@@ -776,4 +771,3 @@
     institutionalRequest    ();                                             // send HD the institutional record request
     emit didPOSTPass        (_post.isDone(  ));                             // GuiController -> GuiView : didPOSTPass(bool)
 }
-
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a -r721e055ca19c92525a45be953ad1cffdc2d69abb
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 721e055ca19c92525a45be953ad1cffdc2d69abb)
@@ -101,8 +101,13 @@
 
 #ifdef BUILD_FOR_TARGET
     //WARNING: This has to match with the crypt_setup.sh
-    const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root.
-    const char *Settings_Path_Name = "/var/configurations/";
+    #ifdef LEAHI_DIGI_BOARD
+        const char *Settings_Path_Init = "/opt/leahi/configurations/"; // this is the manufacturing or update setup and the user is root.
+        const char *Settings_Path_Name = "/mnt/data/configurations/";
+    #else
+        const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root.
+        const char *Settings_Path_Name = "/var/configurations/";
+    #endif
 #else
     // should be in the project application folder. [is tracking by git]
     const char *Settings_Path_Init = "/home/denali/Projects/application/resources/settings/";
@@ -129,7 +134,11 @@
 
     // CloudSync credentials
 #ifdef BUILD_FOR_TARGET
-    const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/";
+    #ifdef LEAHI_DIGI_BOARD
+        const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/mnt/data/configurations/CloudSync/";
+    #else
+        const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/";
+    #endif
 #else
     // on VM it is a temporary file which is not being tracked
     const char *CloudSync_Base_Path_Name = "/home/denali/Desktop/CloudSync/";
@@ -210,8 +219,11 @@
     // Device Lockdown
     const char *Device_Lockdown                         = "lockdown.sh";
 
+#ifdef LEAHI_DIGI_BOARD
+    const char *CloudSyncPath                           = "/mnt/data/configurations/CloudSync/credentials/";
+#else
     const char *CloudSyncPath                           = "/var/configurations/CloudSync/credentials/";
-
+#endif
     // USB unmount/ mount
     const char *USB_Unmount                             = "usb_unmount.sh";
     const char *USB_Mount                               = "usb_mount.sh";