diff --git a/interface/package.json b/interface/package.json
index 74b9140f9..5776d6d2d 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EMS-ESP",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "EMS-ESP WebUI",
   "homepage": "https://emsesp.org",
   "author": "proddy, emsesp.org",
@@ -59,7 +59,7 @@
     "concurrently": "^9.2.1",
     "eslint": "^10.2.0",
     "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.8.2",
+    "prettier": "^3.8.3",
     "rollup-plugin-visualizer": "^7.0.1",
     "terser": "^5.46.1",
     "typescript-eslint": "^8.58.2",
diff --git a/interface/pnpm-lock.yaml b/interface/pnpm-lock.yaml
index bbee8b712..81cbc74c8 100644
--- a/interface/pnpm-lock.yaml
+++ b/interface/pnpm-lock.yaml
@@ -86,7 +86,7 @@ importers:
         version: 2.10.5(@babel/core@7.29.0)(preact@10.29.1)(rollup@4.59.0)(vite@8.0.8(@types/node@25.6.0)(esbuild@0.27.4)(terser@5.46.1))
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^6.0.2
-        version: 6.0.2(prettier@3.8.2)
+        version: 6.0.2(prettier@3.8.3)
       '@types/node':
         specifier: ^25.6.0
         version: 25.6.0
@@ -109,8 +109,8 @@ importers:
         specifier: ^10.1.8
         version: 10.1.8(eslint@10.2.0)
       prettier:
-        specifier: ^3.8.2
-        version: 3.8.2
+        specifier: ^3.8.3
+        version: 3.8.3
       rollup-plugin-visualizer:
         specifier: ^7.0.1
         version: 7.0.1(rolldown@1.0.0-rc.15)(rollup@4.59.0)
@@ -627,8 +627,8 @@ packages:
       '@types/react':
         optional: true
 
-  '@napi-rs/wasm-runtime@1.1.3':
-    resolution: {integrity: sha512-xK9sGVbJWYb08+mTJt3/YV24WxvxpXcXtP6B172paPZ+Ts69Re9dAr7lKwJoeIx8OoeuimEiRZ7umkiUVClmmQ==}
+  '@napi-rs/wasm-runtime@1.1.4':
+    resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==}
     peerDependencies:
       '@emnapi/core': ^1.7.1
       '@emnapi/runtime': ^1.7.1
@@ -1184,8 +1184,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.10.18:
-    resolution: {integrity: sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==}
+  baseline-browser-mapping@2.10.19:
+    resolution: {integrity: sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -1519,8 +1519,8 @@ packages:
   duplexer3@0.1.5:
     resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
 
-  electron-to-chromium@1.5.336:
-    resolution: {integrity: sha512-AbH9q9J455r/nLmdNZes0G0ZKcRX73FicwowalLs6ijwOmCJSRRrLX63lcAlzy9ux3dWK1w1+1nsBJEWN11hcQ==}
+  electron-to-chromium@1.5.338:
+    resolution: {integrity: sha512-KVQQ3xko9/coDX3qXLUEEbqkKT8L+1DyAovrtu0Khtrt9wjSZ+7CZV4GVzxFy9Oe1NbrIU1oVXCwHJruIA1PNg==}
 
   emoji-regex@10.6.0:
     resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
@@ -2717,8 +2717,8 @@ packages:
     resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
     engines: {node: '>= 0.4'}
 
-  postcss@8.5.9:
-    resolution: {integrity: sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==}
+  postcss@8.5.10:
+    resolution: {integrity: sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==}
     engines: {node: ^10 || ^12 || >=14}
 
   powershell-utils@0.1.0:
@@ -2740,8 +2740,8 @@ packages:
     resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
     engines: {node: '>=4'}
 
-  prettier@3.8.2:
-    resolution: {integrity: sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==}
+  prettier@3.8.3:
+    resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -3870,7 +3870,7 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@napi-rs/wasm-runtime@1.1.3(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
+  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
     dependencies:
       '@emnapi/core': 1.9.2
       '@emnapi/runtime': 1.9.2
@@ -3982,7 +3982,7 @@ snapshots:
     dependencies:
       '@emnapi/core': 1.9.2
       '@emnapi/runtime': 1.9.2
-      '@napi-rs/wasm-runtime': 1.1.3(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
     optional: true
 
   '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.15':
@@ -4092,7 +4092,7 @@ snapshots:
       react-virtualized-auto-sizer: 1.0.26(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
       react-window: 1.8.11(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
 
-  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.2)':
+  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.3)':
     dependencies:
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.2
@@ -4102,7 +4102,7 @@ snapshots:
       lodash-es: 4.18.1
       minimatch: 9.0.9
       parse-imports-exports: 0.2.4
-      prettier: 3.8.2
+      prettier: 3.8.3
     transitivePeerDependencies:
       - supports-color
 
@@ -4346,7 +4346,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.10.18: {}
+  baseline-browser-mapping@2.10.19: {}
 
   bin-build@3.0.0:
     dependencies:
@@ -4407,9 +4407,9 @@ snapshots:
 
   browserslist@4.28.2:
     dependencies:
-      baseline-browser-mapping: 2.10.18
+      baseline-browser-mapping: 2.10.19
       caniuse-lite: 1.0.30001788
-      electron-to-chromium: 1.5.336
+      electron-to-chromium: 1.5.338
       node-releases: 2.0.37
       update-browserslist-db: 1.2.3(browserslist@4.28.2)
 
@@ -4773,7 +4773,7 @@ snapshots:
 
   duplexer3@0.1.5: {}
 
-  electron-to-chromium@1.5.336: {}
+  electron-to-chromium@1.5.338: {}
 
   emoji-regex@10.6.0: {}
 
@@ -5931,7 +5931,7 @@ snapshots:
 
   possible-typed-array-names@1.1.0: {}
 
-  postcss@8.5.9:
+  postcss@8.5.10:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
@@ -5947,7 +5947,7 @@ snapshots:
 
   prepend-http@2.0.0: {}
 
-  prettier@3.8.2: {}
+  prettier@3.8.3: {}
 
   process-nextick-args@2.0.1: {}
 
@@ -6521,7 +6521,7 @@ snapshots:
     dependencies:
       lightningcss: 1.32.0
       picomatch: 4.0.4
-      postcss: 8.5.9
+      postcss: 8.5.10
       rolldown: 1.0.0-rc.15
       tinyglobby: 0.2.16
     optionalDependencies:
diff --git a/interface/src/app/main/Help.tsx b/interface/src/app/main/Help.tsx
index 16cb09c21..d68ffa591 100644
--- a/interface/src/app/main/Help.tsx
+++ b/interface/src/app/main/Help.tsx
@@ -11,6 +11,7 @@ import {
   Box,
   Button,
   Divider,
+  Grid,
   Link,
   List,
   ListItem,
@@ -42,7 +43,7 @@ interface CustomSupport {
   html: string | null;
 }
 
-const DEFAULT_IMAGE_URL = 'https://emsesp.org/_media/images/installer.jpeg';
+const DEFAULT_IMAGE_URL = 'https://emsesp.org/media/images/installer.jpeg';
 
 const SUPPORT_BOX_STYLES: SxProps<Theme> = {
   borderRadius: 3,
@@ -182,17 +183,19 @@ const HelpComponent = () => {
         </List>
       )}
 
-      <Typography sx={{ mb: 1 }} color="warning" variant="body1">
-        {LL.HELP_INFORMATION_4()}.
-      </Typography>
-      <Button
-        startIcon={<DownloadIcon />}
-        variant="outlined"
-        color="primary"
-        onClick={handleDownloadSystemInfo}
-      >
-        {LL.SUPPORT_INFORMATION(0)}
-      </Button>
+      <Grid container spacing={2} sx={{ mt: 2, alignItems: 'center' }}>
+        <Typography sx={{ mb: 1 }} color="warning" variant="body1">
+          {LL.HELP_INFORMATION_4()}:
+        </Typography>
+        <Button
+          startIcon={<DownloadIcon />}
+          variant="outlined"
+          color="primary"
+          onClick={handleDownloadSystemInfo}
+        >
+          {LL.SUPPORT_INFORMATION(0)}
+        </Button>
+      </Grid>
 
       <Divider sx={{ mt: 4 }} />
 
diff --git a/interface/src/app/status/Version.tsx b/interface/src/app/status/Version.tsx
index 72b39cc0d..a3326856b 100644
--- a/interface/src/app/status/Version.tsx
+++ b/interface/src/app/status/Version.tsx
@@ -7,6 +7,7 @@ import {
   useRef,
   useState
 } from 'react';
+import { Link } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -24,7 +25,6 @@ import {
   DialogTitle,
   Grid,
   IconButton,
-  Link,
   Table,
   TableBody,
   TableCell,
@@ -274,6 +274,7 @@ const InstallDialog = memo(
     fetchDevVersion,
     latestVersion,
     latestDevVersion,
+    upgradeImportantMessageType,
     downloadOnly,
     platform,
     LL,
@@ -284,6 +285,7 @@ const InstallDialog = memo(
     fetchDevVersion: boolean;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    upgradeImportantMessageType: number;
     downloadOnly: boolean;
     platform: string;
     LL: TranslationFunctions;
@@ -313,6 +315,27 @@ const InstallDialog = memo(
               fetchDevVersion ? latestDevVersion?.name : latestVersion?.name
             )}
           </Typography>
+          {upgradeImportantMessageType === 2 && LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+          {upgradeImportantMessageType === 1 && (
+            <>
+              {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+              <Typography sx={{ mt: 2 }}>
+                <Link to="/settings/downloadUpload" style={{ color: 'lightblue' }}>
+                  {LL.DOWNLOAD_SYSTEM_BACKUP()}
+                </Link>
+              </Typography>
+            </>
+          )}
+          <Typography sx={{ mt: 2 }}>
+            <Link
+              to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue' }}
+            >
+              {LL.ONLINE_HELP()}
+            </Link>
+          </Typography>
         </DialogContent>
         <DialogActions>
           <Button
@@ -329,7 +352,12 @@ const InstallDialog = memo(
             onClick={onClose}
             color="primary"
           >
-            <Link underline="none" target="_blank" href={binURL} color="primary">
+            <Link
+              to={binURL}
+              target="_blank"
+              rel="noreferrer"
+              style={{ color: 'lightblue', textDecoration: 'none' }}
+            >
               {LL.DOWNLOAD(0)}
             </Link>
           </Button>
@@ -469,6 +497,26 @@ const Version = () => {
     immediate: false
   });
 
+  const [upgradeImportantMessageType, setUpgradeImportantMessageType] =
+    useState<number>(0);
+
+  const { send: checkUpgradeImportantMessages } = useRequest(
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
+    {
+      immediate: false
+    }
+  )
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+    })
+    .onError((error) => {
+      toast.error(String(error.error?.message || 'An error occurred'));
+    });
+
   // Memoized values
   const platform = useMemo(() => (data ? getPlatform(data) : ''), [data]);
 
@@ -534,10 +582,16 @@ const Version = () => {
     []
   );
 
-  const showFirmwareDialog = useCallback((useDevVersion: boolean) => {
-    setFetchDevVersion(useDevVersion);
-    setOpenInstallDialog(true);
-  }, []);
+  const showFirmwareDialog = useCallback(
+    (useDevVersion: boolean) => {
+      setFetchDevVersion(useDevVersion);
+      void checkUpgradeImportantMessages(
+        useDevVersion ? latestDevVersion?.name : latestVersion?.name
+      );
+      setOpenInstallDialog(true);
+    },
+    [latestDevVersion, latestVersion, fetchDevVersion]
+  );
 
   const closeInstallDialog = useCallback(() => {
     setOpenInstallDialog(false);
@@ -817,6 +871,7 @@ const Version = () => {
                 fetchDevVersion={fetchDevVersion}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                upgradeImportantMessageType={upgradeImportantMessageType}
                 downloadOnly={downloadOnly}
                 platform={platform}
                 LL={LL}
diff --git a/interface/src/components/upload/DragNdrop.tsx b/interface/src/components/upload/DragNdrop.tsx
index e0214b1bf..fdcc0cc9d 100644
--- a/interface/src/components/upload/DragNdrop.tsx
+++ b/interface/src/components/upload/DragNdrop.tsx
@@ -6,6 +6,7 @@ import {
   useRef,
   useState
 } from 'react';
+import { Link } from 'react-router';
 import { toast } from 'react-toastify';
 
 import CancelIcon from '@mui/icons-material/Cancel';
@@ -78,16 +79,22 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
     useState<number>(0);
 
   const { send: checkUpgradeImportantMessages } = useRequest(
-    (type: string) =>
-      callAction({ action: 'upgradeImportantMessages', param: type }),
+    (version: string) =>
+      callAction({ action: 'upgradeImportantMessages', param: version }),
     {
       immediate: false
     }
   )
-    .onSuccess((event: { data: number }) => {
-      setUpgradeImportantMessageType(event.data);
+    .onSuccess((event) => {
+      const upgradeImportantMessageType_n = (
+        event.data as { upgradeImportantMessageType: number }
+      ).upgradeImportantMessageType;
+      setUpgradeImportantMessageType(upgradeImportantMessageType_n);
+      if (upgradeImportantMessageType_n === 0) {
+        onFileSelected(file);
+      }
     })
-    .onError((error: { error?: { message?: string } }) => {
+    .onError((error) => {
       toast.error(String(error.error?.message || 'An error occurred'));
     });
 
@@ -189,7 +196,7 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
               {LL.UPLOAD()}
             </Button>
           </Box>
-          {showUpgradeDialog && (
+          {showUpgradeDialog && upgradeImportantMessageType > 0 && (
             <Dialog
               sx={dialogStyle}
               open={showUpgradeDialog}
@@ -204,10 +211,31 @@ const DragNdrop = ({ text, onFileSelected }: DragNdropProps) => {
                 {LL.UPGRADE_IMPORTANT_MESSAGES()}
               </DialogTitle>
               <DialogContent dividers>
-                {upgradeImportantMessageType === 1 &&
-                  LL.UPGRADE_IMPORTANT_MESSAGES_1()}
                 {upgradeImportantMessageType === 2 &&
                   LL.UPGRADE_IMPORTANT_MESSAGES_2()}
+                {upgradeImportantMessageType === 1 && (
+                  <>
+                    {LL.UPGRADE_IMPORTANT_MESSAGES_1()}
+                    <Typography sx={{ mt: 2 }}>
+                      <Link
+                        to="/settings/downloadUpload"
+                        style={{ color: 'lightblue' }}
+                      >
+                        {LL.DOWNLOAD_SYSTEM_BACKUP()}
+                      </Link>
+                    </Typography>
+                  </>
+                )}{' '}
+                <Typography sx={{ mt: 2 }}>
+                  <Link
+                    to="https://docs.emsesp.org/FAQ#upgrading-the-firmware"
+                    target="_blank"
+                    rel="noreferrer"
+                    style={{ color: 'lightblue' }}
+                  >
+                    {LL.ONLINE_HELP()}
+                  </Link>
+                </Typography>
               </DialogContent>
               <DialogActions>
                 <Button
diff --git a/interface/src/i18n/cz/index.ts b/interface/src/i18n/cz/index.ts
index 259006837..28b958301 100644
--- a/interface/src/i18n/cz/index.ts
+++ b/interface/src/i18n/cz/index.ts
@@ -188,12 +188,8 @@ const cz: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Vytvořte zálohu svého nastavení a konfigurace',
   DOWNLOAD_SETTINGS_TEXT2: 'Exportovat všechny hodnoty',
   DOWNLOAD_SYSTEM_BACKUP: 'Systémová záloha',
-  WARNING_SYSTEM_BACKUP: 'Toto vytvoří zálohu vašich nastavení a konfigurace. Všechna hesla budou v zálohovém souboru čitelná. Opravdu chcete pokračovat?',
   UPLOAD_TEXT: 'Nahrajte nový soubor firmwaru (.bin) nebo záložní soubor (.json)',
   UPLOAD_DROP_TEXT: 'Přetáhněte soubor sem nebo klikněte pro výběr',
-  UPGRADE_IMPORTANT_MESSAGES: 'Důležité zprávy pro aktualizaci',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Aktualizujete se z hlavní verze. Vezměte prosím na vědomí, že to může způsobit problémy s vaší konfigurací.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete se z dílčí verze. Vezměte prosím na vědomí, že to může způsobit problémy s vaší konfigurací.',
   ERROR: 'Neočekávaná chyba, zkuste to prosím znovu',
   TIME_SET: 'Čas nastaven',
   MANAGE_USERS: 'Spravovat uživatele',
@@ -351,7 +347,6 @@ const cz: Translation = {
   BITMASK: 'Bit Mask',
   DUPLICATE: 'Duplikát',
   DASHBOARD_1: 'Všechny aktivní entity EMS jsou označené jako oblíbené. Všechny vlastní entity, harmonogramy a externí sensory jsou zobrazeny níže.',
-  NO_DATA: 'žádné údaje',
   NO_DATA_1: 'Nebyly nalezeny žádné oblíbené entity. Použijte modul',
   NO_DATA_2: 'pro jejich výběr.',
   NO_DATA_3: 'Pro zobrazení všech dostupných entit navštivte stránku',
@@ -362,9 +357,15 @@ const cz: Translation = {
   INTERNET_CONNECTION_REQUIRED: 'Pro automatickou kontrolu a instalaci aktualizací je třeba internetové připojení',
   SWITCH_RELEASE_TYPE: 'Přepnout na {0} verzi',
   FIRMWARE_VERSION_INFO: 'Informace o verzi firmwaru',
+  NO_DATA: 'žádné údaje',
   USER_PROFILE: 'Uživatelský profil',
   STORED_VERSIONS: 'Uložené verze',
-  ONLINE_HELP: 'online nápověda'
+  ONLINE_HELP: 'online nápověda',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovat důležité zprávy',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Tato aktualizace vyžaduje obnovení továrního nastavení. Ujistěte se, že jste vytvořili zálohu své konfigurace a nastavení před pokračováním a nahrajte ji po instalaci nové verze.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete se na novou hlavní verzi. Ujistěte se, že jste přečetli ChangeLog pro jakékoliv závažné změny.',
+  WARNING_SYSTEM_BACKUP: 'Toto vytvoří zálohu vašich celých systémových konfigurací a nastavení. Všechna hesla budou v zálohovém souboru čitelná. Buďte opatrní při sdílení! Opravdu chcete pokračovat?'
+
 };
 
 export default cz;
diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts
index 53e8a0737..e8d17c01b 100644
--- a/interface/src/i18n/de/index.ts
+++ b/interface/src/i18n/de/index.ts
@@ -188,12 +188,8 @@ const de: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Erstellen Sie eine Sicherung Ihrer Konfigurationen und Einstellungen',
   DOWNLOAD_SETTINGS_TEXT2: 'Exportiere alle Werte',
   DOWNLOAD_SYSTEM_BACKUP: 'System Sicherung',
-  WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer Konfigurationen und Einstellungen erstellen. Alle Passwörter werden im Sicherungsdatei lesbar. Möchten Sie fortfahren?',
   UPLOAD_TEXT: 'Laden Sie eine neue Firmware-Datei (.bin) oder eine Sicherungsdatei (.json) hoch',
   UPLOAD_DROP_TEXT: 'Legen Sie eine Firmware-Datei (.bin) ab oder klicken Sie hier',
-  UPGRADE_IMPORTANT_MESSAGES: 'Wichtige Nachrichten für das Upgrade',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Sie sind von einer Major-Version auf eine neue Version aktualisiert. Bitte beachten Sie, dass dies zu Problemen mit Ihrer Konfiguration führen kann.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Sie sind von einer Minor-Version auf eine neue Version aktualisiert. Bitte beachten Sie, dass dies zu Problemen mit Ihrer Konfiguration führen kann.',
   ERROR: 'Unerwarteter Fehler, bitte versuchen Sie es erneut.',
   TIME_SET: 'Zeit gesetzt',
   MANAGE_USERS: 'Nutzerverwaltung',
@@ -364,7 +360,12 @@ const de: Translation = {
   NO_DATA: 'Keine Daten',
   USER_PROFILE: 'Benutzerprofil',
   STORED_VERSIONS: 'Gespeicherte Versionen',
-  ONLINE_HELP: 'Online-Hilfe'
+  ONLINE_HELP: 'Online-Hilfe',
+  UPGRADE_IMPORTANT_MESSAGES: 'Wichtige Nachrichten aktualisieren',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Diese Aktualisierung erfordert eine Werkseinstellung. Stellen Sie sicher, dass Sie eine Sicherung Ihrer Konfiguration und Einstellungen vor dem Fortfahren erstellt haben und diese nach der Installation der neuen Version hochladen.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Sie aktualisieren auf eine neue Hauptversion. Stellen Sie sicher, dass Sie den ChangeLog für alle wichtigen Änderungen gelesen haben.',
+  WARNING_SYSTEM_BACKUP: 'Dies wird eine Sicherung Ihrer vollständigen Systemkonfiguration und -einstellungen erstellen. Alle Passwörter werden im Sicherungsdatei lesbar sein. Seien Sie vorsichtig beim Teilen! Möchten Sie fortfahren?'
+
 };
 
 export default de;
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index 3ade2eb13..0c116d399 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -188,12 +188,8 @@ const en: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings',
   DOWNLOAD_SETTINGS_TEXT2: 'Export all values',
   DOWNLOAD_SYSTEM_BACKUP: 'System Backup',
-  WARNING_SYSTEM_BACKUP: 'This will create a backup of your configuration and settings. All passwords will be readable in the backup file. Do you want to continue?',
   UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
-  UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Important Messages',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'You are upgrading from a major version. Please be aware that this may cause issues with your configuration.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading from a minor version. Please be aware that this may cause issues with your configuration.',
   ERROR: 'Unexpected Error, please try again',
   TIME_SET: 'Time set',
   MANAGE_USERS: 'Manage Users',
@@ -364,7 +360,12 @@ const en: Translation = {
   NO_DATA: 'No data',
   USER_PROFILE: 'User Profile',
   STORED_VERSIONS: 'Stored Versions',
-  ONLINE_HELP: 'online help'
+  ONLINE_HELP: 'online help',
+  UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Important Messages',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'This upgrade requires a factory reset. Make sure you have made a backup of your configuration and settings before continuing, and upload this after the new version is installed.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'You are upgrading to a new major version. Make sure you have read the ChangeLog for any breaking changes.',
+  WARNING_SYSTEM_BACKUP: 'This will create a backup of your full system configuration and settings. All passwords will be readable in the backup file. Be careful with sharing! Do you want to continue?'
+
 };
 
 export default en;
diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts
index 05b1e0ee0..528c83bd9 100644
--- a/interface/src/i18n/fr/index.ts
+++ b/interface/src/i18n/fr/index.ts
@@ -188,12 +188,8 @@ const fr: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Créer une sauvegarde de vos paramètres et configurations',
   DOWNLOAD_SETTINGS_TEXT2: 'Exporter toutes les valeurs',
   DOWNLOAD_SYSTEM_BACKUP: 'Sauvegarde système',
-  WARNING_SYSTEM_BACKUP: 'Cela créera une sauvegarde de vos paramètres et configurations. Tous les mots de passe seront lisibles dans le fichier de sauvegarde. Voulez-vous continuer ?',
   UPLOAD_TEXT: 'Télécharger un nouveau fichier firmware (.bin) ou une sauvegarde (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
-  UPGRADE_IMPORTANT_MESSAGES: 'Messages importants pour la mise à jour',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Vous mettez à jour à partir d\'une version majeure. Veuillez prendre en compte que cela peut causer des problèmes avec votre configuration.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Vous mettez à jour à partir d\'une version mineure. Veuillez prendre en compte que cela peut causer des problèmes avec votre configuration.',
   ERROR: 'Erreur inattendue, veuillez réessayer',
   TIME_SET: 'Time set',
   MANAGE_USERS: 'Gérer les utilisateurs',
@@ -364,7 +360,12 @@ const fr: Translation = {
   NO_DATA: 'Aucune donnée',
   USER_PROFILE: 'Profil utilisateur',
   STORED_VERSIONS: 'Versions stockées',
-  ONLINE_HELP: 'aide en ligne'
+  ONLINE_HELP: 'aide en ligne',
+  UPGRADE_IMPORTANT_MESSAGES: 'Mettre à jour les messages importants',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Cette mise à jour nécessite une réinitialisation de fabrique. Assurez-vous d\'avoir créé une sauvegarde de vos configurations et paramètres avant de continuer et de la charger après l\'installation de la nouvelle version.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Vous mettez à jour vers une nouvelle version majeure. Assurez-vous de lire le ChangeLog pour tout changement important.',
+  WARNING_SYSTEM_BACKUP: 'Cela créera une sauvegarde de votre configuration et paramètres complets. Tous les mots de passe seront lisibles dans le fichier de sauvegarde. Soyez prudent avec le partage ! Voulez-vous continuer ?'
+
 };
 
 export default fr;
diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts
index 79210c2b7..04fe977d2 100644
--- a/interface/src/i18n/it/index.ts
+++ b/interface/src/i18n/it/index.ts
@@ -188,12 +188,8 @@ const it: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Create a backup of your configuration and settings',
   DOWNLOAD_SETTINGS_TEXT2: 'Esporta tutti i valori',
   DOWNLOAD_SYSTEM_BACKUP: 'Backup sistema',
-  WARNING_SYSTEM_BACKUP: 'Questo creerà un backup delle tue configurazioni e impostazioni. Tutte le password saranno leggibili nel file di backup. Vuoi continuare?',
   UPLOAD_TEXT: 'Upload a new firmware file (.bin) or a backup file (.json)',
   UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here',
-  UPGRADE_IMPORTANT_MESSAGES: 'Messaggi importanti per l\'aggiornamento',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Stai aggiornando da una versione principale. Si prega di essere consapevoli che questo può causare problemi con la tua configurazione.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Stai aggiornando da una versione secondaria. Si prega di essere consapevoli che questo può causare problemi con la tua configurazione.',
   ERROR: 'Errore Inaspettato, prego tenta ancora',
   TIME_SET: 'Imposta Ora',
   MANAGE_USERS: 'Gestione Utenti',
@@ -364,7 +360,12 @@ const it: Translation = {
   NO_DATA: 'Nessun dato',
   USER_PROFILE: 'Profilo utente',
   STORED_VERSIONS: 'Versioni memorizzate',
-  ONLINE_HELP: 'aiuto online'
+  ONLINE_HELP: 'aiuto online',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aggiorna Messaggi Importanti',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Questa aggiornamento richiede un ripristino di fabbrica. Assicurati di aver creato un backup delle tue configurazioni e impostazioni prima di continuare e di caricarlo dopo l\'installazione della nuova versione.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Stai aggiornando a una nuova versione principale. Assicurati di aver letto il ChangeLog per qualsiasi cambiamento importante.',
+  WARNING_SYSTEM_BACKUP: 'Questo creerà un backup delle tue configurazioni e impostazioni complete. Tutte le password saranno leggibili nel file di backup. Sei sicuro di voler continuare?'
+
 };
 
 export default it;
diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts
index 6218e3765..70176a084 100644
--- a/interface/src/i18n/nl/index.ts
+++ b/interface/src/i18n/nl/index.ts
@@ -188,12 +188,8 @@ const nl: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Maak een back-up van uw configuratie en instellingen',
   DOWNLOAD_SETTINGS_TEXT2: 'Exporteer alle waarden',
   DOWNLOAD_SYSTEM_BACKUP: 'Systeem Backup',
-  WARNING_SYSTEM_BACKUP: 'Dit zal een backup maken van uw configuratie en instellingen. Alle wachtwoorden zullen leesbaar zijn in het backup bestand. Weet je zeker dat je wilt doorgaan?',
   UPLOAD_TEXT: 'Upload een nieuw firmwarebestand (.bin) of een back-upbestand (.json)',
   UPLOAD_DROP_TEXT: 'Sleep en firmware .bin bestand hierheen of klik hier',
-  UPGRADE_IMPORTANT_MESSAGES: 'Belangrijke berichten voor upgrade',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'U updatet van een grote versie. Wees bewust dat dit problemen met uw configuratie kan veroorzaken.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'U updatet van een kleine versie. Wees bewust dat dit problemen met uw configuratie kan veroorzaken.',
   ERROR: 'Onverwachte fout, probeer opnieuw',
   TIME_SET: 'Tijd ingesteld',
   MANAGE_USERS: 'Gebruikersbeheer',
@@ -364,7 +360,12 @@ const nl: Translation = {
   NO_DATA: 'Geen data',
   USER_PROFILE: 'Gebruikersprofiel',
   STORED_VERSIONS: 'Opgeslagen versies',
-  ONLINE_HELP: 'online help'
+  ONLINE_HELP: 'online help',
+  UPGRADE_IMPORTANT_MESSAGES: 'Upgrade Belangrijke Berichten',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Deze upgrade vereist een fabrieksinstelling. Zorg ervoor dat u een back-up van uw configuratie en instellingen hebt gemaakt voordat u doorgaat en upload deze na de installatie van de nieuwe versie.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'U updatet naar een nieuwe grote versie. Zorg ervoor dat u de ChangeLog hebt gelezen voor alle brekende wijzigingen.',
+  WARNING_SYSTEM_BACKUP: 'Dit zal een back-up van uw volledige systeemconfiguratie en instellingen maken. Alle wachtwoorden zijn leesbaar in het back-upbestand. Wees voorzichtig bij delen! Wilt u doorgaan?'
+
 };
 
 export default nl;
diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts
index f5a7d6282..f37f87d99 100644
--- a/interface/src/i18n/no/index.ts
+++ b/interface/src/i18n/no/index.ts
@@ -188,12 +188,8 @@ const no: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Lag en sikkerhetskopi av dine konfigurasjon og innstillinger',
   DOWNLOAD_SETTINGS_TEXT2: 'Eksporter alle verdier',
   DOWNLOAD_SYSTEM_BACKUP: 'System Sikkerhetskopi',
-  WARNING_SYSTEM_BACKUP: 'Dette vil lage en sikkerhetskopi av dine konfigurasjon og innstillinger. Alle passord vil være lesbare i sikkerhetskopien. Er du sikker på at du vil fortsette?',
   UPLOAD_TEXT: 'Last opp en ny firmware fil (.bin) eller en sikkerhetskopi fil (.json)',
   UPLOAD_DROP_TEXT: 'Dropp en firmware fil (.bin) eller klikk her',
-  UPGRADE_IMPORTANT_MESSAGES: 'Viktige meldinger for oppgradering',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Du oppgraderer fra en stor versjon. Vær oppmerksom på at dette kan føre til problemer med din konfigurasjon.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Du oppgraderer fra en liten versjon. Vær oppmerksom på at dette kan føre til problemer med din konfigurasjon.',
   ERROR: 'Ukjent feil, prøv igjen',
   TIME_SET: 'Still in tid',
   MANAGE_USERS: 'Administrer Brukere',
@@ -364,7 +360,12 @@ const no: Translation = {
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Brukerprofil',
   STORED_VERSIONS: 'Lagret versjoner',
-  ONLINE_HELP: 'online hjelp'
+  ONLINE_HELP: 'online hjelp',
+  UPGRADE_IMPORTANT_MESSAGES: 'Oppdater viktige meldinger',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denne oppdateringen krever en fabriksinstilling. Sørg for at du har laget en sikkerhetskopi av din konfigurasjon og innstillinger før du fortsetter, og last denne opp etter at den nye versjonen er installert.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du oppdaterer til en ny hovedversjon. Sørg for at du har lest ChangeLog for eventuelle bruddende endringer.',
+  WARNING_SYSTEM_BACKUP: 'Dette vil lage en sikkerhetskopi av din fullstendige systemkonfigurasjon og innstillinger. Alle passord vil være lesbare i sikkerhetskopien. Vær forsiktig med deling! Vil du fortsette?'
+
 };
 
 export default no;
diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts
index c666d353c..5a279ba93 100644
--- a/interface/src/i18n/pl/index.ts
+++ b/interface/src/i18n/pl/index.ts
@@ -188,12 +188,8 @@ const pl: BaseTranslation = {
   DOWNLOAD_SETTINGS_TEXT: 'Utwórz kopię swoich ustawień i konfiguracji',
   DOWNLOAD_SETTINGS_TEXT2: 'Eksportuj wszystkie wartości',
   DOWNLOAD_SYSTEM_BACKUP: 'Kopia zapasowa systemu',
-  WARNING_SYSTEM_BACKUP: 'To utworzy kopię swoich ustawień i konfiguracji. Wszystkie hasła będą widoczne w kopii zapasowej. Czy na pewno chcesz kontynuować?',
   UPLOAD_TEXT: 'Wgraj nowy plik firmware (.bin) lub kopię ustawień (.json)',
   UPLOAD_DROP_TEXT: 'Upuść plik firmware .bin lub kliknij tutaj',
-  UPGRADE_IMPORTANT_MESSAGES: 'Ważne informacje dotyczące aktualizacji',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Aktualizujesz się z głównej wersji. Proszę mieć świadomość, że to może spowodować problemy z konfiguracją.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się z drugorzędnej wersji. Proszę mieć świadomość, że to może spowodować problemy z konfiguracją.',
   ERROR: 'Nieoczekiwany błąd, spróbuj ponownie!',
   TIME_SET: 'Zegar został ustawiony.',
   MANAGE_USERS: 'Zarządzanie użytkownikami',
@@ -364,7 +360,12 @@ const pl: BaseTranslation = {
   NO_DATA: 'Brak danych',
   USER_PROFILE: 'Profil użytkownika',
   STORED_VERSIONS: 'Zapisane wersje',
-  ONLINE_HELP: 'pomoc online'
+  ONLINE_HELP: 'pomoc online',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizuj ważne wiadomości',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Ta aktualizacja wymaga resetu fabrycznego. Upewnij się, że masz utworzoną kopię swoich ustawień i konfiguracji przed kontynuowaniem i przesuń ją po zainstalowaniu nowej wersji.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujesz się do nowej głównej wersji. Upewnij się, że przeczytałeś ChangeLog dla wszelkich istotnych zmian.',
+  WARNING_SYSTEM_BACKUP: 'To spowoduje utworzenie kopii zapasowej całej konfiguracji i ustawień systemu. Wszystkie hasła będą widoczne w pliku kopii zapasowej. Bądź ostrożny przy udostępnianiu! Chcesz kontynuować?'
+
 };
 
 export default pl;
diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts
index 8b84af4a1..be742048f 100644
--- a/interface/src/i18n/sk/index.ts
+++ b/interface/src/i18n/sk/index.ts
@@ -188,12 +188,8 @@ const sk: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení',
   DOWNLOAD_SETTINGS_TEXT2: 'Exportovať všetky hodnoty',
   DOWNLOAD_SYSTEM_BACKUP: 'Systémová záloha',
-  WARNING_SYSTEM_BACKUP: 'Toto vytvorí zálohu vašich nastavení a konfigurácií. Všetky hesla budú v zálohovom súbore čitateľné. Naozaj chcete pokračovať?',
   UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)',
   UPLOAD_DROP_TEXT: 'Presuňte súbor .bin firmvéru alebo kliknite sem',
-  UPGRADE_IMPORTANT_MESSAGES: 'Dôležité informácie pre aktualizáciu',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Aktualizujete sa z hlavného verzie. Prosím, buďte si vedomí, že to môže spôsobiť problémy s vašou konfiguráciou.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete sa z menšieho verzie. Prosím, buďte si vedomí, že to môže spôsobiť problémy s vašou konfiguráciou.',
   ERROR: 'Neočakávaná chyba, prosím skúste to znova',
   TIME_SET: 'Nastavený čas',
   MANAGE_USERS: 'Správa používateľov',
@@ -364,7 +360,12 @@ const sk: Translation = {
   NO_DATA: 'Žiadne dáta',
   USER_PROFILE: 'Profil používateľa',
   STORED_VERSIONS: 'Uložené verzie',
-  ONLINE_HELP: 'online pomoc'
+  ONLINE_HELP: 'online pomoc',
+  UPGRADE_IMPORTANT_MESSAGES: 'Aktualizovať dôležité správy',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Táto aktualizácia vyžaduje reštart základných nastavení. Uistite sa, že ste vytvorili zálohu svojich konfigurácií a nastavení pred pokračovaním a nahrajte ju po instalácii novej verzie.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Aktualizujete sa na novú hlavnú verziu. Uistite sa, že ste prečítali ChangeLog pre akékoľvek dôležité zmeny.',
+  WARNING_SYSTEM_BACKUP: 'Toto vytvorí zálohu všetkých vašich celých systémových konfigurácií a nastavení. Všetky hesla budú čitateľné v zálohovom súbore. Buďte opatrní pri zdieľaní! Chcete pokračovať?'
+
 };
 
 export default sk;
diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts
index 81660cc63..c980a54fd 100644
--- a/interface/src/i18n/sv/index.ts
+++ b/interface/src/i18n/sv/index.ts
@@ -188,12 +188,8 @@ const sv: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Skapa en säkerhetskopia av din konfiguration och inställningar',
   DOWNLOAD_SETTINGS_TEXT2: 'Exportera alla värden',
   DOWNLOAD_SYSTEM_BACKUP: 'System säkerhetskopia',
-  WARNING_SYSTEM_BACKUP: 'Detta kommer att skapa en säkerhetskopia av dina inställningar och konfiguration. Alla lösenord kommer att vara läsbara i säkerhetskopian. Är du säker på att du vill fortsätta?',
   UPLOAD_TEXT: 'Ladda upp en ny firmwarefil (.bin) eller en säkerhetskopiafil (.json)',
   UPLOAD_DROP_TEXT: 'Droppa en firmware .bin fil eller klicka här',
-  UPGRADE_IMPORTANT_MESSAGES: 'Viktiga meddelanden för uppgradering',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Du uppgraderar från en major version. Vänligen var medveten om att detta kan orsaka problem med din konfiguration.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Du uppgraderar från en minor version. Vänligen var medveten om att detta kan orsaka problem med din konfiguration.',
   ERROR: 'Okänt fel, var god försök igen',
   TIME_SET: 'Ställ in tid',
   MANAGE_USERS: 'Användare',
@@ -364,7 +360,12 @@ const sv: Translation = {
   NO_DATA: 'Ingen data',
   USER_PROFILE: 'Användarprofil',
   STORED_VERSIONS: 'Lagrad versioner',
-  ONLINE_HELP: 'online hjälp'
+  ONLINE_HELP: 'online hjälp',
+  UPGRADE_IMPORTANT_MESSAGES: 'Uppdatera viktiga meddelanden',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Denna uppdatering kräver en fabriksåterställning. Se till att du har gjort en säkerhetskopia av din konfiguration och inställningar innan du fortsätter och ladda upp denna efter att den nya versionen är installerad.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Du uppdaterar till en ny huvudversion. Se till att du har läst ChangeLog för eventuella brkande ändringar.',
+  WARNING_SYSTEM_BACKUP: 'Detta kommer att skapa en säkerhetskopia av din fullständiga systemkonfiguration och inställningar. Alla lösenord kommer att vara läsbara i säkerhetskopien. Var försiktig med att dela! Vill du fortsätta?'
+
 };
 
 export default sv;
diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts
index 257232375..154115d6a 100644
--- a/interface/src/i18n/tr/index.ts
+++ b/interface/src/i18n/tr/index.ts
@@ -188,12 +188,8 @@ const tr: Translation = {
   DOWNLOAD_SETTINGS_TEXT: 'Yapılandırma ve ayarlarınızın yedekleme yapın',
   DOWNLOAD_SETTINGS_TEXT2: 'Tüm değerleri dışarı al',
   DOWNLOAD_SYSTEM_BACKUP: 'Sistem yedekleme',
-  WARNING_SYSTEM_BACKUP: 'Bu, yapılandırma ve ayarlarınızın bir yedeklemesi oluşturacaktır. Tüm şifreler yedekleme dosyasında okunabilir olacaktır. Devam etmek istediğinize emin misiniz?',
   UPLOAD_TEXT: 'Yeni bir firmware dosyası (.bin) veya yedek dosyası (.json) yükle',
   UPLOAD_DROP_TEXT: 'Bir firmware .bin dosyası veya buraya tıklayın',
-  UPGRADE_IMPORTANT_MESSAGES: 'Yükseltme Önemli Mesajları',
-  UPGRADE_IMPORTANT_MESSAGES_1: 'Bir ana sürümden yükselteysiniz. Lütfen bu, yapılandırmanızın sorunlarına neden olabileceğini unutmayın.',
-  UPGRADE_IMPORTANT_MESSAGES_2: 'Bir küçük sürümden yükselteysiniz. Lütfen bu, yapılandırmanızın sorunlarına neden olabileceğini unutmayın.',
   ERROR: 'Beklenemedik hata, lütfen tekrar deneyin.',
   TIME_SET: 'Zaman ayarı',
   MANAGE_USERS: 'Kullanıcıları yönet',
@@ -364,7 +360,12 @@ const tr: Translation = {
   NO_DATA: 'Hiçbir veri yok',
   USER_PROFILE: 'Kullanıcı Profili',
   STORED_VERSIONS: 'Kaydedilmiş Sürümler',
-  ONLINE_HELP: 'online yardım'
+  ONLINE_HELP: 'online yardım',
+  UPGRADE_IMPORTANT_MESSAGES: 'Önemli Mesajları Güncelle',
+  UPGRADE_IMPORTANT_MESSAGES_1: 'Bu güncelleme továrnı ayarlarını gerektirir. Yapılandırmanızı ve ayarlarınızı önce yedekleyin ve ardından yeni sürüm yüklendikten sonra yükleyin.',
+  UPGRADE_IMPORTANT_MESSAGES_2: 'Yeni bir büyük sürüme yükselteceksiniz. Değişiklikleri ChangeLogı okuduğunuzdan emin olun.',
+  WARNING_SYSTEM_BACKUP: 'Bu, sistem yapılandırmanızı ve ayarlarınızın bir yedeklemesi oluşturacaktır. Tüm şifreler yedekleme dosyasında okunabilir olacaktır. Paylaşırken dikkatli olun! Devam etmek istediğinize emin misiniz?'
+
 };
 
 export default tr;
diff --git a/mock-api/package.json b/mock-api/package.json
index 6a4c24689..c90493509 100644
--- a/mock-api/package.json
+++ b/mock-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mock-api",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "mock api for EMS-ESP",
   "author": "proddy, emsesp.org",
   "license": "MIT",
@@ -13,7 +13,7 @@
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "formidable": "^3.5.4",
     "itty-router": "^5.0.23",
-    "prettier": "^3.8.2"
+    "prettier": "^3.8.3"
   },
   "packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319"
 }
diff --git a/mock-api/pnpm-lock.yaml b/mock-api/pnpm-lock.yaml
index 1ddfbaab7..d1f155ffa 100644
--- a/mock-api/pnpm-lock.yaml
+++ b/mock-api/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
         version: 3.1.3
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^6.0.2
-        version: 6.0.2(prettier@3.8.2)
+        version: 6.0.2(prettier@3.8.3)
       formidable:
         specifier: ^3.5.4
         version: 3.5.4
@@ -21,8 +21,8 @@ importers:
         specifier: ^5.0.23
         version: 5.0.23
       prettier:
-        specifier: ^3.8.2
-        version: 3.8.2
+        specifier: ^3.8.3
+        version: 3.8.3
 
 packages:
 
@@ -167,8 +167,8 @@ packages:
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  prettier@3.8.2:
-    resolution: {integrity: sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==}
+  prettier@3.8.3:
+    resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -246,7 +246,7 @@ snapshots:
     dependencies:
       '@noble/hashes': 1.8.0
 
-  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.2)':
+  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.8.3)':
     dependencies:
       '@babel/generator': 7.29.1
       '@babel/parser': 7.29.2
@@ -256,7 +256,7 @@ snapshots:
       lodash-es: 4.18.1
       minimatch: 9.0.9
       parse-imports-exports: 0.2.4
-      prettier: 3.8.2
+      prettier: 3.8.3
     transitivePeerDependencies:
       - supports-color
 
@@ -311,6 +311,6 @@ snapshots:
 
   picocolors@1.1.1: {}
 
-  prettier@3.8.2: {}
+  prettier@3.8.3: {}
 
   wrappy@1.0.2: {}
diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts
index 554f68426..1e3a7afae 100644
--- a/mock-api/restServer.ts
+++ b/mock-api/restServer.ts
@@ -141,8 +141,8 @@ let system_status = {
 let DEV_VERSION_IS_UPGRADEABLE: boolean;
 let STABLE_VERSION_IS_UPGRADEABLE: boolean;
 let THIS_VERSION: string;
-let LATEST_STABLE_VERSION = '3.8.0';
-let LATEST_DEV_VERSION = '3.8.1-dev.2';
+let LATEST_STABLE_VERSION = '3.8.2';
+let LATEST_DEV_VERSION = '3.8.3-dev.2';
 
 // scenarios for testing versioning
 let version_test = 0; // on latest stable, or switch to dev
@@ -388,13 +388,34 @@ function custom_support() {
         '',
         "For help and questions please <a target='_blank' href='https://emsesp.org'>contact</a> your installer."
       ],
-      img_url: 'https://emsesp.org/_media/images/designer.png'
+      img_url: 'https://emsesp.org/media/images/designer.png'
       // img_url: 'https://picsum.photos/200/300'
     }
   };
 }
 
-// called by Action endpoint
+// called by Action endpoint upgradeImportantMessages
+function upgradeImportantMessages(version: string) {
+  // 0 is do nothing
+  // 1 means 3.9 and factory reset required
+  // 2 means a major version upgrade
+  let upgradeImportantMessageType_n = 0;
+
+  // see if its a filename with a .bin extension
+  if (version.endsWith('.bin')) {
+    upgradeImportantMessageType_n = 1; // 1 means 3.9 and factory reset required
+  } else if (version.endsWith('.md')) {
+    upgradeImportantMessageType_n = 0;
+  } else {
+    // this is a version string like "3.9.0"
+    upgradeImportantMessageType_n = 2;
+  }
+
+  console.log('upgradeImportantMessageType: ' + upgradeImportantMessageType_n);
+  return { upgradeImportantMessageType: upgradeImportantMessageType_n };
+}
+
+// called by Action endpoint checkUpgrade
 function check_upgrade(version: string) {
   let data = {};
   if (version) {
@@ -5172,30 +5193,7 @@ router
         return status(200);
       } else if (action === 'upgradeImportantMessages') {
         // check upgrade important messages
-        console.log(
-          'checking upgrade important messages for version ',
-          content.param
-        );
-        // determine message based on if we're upgrading a minor or major version
-        // TODO finish this
-        let message = 0;
-        const version = content.param;
-        const majorVersion = version.split('.')[0];
-        const minorVersion = version.split('.')[1];
-        const currentMajorVersion = THIS_VERSION.split('.')[0];
-        const currentMinorVersion = THIS_VERSION.split('.')[1];
-        if (majorVersion > currentMajorVersion) {
-          message = 1;
-        } else if (majorVersion < currentMajorVersion) {
-          message = 2;
-        } else if (minorVersion > currentMinorVersion) {
-          message = 1;
-        } else if (minorVersion < currentMinorVersion) {
-          message = 2;
-        } else {
-          message = 0;
-        }
-        return message;
+        return upgradeImportantMessages(content.param);
       }
     }
     return status(404); // cmd not found
diff --git a/sonar-project.properties b/sonar-project.properties
index cee91ae32..563719c80 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=emsesp
 sonar.projectKey=emsesp_EMS-ESP32
 sonar.projectName=EMS-ESP32
-sonar.projectVersion=3.8.0
+sonar.projectVersion=3.8.2
 sonar.sources=./src
 sonar.cfamily.compile-commands=bw-output/compile_commands.json
 sonar.sourceEncoding=UTF-8
diff --git a/src/ESP32React/APSettingsService.h b/src/ESP32React/APSettingsService.h
index 9b52f84d0..947911882 100644
--- a/src/ESP32React/APSettingsService.h
+++ b/src/ESP32React/APSettingsService.h
@@ -70,9 +70,9 @@ class APSettings {
     IPAddress subnetMask;
 
     bool operator==(const APSettings & settings) const {
-        return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden
-               && maxClients == settings.maxClients && localIP == settings.localIP && gatewayIP == settings.gatewayIP
-               && subnetMask == settings.subnetMask && ssid == settings.ssid && password == settings.password;
+        return provisionMode == settings.provisionMode && channel == settings.channel && ssidHidden == settings.ssidHidden && maxClients == settings.maxClients
+               && localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask && ssid == settings.ssid
+               && password == settings.password;
     }
 
     static void              read(const APSettings & settings, JsonObject root);
diff --git a/src/ESP32React/MqttSettingsService.cpp b/src/ESP32React/MqttSettingsService.cpp
index 5bcaa9562..26754c118 100644
--- a/src/ESP32React/MqttSettingsService.cpp
+++ b/src/ESP32React/MqttSettingsService.cpp
@@ -256,7 +256,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject root) {
 
 StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) {
     MqttSettings newSettings;
-    bool         changed     = false;
+    bool         changed = false;
 
 #ifndef TASMOTA_SDK
     newSettings.enableTLS = root["enableTLS"];
diff --git a/src/ESP32React/UploadFileService.cpp b/src/ESP32React/UploadFileService.cpp
index 4aa634c2a..3d4e99152 100644
--- a/src/ESP32React/UploadFileService.cpp
+++ b/src/ESP32React/UploadFileService.cpp
@@ -184,7 +184,7 @@ void UploadFileService::handleError(AsyncWebServerRequest * request, int code) {
 }
 
 void UploadFileService::handleEarlyDisconnect() {
-    emsesp::EMSESP::logger().info("Upload completed");
+    emsesp::EMSESP::logger().info("Upload finished");
     emsesp::EMSESP::system_.uart_init(); // re-enable UART
 
     _is_firmware = false;
diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp
index dc7c53aad..c0b0b8d04 100644
--- a/src/web/WebSettingsService.cpp
+++ b/src/web/WebSettingsService.cpp
@@ -502,9 +502,9 @@ void WebSettings::set_board_profile(WebSettings & settings) {
 #ifndef EMSESP_STANDALONE
     uint32_t psram_size = ESP.getPsramSize() / 1024; // in KB
     if (psram_size > 0) {
-        EMSESP::logger().info("Loaded board profile %s, PSRAM: %lu KB", settings.board_profile.c_str(), psram_size);
+        EMSESP::logger().info("Loaded board profile %s (PSRAM: %lu KB)", settings.board_profile.c_str(), psram_size);
     } else {
-        EMSESP::logger().info("Loaded board profile %s, PSRAM: not available", settings.board_profile.c_str());
+        EMSESP::logger().info("Loaded board profile %s (PSRAM: not available)", settings.board_profile.c_str());
     }
 #endif
 
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index 3978d6e91..23f4d3486 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -217,7 +217,8 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
         EMSESP::mqtt_.reset_mqtt();
         ok = true;
     } else if (action == "upgradeImportantMessages") {
-        ok = upgradeImportantMessages(param.c_str());
+        root["upgradeImportantMessageType"] = upgradeImportantMessages(param);
+        ok                                  = true;
     }
 
 #if defined(EMSESP_STANDALONE) && !defined(EMSESP_UNITY)
@@ -240,26 +241,74 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
 }
 
 // action = upgradeImportantMessages
-// returns the type of upgrade important message to show\
-// 0 = no message
-// 1 = major version upgrade
-// 2 = minor version upgrade
-// TODO finish this
-bool WebStatusService::upgradeImportantMessages(const char * version) {
-    version::Semver200_version current_version(current_version_s);
-    version::Semver200_version latest_version(version);
-    if (latest_version > current_version) {
-        return 1;
+// returns the type of upgrade important message to display in the UI
+// 0 = no message (if just a minor version upgrade)
+// 1 = going from <= 3.8 to 3.9 (has new partition layout)
+// 2 = major version upgrade
+// version can be like 3.8.2 or a filename like EMS-ESP-3_8_2-dev_13-ESP32-16MB+.bin
+uint8_t WebStatusService::upgradeImportantMessages(std::string & version) {
+    if (version.empty()) {
+        return 0;
     }
+
+    // it's a filename with a .bin or .md extension, try and extract the version from it
+    // e.g. EMS-ESP-3_8_2-dev_13-ESP32-16MB+.bin -> major=3 minor=8 patch=2
+    version::Semver200_version latest_version;
+    if ((version.find(".bin") != std::string::npos) || (version.find(".md") != std::string::npos)) {
+        std::string filename = version;
+        auto        pos      = filename.find("EMS-ESP-");
+        if (pos == std::string::npos) {
+            EMSESP::logger().err("Invalid version string: %s", version.c_str());
+            return 0;
+        }
+
+        pos += 8; // skip past "EMS-ESP-"
+        auto underscore1 = filename.find('_', pos);
+        auto underscore2 = filename.find('_', underscore1 + 1);
+        auto dash        = filename.find('-', underscore2 + 1);
+        if (underscore1 == std::string::npos || underscore2 == std::string::npos || dash == std::string::npos) {
+            EMSESP::logger().err("Invalid version string: %s", version.c_str());
+            return 0;
+        }
+
+        std::string major_version = filename.substr(pos, underscore1 - pos);
+        std::string minor_version = filename.substr(underscore1 + 1, underscore2 - underscore1 - 1);
+        std::string patch_version = filename.substr(underscore2 + 1, dash - underscore2 - 1);
+        latest_version            = version::Semver200_version(major_version + "." + minor_version + "." + patch_version);
+    } else {
+        // if it's .json file exit
+        if (version.find(".json") != std::string::npos) {
+            return 0;
+        } else {
+            // treat it like a version string like "3.9.0"
+            latest_version = version::Semver200_version(version);
+        }
+    }
+
+    version::Semver200_version current_version(current_version_s); // get current version
+
+    if (latest_version > current_version && current_version.minor() < latest_version.minor()) {
+        return 0; // if it's just a minor version upgrade return 0
+    }
+
+    if ((current_version.major() <= 3 && current_version.minor() <= 8) && (latest_version.major() == 3 && latest_version.minor() == 9)) {
+        return 1; // if moving from below 3.8.x to 3.9.x return 1
+    }
+
+    if (latest_version > current_version && current_version.major() < latest_version.major()) {
+        return 2; // if it's a major version upgrade return 2
+    }
+
+    return 0; // if it's not a valid version upgrade return 0
 }
 
 // action = checkUpgrade
 // versions holds the latest development version and stable version in one string, comma separated
-bool WebStatusService::checkUpgrade(JsonObject root, std::string & versions) {
-    if (!versions.empty()) {
+bool WebStatusService::checkUpgrade(JsonObject root, std::string & version) {
+    if (!version.empty()) {
         version::Semver200_version current_version(current_version_s);
-        version::Semver200_version latest_dev_version(versions.substr(0, versions.find(',')));
-        version::Semver200_version latest_stable_version(versions.substr(versions.find(',') + 1));
+        version::Semver200_version latest_dev_version(version.substr(0, version.find(',')));
+        version::Semver200_version latest_stable_version(version.substr(version.find(',') + 1));
 
         bool dev_upgradeable    = latest_dev_version > current_version;
         bool stable_upgradeable = latest_stable_version > current_version;
@@ -358,7 +407,7 @@ bool WebStatusService::getCustomSupport(JsonObject root) {
 
 #if defined(EMSESP_STANDALONE)
     // dummy test data for "test api3"
-    deserializeJson(doc, "{\"type\":\"customSupport\",\"Support\":{\"html\":[\"html code\",\"here\"], \"img_url\": \"https://emsesp.org/_media/images/designer.png\"}");
+    deserializeJson(doc, "{\"type\":\"customSupport\",\"Support\":{\"html\":[\"html code\",\"here\"], \"img_url\": \"https://emsesp.org/media/images/designer.png\"}");
 #else
     // check if we have custom support file uploaded
     File file = LittleFS.open(EMSESP_CUSTOMSUPPORT_FILE, "r");
diff --git a/src/web/WebStatusService.h b/src/web/WebStatusService.h
index 7dd7e28f8..8d2c69bfd 100644
--- a/src/web/WebStatusService.h
+++ b/src/web/WebStatusService.h
@@ -30,13 +30,13 @@ class WebStatusService {
     SecurityManager * _securityManager;
 
     // actions
-    bool checkUpgrade(JsonObject root, std::string & latest_version);
-    bool exportData(JsonObject root, std::string & type);
-    bool getCustomSupport(JsonObject root);
-    bool uploadURL(const char * url);
-    bool setSystemStatus(const char * status);
-    void allvalues(JsonObject output);
-    bool upgradeImportantMessages(const char * version);
+    bool    checkUpgrade(JsonObject root, std::string & latest_version);
+    bool    exportData(JsonObject root, std::string & type);
+    bool    getCustomSupport(JsonObject root);
+    bool    uploadURL(const char * url);
+    bool    setSystemStatus(const char * status);
+    void    allvalues(JsonObject output);
+    uint8_t upgradeImportantMessages(std::string & version);
 
     std::string current_version_s = EMSESP_APP_VERSION;
 };
diff --git a/test/test_data/custom_support.json b/test/test_data/custom_support.json
index b528645a3..6d5b81502 100644
--- a/test/test_data/custom_support.json
+++ b/test/test_data/custom_support.json
@@ -13,6 +13,6 @@
       "",
       "For help and questions please <a target='_blank' href='https://emsesp.org'>contact</a> your installer."
     ],
-      "img_url": "https://emsesp.org/_media/images/designer.png"
+      "img_url": "https://emsesp.org/media/images/designer.png"
     }
 }
\ No newline at end of file
diff --git a/test/test_data/emsesp_allvalues.json b/test/test_data/emsesp_allvalues.json
new file mode 100644
index 000000000..6a8297eb1
--- /dev/null
+++ b/test/test_data/emsesp_allvalues.json
@@ -0,0 +1,103 @@
+{
+  "Boiler Nefit Trendline HRC30 (DeviceID:0x08, ProductID:123, Version:06.01)": {
+    "force heating off": "off",
+    "heating active": "off",
+    "tapwater active": "off",
+    "selected flow temperature": 5,
+    "heating pump modulation": 0,
+    "current flow temperature": 41.4,
+    "return temperature": 37.7,
+    "system pressure": 1.3,
+    "actual boiler temperature": 44.2,
+    "gas": "off",
+    "gas stage 2": "off",
+    "flame current": 0,
+    "fan": "off",
+    "ignition": "off",
+    "oil preheating": "off",
+    "burner min power": 0,
+    "burner max power": 50,
+    "burner min period": 10,
+    "hysteresis on temperature": -6,
+    "hysteresis off temperature": 6,
+    "heating activated": "on",
+    "heating temperature": 70,
+    "heating pump": "off",
+    "boiler pump max power": 70,
+    "boiler pump min power": 50,
+    "boiler pump mode": "proportional",
+    "pump delay": 2,
+    "burner selected max power": 0,
+    "burner current power": 0,
+    "burner starts": 394602,
+    "total burner operating time": "480 days 4 hours 23 minutes",
+    "burner stage 2 operating time": "0 days 0 hours 0 minutes",
+    "total heat operating time": "395 days 2 hours 14 minutes",
+    "burner starts heating": 46245,
+    "total UBA operating time": "3932 days 23 hours 58 minutes",
+    "last error code": "2E(207) 100.75.2000 65:00 (0 min)",
+    "service code": "0H",
+    "service code number": 203,
+    "maintenance message": "H00",
+    "maintenance scheduled": "manual",
+    "time to next maintenance": 6000,
+    "next maintenance date": "01.01.2012",
+    "dhw turn on/off": "on",
+    "dhw set temperature": 62,
+    "dhw selected temperature": 60,
+    "dhw type": "flow",
+    "dhw comfort": "hot",
+    "dhw flow temperature offset": 40,
+    "dhw max power": 100,
+    "dhw circulation pump available": "off",
+    "dhw charging type": "3-way valve",
+    "dhw hysteresis on temperature": -5,
+    "dhw hysteresis off temperature": 0,
+    "dhw disinfection temperature": 70,
+    "dhw circulation pump mode": "off",
+    "dhw circulation active": "off",
+    "dhw current intern temperature": 33.5,
+    "dhw current tap water flow": 0,
+    "dhw storage intern temperature": 33.5,
+    "dhw activated": "on",
+    "dhw one time charging": "off",
+    "dhw disinfecting": "off",
+    "dhw charging": "off",
+    "dhw recharging": "off",
+    "dhw temperature ok": "on",
+    "dhw active": "off",
+    "dhw 3-way valve active": "on",
+    "dhw set pump power": 0,
+    "dhw starts": 348357,
+    "dhw active time": "85 days 2 hours 9 minutes",
+    "nominal Power": 30,
+    "total energy": 3088.69,
+    "energy heating": 2532.94,
+    "dhw energy": 555.75
+  },
+  "Thermostat RC20 (DeviceID:0x17, ProductID:77, Version:03.03)": {
+    "date/time": "10.12.2023 13:49",
+    "hc1 how hot lounge should be": 19,
+    "hc1 current room temp": 19.5,
+    "hc1 mqtt discovery current room temperature": "roomTemp",
+    "hc1 mode": "auto",
+    "hc1 manual temperature": 21.5,
+    "hc1 temperature when mode is off": 7,
+    "hc1 day temperature T2": 20,
+    "hc1 day temperature T3": 20,
+    "hc1 day temperature T4": 20,
+    "hc1 night temperature T1": 15,
+    "hc1 program switchtime": "00 mo 00:00 T1"
+  },
+  "Controller Module BC10 (DeviceID:0x09, ProductID:190, Version:01.03)": {},
+  "Custom Entities": {
+    "boiler_flowtemp": 5,
+    "nominalpower": 30,
+    "minmodulation": 23,
+    "maxmodulation": 115
+  },
+  "Analog Sensors": {},
+  "Temperature Sensors": {
+    "zolder": 18.3
+  }
+}
\ No newline at end of file
diff --git a/test/test_data/emsesp_customizations.json b/test/test_data/emsesp_customizations.json
new file mode 100644
index 000000000..99ba91cef
--- /dev/null
+++ b/test/test_data/emsesp_customizations.json
@@ -0,0 +1,37 @@
+{
+  "type": "customizations",
+  "Customizations": {
+    "ts": [],
+    "as": [],
+    "masked_entities": [
+      {
+        "product_id": 77,
+        "device_id": 23,
+        "custom_name": "",
+        "custom_brand": "",
+        "entity_ids": [
+          "08datetime",
+          "08hc1/seltemp|<30",
+          "08hc1/currtemp",
+          "08hc1/mode"
+        ]
+      },
+      {
+        "product_id": 123,
+        "device_id": 8,
+        "custom_name": "",
+        "custom_brand": "",
+        "entity_ids": [
+          "08heatingactive",
+          "08burngas",
+          "08fanwork",
+          "08ignwork",
+          "08burnmaxpower|>23<121",
+          "08burnminperiod|<120",
+          "08lastcode",
+          "08servicecode"
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test/test_data/emsesp_entities.json b/test/test_data/emsesp_entities.json
new file mode 100644
index 000000000..804cc81d4
--- /dev/null
+++ b/test/test_data/emsesp_entities.json
@@ -0,0 +1,6 @@
+{
+  "type": "entities",
+  "Entities": {
+    "entities": []
+  }
+}
\ No newline at end of file
diff --git a/test/test_data/emsesp_schedule.json b/test/test_data/emsesp_schedule.json
new file mode 100644
index 000000000..8674b3959
--- /dev/null
+++ b/test/test_data/emsesp_schedule.json
@@ -0,0 +1,6 @@
+{
+  "type": "schedule",
+  "Schedule": {
+    "schedule": []
+  }
+}
\ No newline at end of file
diff --git a/test/test_data/emsesp_settings.json b/test/test_data/emsesp_settings.json
new file mode 100644
index 000000000..80b8f74d4
--- /dev/null
+++ b/test/test_data/emsesp_settings.json
@@ -0,0 +1,145 @@
+{
+  "type": "settings",
+  "System": {
+    "version": "3.8.2"
+  },
+  "Network": {
+    "ssid": "",
+    "bssid": "",
+    "password": "",
+    "hostname": "ems-esp",
+    "static_ip_config": false,
+    "bandwidth20": false,
+    "nosleep": true,
+    "enableMDNS": true,
+    "enableCORS": false,
+    "CORSOrigin": "*",
+    "tx_power": 0
+  },
+  "AP": {
+    "provision_mode": 2,
+    "ssid": "ems-esp",
+    "password": "ems-esp-neo",
+    "channel": 1,
+    "ssid_hidden": false,
+    "max_clients": 4,
+    "local_ip": "192.168.4.1",
+    "gateway_ip": "192.168.4.1",
+    "subnet_mask": "255.255.255.0"
+  },
+  "MQTT": {
+    "enableTLS": false,
+    "rootCA": "",
+    "enabled": true,
+    "host": "192.168.X.X",
+    "port": 1883,
+    "base": "ems-esp",
+    "username": "xxxx",
+    "password": "xxxx",
+    "client_id": "esp32-395c7bcc",
+    "keep_alive": 60,
+    "clean_session": false,
+    "entity_format": 1,
+    "publish_time_boiler": 60,
+    "publish_time_thermostat": 60,
+    "publish_time_solar": 60,
+    "publish_time_mixer": 60,
+    "publish_time_water": 60,
+    "publish_time_other": 60,
+    "publish_time_sensor": 60,
+    "publish_time_heartbeat": 10,
+    "mqtt_qos": 0,
+    "mqtt_retain": false,
+    "ha_enabled": true,
+    "nested_format": 1,
+    "discovery_prefix": "homeassistant",
+    "discovery_type": 0,
+    "ha_number_mode": 1,
+    "publish_single": false,
+    "publish_single2cmd": false,
+    "send_response": false
+  },
+  "NTP": {
+    "enabled": true,
+    "server": "time.google.com",
+    "tz_label": "Europe/Amsterdam",
+    "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
+  },
+  "Security": {
+    "jwt_secret": "ems-esp-neo",
+    "users": [
+      {
+        "username": "admin",
+        "password": "admin",
+        "admin": true
+      },
+      {
+        "username": "guest",
+        "password": "guest",
+        "admin": false
+      }
+    ]
+  },
+  "Settings": {
+    "version": "3.8.2",
+    "board_profile": "E32V2",
+    "platform": "ESP32",
+    "locale": "en",
+    "tx_mode": 1,
+    "ems_bus_id": 11,
+    "syslog_enabled": false,
+    "syslog_level": 3,
+    "trace_raw": false,
+    "syslog_mark_interval": 0,
+    "syslog_host": "",
+    "syslog_port": 514,
+    "boiler_heatingoff": false,
+    "remote_timeout": 24,
+    "remote_timeout_en": false,
+    "shower_timer": true,
+    "shower_alert": false,
+    "shower_alert_coldshot": 10,
+    "shower_alert_trigger": 7,
+    "shower_min_duration": 180,
+    "rx_gpio": 4,
+    "tx_gpio": 5,
+    "dallas_gpio": 14,
+    "dallas_parasite": false,
+    "led_gpio": 2,
+    "hide_led": true,
+    "led_type": 0,
+    "low_clock": false,
+    "telnet_enabled": true,
+    "notoken_api": false,
+    "readonly_mode": false,
+    "analog_enabled": true,
+    "pbutton_gpio": 34,
+    "solar_maxflow": 30,
+    "fahrenheit": false,
+    "bool_format": 1,
+    "bool_dashboard": 1,
+    "enum_format": 1,
+    "weblog_level": 6,
+    "weblog_buffer": 500,
+    "weblog_compact": true,
+    "phy_type": 1,
+    "eth_power": 15,
+    "eth_phy_addr": 0,
+    "eth_clock_mode": 1,
+    "modbus_enabled": false,
+    "modbus_port": 502,
+    "modbus_max_clients": 10,
+    "modbus_timeout": 300,
+    "developer_mode": true,
+    "email_enabled": false,
+    "email_ssl": false,
+    "email_starttls": true,
+    "email_server": "smtp.example.net",
+    "email_port": 587,
+    "email_login": "",
+    "email_pass": "",
+    "email_sender": "ems-esp@example.net",
+    "email_recp": "",
+    "email_subject": "ems-esp notification"
+  }
+}
\ No newline at end of file
diff --git a/test/test_data/emsesp_systembackup.json b/test/test_data/emsesp_systembackup.json
new file mode 100644
index 000000000..3f7b0816c
--- /dev/null
+++ b/test/test_data/emsesp_systembackup.json
@@ -0,0 +1,249 @@
+{
+  "type": "systembackup",
+  "version": "3.8.2",
+  "date": "2026-04-15T08:06:45",
+  "systembackup": [
+    {
+      "type": "settings",
+      "Network": {
+        "ssid": "",
+        "bssid": "",
+        "password": "",
+        "hostname": "ems-esp",
+        "static_ip_config": false,
+        "bandwidth20": false,
+        "nosleep": true,
+        "enableMDNS": true,
+        "enableCORS": false,
+        "CORSOrigin": "*",
+        "tx_power": 0
+      },
+      "AP": {
+        "provision_mode": 2,
+        "ssid": "ems-esp",
+        "password": "ems-esp-neo",
+        "channel": 1,
+        "ssid_hidden": false,
+        "max_clients": 4,
+        "local_ip": "192.168.X.X",
+        "gateway_ip": "192.168.X.X",
+        "subnet_mask": "255.255.255.0"
+      },
+      "MQTT": {
+        "enableTLS": false,
+        "rootCA": "",
+        "enabled": true,
+        "host": "192.168.X.X",
+        "port": 1883,
+        "base": "ems-esp",
+        "username": "xxxx",
+        "password": "xxxx",
+        "client_id": "esp32-395c7bcc",
+        "keep_alive": 60,
+        "clean_session": false,
+        "entity_format": 1,
+        "publish_time_boiler": 60,
+        "publish_time_thermostat": 60,
+        "publish_time_solar": 60,
+        "publish_time_mixer": 60,
+        "publish_time_water": 60,
+        "publish_time_other": 60,
+        "publish_time_sensor": 60,
+        "publish_time_heartbeat": 10,
+        "mqtt_qos": 0,
+        "mqtt_retain": false,
+        "ha_enabled": true,
+        "nested_format": 1,
+        "discovery_prefix": "homeassistant",
+        "discovery_type": 0,
+        "ha_number_mode": 1,
+        "publish_single": false,
+        "publish_single2cmd": false,
+        "send_response": false
+      },
+      "NTP": {
+        "enabled": true,
+        "server": "time.google.com",
+        "tz_label": "Europe/Amsterdam",
+        "tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
+      },
+      "Security": {
+        "jwt_secret": "ems-esp-neo",
+        "users": [
+          {
+            "username": "admin",
+            "password": "admin",
+            "admin": true
+          },
+          {
+            "username": "guest",
+            "password": "guest",
+            "admin": false
+          }
+        ]
+      },
+      "Settings": {
+        "version": "3.8.2",
+        "board_profile": "E32V2",
+        "platform": "ESP32",
+        "locale": "en",
+        "tx_mode": 1,
+        "ems_bus_id": 11,
+        "syslog_enabled": false,
+        "syslog_level": 3,
+        "trace_raw": false,
+        "syslog_mark_interval": 0,
+        "syslog_host": "",
+        "syslog_port": 514,
+        "boiler_heatingoff": false,
+        "remote_timeout": 24,
+        "remote_timeout_en": false,
+        "shower_timer": true,
+        "shower_alert": false,
+        "shower_alert_coldshot": 10,
+        "shower_alert_trigger": 7,
+        "shower_min_duration": 180,
+        "rx_gpio": 4,
+        "tx_gpio": 5,
+        "dallas_gpio": 14,
+        "dallas_parasite": false,
+        "led_gpio": 2,
+        "hide_led": true,
+        "led_type": 0,
+        "low_clock": false,
+        "telnet_enabled": true,
+        "notoken_api": false,
+        "readonly_mode": false,
+        "analog_enabled": true,
+        "pbutton_gpio": 34,
+        "solar_maxflow": 30,
+        "fahrenheit": false,
+        "bool_format": 1,
+        "bool_dashboard": 1,
+        "enum_format": 1,
+        "weblog_level": 6,
+        "weblog_buffer": 75,
+        "weblog_compact": true,
+        "phy_type": 1,
+        "eth_power": 15,
+        "eth_phy_addr": 0,
+        "eth_clock_mode": 1,
+        "modbus_enabled": false,
+        "modbus_port": 502,
+        "modbus_max_clients": 10,
+        "modbus_timeout": 300,
+        "developer_mode": true
+      }
+    },
+    {
+      "type": "schedule",
+      "Schedule": {
+        "schedule": []
+      }
+    },
+    {
+      "type": "customizations",
+      "Customizations": {
+        "ts": [],
+        "as": [],
+        "masked_entities": [
+          {
+            "product_id": 77,
+            "device_id": 23,
+            "custom_name": "",
+            "custom_brand": "",
+            "entity_ids": [
+              "08datetime",
+              "08hc1/seltemp|<30",
+              "08hc1/currtemp",
+              "08hc1/mode"
+            ]
+          },
+          {
+            "product_id": 123,
+            "device_id": 8,
+            "custom_name": "",
+            "custom_brand": "",
+            "entity_ids": [
+              "08heatingactive",
+              "08burngas",
+              "08fanwork",
+              "08ignwork",
+              "08burnmaxpower|>23<121",
+              "08burnminperiod|<120",
+              "08lastcode",
+              "08servicecode"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "type": "entities",
+      "Entities": {
+        "entities": []
+      }
+    },
+    {
+      "type": "modules",
+      "Modules": {
+        "modules": []
+      }
+    },
+    {
+      "type": "nvs",
+      "nvs": [
+        {
+          "type": 1,
+          "key": "nompower",
+          "value": 30
+        },
+        {
+          "type": 33,
+          "key": "boot",
+          "value": "3.8.1-dev.4"
+        },
+        {
+          "type": 4,
+          "key": "d_boot",
+          "value": 1767525325
+        },
+        {
+          "type": 33,
+          "key": "app1",
+          "value": "3.8.2-dev.13"
+        },
+        {
+          "type": 33,
+          "key": "app0",
+          "value": "3.8.1"
+        },
+        {
+          "type": 4,
+          "key": "d_app0",
+          "value": 1774988066
+        },
+        {
+          "type": 1,
+          "key": "fresh_firmware",
+          "value": 0
+        },
+        {
+          "type": 4,
+          "key": "d_app1",
+          "value": 1776194060
+        },
+        {
+          "type": 66,
+          "key": "nrgheat",
+          "value": 485871.5481
+        },
+        {
+          "type": 66,
+          "key": "nrgww",
+          "value": 101649.2176
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file