diff --git a/back/workflows.json b/back/workflows.json
deleted file mode 100755
index 08914fc4..00000000
--- a/back/workflows.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[
-  {
-    "name": "Sample Device Update Workflow",
-    "trigger": {
-      "object_type": "Devices",
-      "event_type": "update"
-    },
-    "conditions": [
-      {
-        "logic": "AND",
-        "conditions": [
-          {
-            "field": "devVendor",
-            "operator": "contains",
-            "value": "Google"
-          },
-          {
-            "field": "devIsNew",
-            "operator": "equals",
-            "value": "1"
-          },
-          {
-            "logic": "OR",
-            "conditions": [
-              {
-                "field": "devIsNew",
-                "operator": "equals",
-                "value": "1"
-              },
-              {
-                "field": "devName",
-                "operator": "contains",
-                "value": "Google"
-              }
-            ]
-          }
-        ]
-      }
-    ],
-    "actions": [
-      {
-        "type": "update_field",
-        "field": "devIsNew",
-        "value": "0"
-      },
-      {
-        "type": "run_plugin",
-        "plugin": "SMTP",
-        "params": {
-          "message": "New device from Google detected."
-        }
-      }
-    ]
-  }
-]
\ No newline at end of file
diff --git a/dockerfiles/init.sh b/dockerfiles/init.sh
index 52fab61b..09a17a84 100755
--- a/dockerfiles/init.sh
+++ b/dockerfiles/init.sh
@@ -37,7 +37,6 @@ export INSTALL_DIR=/app  # Specify the installation directory here
 # DO NOT CHANGE ANYTHING BELOW THIS LINE!
 
 CONF_FILE="app.conf"
-WF_FILE="workflows.json"
 NGINX_CONF_FILE=netalertx.conf
 DB_FILE="app.db"
 FULL_FILEDB_PATH="${INSTALL_DIR}/db/${DB_FILE}"
@@ -97,9 +96,8 @@ fi
 
 echo "[INSTALL] Copy starter ${DB_FILE} and ${CONF_FILE} if they don't exist"
 
-# Copy starter app.db, app.conf, workflows.json if they don't exist
+# Copy starter app.db, app.conf if they don't exist
 cp -na "${INSTALL_DIR}/back/${CONF_FILE}" "${INSTALL_DIR}/config/${CONF_FILE}"
-cp -na "${INSTALL_DIR}/back/${WF_FILE}" "${INSTALL_DIR}/config/${WF_FILE}"
 cp -na "${INSTALL_DIR}/back/${DB_FILE}" "${FULL_FILEDB_PATH}"
 
 # if custom variables not set we do not need to do anything
diff --git a/front/css/app.css b/front/css/app.css
index f6681c3d..bc23bb2c 100755
--- a/front/css/app.css
+++ b/front/css/app.css
@@ -1524,10 +1524,11 @@ input[readonly] {
     margin:0px;
     align-items:center;
     border-radius:20px;
-    width:190px; /* Don't change, smaller causes line break in network view */
-    display:flex;
+    /* width:190px; Don't change, smaller causes line break in network view */
+    /* display:flex; */
     flex-direction:column;
     justify-content:center;
+    display: inline-grid;
 }
 .networkHelpIcon
 {
@@ -1597,7 +1598,7 @@ input[readonly] {
 
 .spanNetworkTree {
     display: inline-block;
-    width: 135px;
+    /* width: 135px; */
     white-space: nowrap;
     overflow: hidden !important;
     text-overflow: ellipsis;
@@ -1871,6 +1872,7 @@ input[readonly] {
 .workflows .add-button-wrap .button-container
 {
     padding-bottom: 5px;
+    text-align: center;
 }
 
 .workflows .actions-list {
@@ -1901,12 +1903,21 @@ input[readonly] {
     color: #000;
 }
 
-.workflows .button-container button
+.workflows .button-container 
 {
-    display: inline-table;
+    display: contents;
+    text-align: center;
     width: 100%;
 }
 
+.workflows .panel:hover{
+    opacity: 1;
+}
+
+.workflows .panel{
+    opacity: 0.8;
+}
+
 .workflows .bottom-buttons button
 {
     margin: 5px;
@@ -1914,8 +1925,8 @@ input[readonly] {
 
 .workflows .button-container 
 {
-    padding-right: 5px !important;
-    padding-left: 5px !important;
+    padding-right: 0px !important;
+    padding-left: 0px !important;
 }
 
 /* .workflows .condition-list button
@@ -1928,6 +1939,11 @@ input[readonly] {
     width:100%; 
 } */
 
+.workflows .workflow-card 
+{
+    display: block;
+}
+
 .workflow-card .panel-title
 {
     padding: 10px;
diff --git a/front/css/system-dark-patch.css b/front/css/system-dark-patch.css
index cb9fd2a5..6b6a9197 100755
--- a/front/css/system-dark-patch.css
+++ b/front/css/system-dark-patch.css
@@ -744,4 +744,5 @@
 .thresholdFormControl
 {
   color:#000;   
-}
\ No newline at end of file
+}
+
diff --git a/front/devices.php b/front/devices.php
index 5a260eae..f9c58ffe 100755
--- a/front/devices.php
+++ b/front/devices.php
@@ -743,6 +743,7 @@ function initializeDatatable (status) {
     'ordering'     : true,
     'info'         : true,
     'autoWidth'    : false,
+    'dom': '<"top"f>rtl<"bottom"ip><"clear">',
 
     // Parameters
     'pageLength'   : tableRows,
diff --git a/front/lib/treeviz/bundle.js.map b/front/lib/treeviz/bundle.js.map
deleted file mode 100755
index 804245ee..00000000
--- a/front/lib/treeviz/bundle.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"bundle.js","sources":["../../src/d3.ts","../../src/utils.ts","../../src/initializeSVG.ts","../../src/links/draw-links.ts","../../src/links/link-enter.ts","../../src/links/link-exit.ts","../../src/links/link-update.ts","../../src/nodes/node-enter.ts","../../src/nodes/node-exit.ts","../../src/nodes/node-update.ts","../../src/prepare-data.ts","../../src/index.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null],"names":["hierarchy","stratify","tree","treemap","select","selectAll","zoom"],"mappings":"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"}
\ No newline at end of file
diff --git a/front/maintenance.php b/front/maintenance.php
index abeabe09..42f8d1e8 100755
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -440,17 +440,15 @@ function askImportPastedConfig() {
 // Upload Settings Config
 function UploadConfig()
 { 
-  // alert("aaa")
-
   appConf = $('#modal-input-textarea').val()
   // encode for import
   appConfBase64 = btoa(appConf)
 
   // import
-  $.post('php/server/query_replace_config.php', { config: appConfBase64 }, function(msg) {
+  $.post('php/server/query_replace_config.php', { base64data: appConfBase64, fileName: "app.conf" }, function(msg) {
     console.log(msg);            
     // showMessage(msg);            
-    write_notification(`[Maintenance] Settings imported from backup: ${msg}`, 'interrupt');
+    write_notification(`[Maintenance]: ${msg}`, 'interrupt');
   });
 
 }
diff --git a/front/network.php b/front/network.php
index 2249b801..152af707 100755
--- a/front/network.php
+++ b/front/network.php
@@ -465,7 +465,7 @@
 ?>
 
 <script src="lib/treeviz/bundle.js"></script> 
-<script src="lib/treeviz/bundle.js.map"></script> 
+
 
 
 <script defer>
diff --git a/front/php/server/init.php b/front/php/server/init.php
index 09ceff65..11d27cbc 100755
--- a/front/php/server/init.php
+++ b/front/php/server/init.php
@@ -1,6 +1,6 @@
 <?php
 ini_set('error_log', '../../log/app.php_errors.log'); // initializing the app.php_errors.log file for the maintenance section
-require dirname(__FILE__).'/../templates/timezone.php';
+require dirname(__FILE__).'/../templates/globals.php';
 require dirname(__FILE__).'/db.php';
 require dirname(__FILE__).'/util.php';
 require dirname(__FILE__).'/../templates/language/lang.php';
diff --git a/front/php/server/query_config.php b/front/php/server/query_config.php
index f1c96a0b..20f252ff 100755
--- a/front/php/server/query_config.php
+++ b/front/php/server/query_config.php
@@ -13,21 +13,23 @@ require dirname(__FILE__).'/../server/init.php';
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // Get query string parameters ?file=settings_table.json&download=true
     $file = isset($_GET['file']) ? $_GET['file'] : null;
-    $download = isset($_GET['download']) ? $_GET['download'] === 'true' : false;
+    $download = isset($_GET['download']) && $_GET['download'] === 'true';
 
     // Check if file parameter is provided
     if ($file) {
         // Define the folder where files are located
         $filePath = "/app/config/" . basename($file);
 
-        // Check if the file exists
-        if (file_exists($filePath)) {
-            // Handle download behavior
+        // Check if the file exists and is readable
+        if (file_exists($filePath) && is_readable($filePath)) {
+            // Determine file extension
+            $extension = pathinfo($filePath, PATHINFO_EXTENSION);
+
             if ($download) {
                 // Force file download
                 header('Content-Description: File Transfer');
                 header('Content-Type: application/octet-stream');
-                header('Content-Disposition: attachment; filename="' . basename($filePath) . '"');
+                header('Content-Disposition: attachment; filename="' . basename($file) . '"');
                 header('Expires: 0');
                 header('Cache-Control: must-revalidate');
                 header('Pragma: public');
@@ -35,19 +37,29 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                 readfile($filePath);
                 exit;
             } else {
-                // Display file content
-                header('Content-Type: text/plain');
-                echo file_get_contents($filePath);
+                // Serve file based on type
+                if ($extension === 'json') {
+                    header('Content-Type: application/json');
+                    echo json_encode(json_decode(file_get_contents($filePath), true), JSON_PRETTY_PRINT);
+                } else {
+                    header('Content-Type: text/plain');
+                    echo file_get_contents($filePath);
+                }
+                exit;
             }
         } else {
             // File not found response
             http_response_code(404);
+            header('Content-Type: application/json');
             echo json_encode(["error" => "File not found"]);
+            exit;
         }
     } else {
         // Missing file parameter response
         http_response_code(400);
+        header('Content-Type: application/json');
         echo json_encode(["error" => "Missing 'file' parameter"]);
+        exit;
     }
 }
 ?>
diff --git a/front/php/server/query_replace_config.php b/front/php/server/query_replace_config.php
index 03898d7e..d2bc5e18 100755
--- a/front/php/server/query_replace_config.php
+++ b/front/php/server/query_replace_config.php
@@ -8,16 +8,24 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
 require dirname(__FILE__).'/../server/init.php';
 // ---- IMPORTS ----
 
-global $fullConfPath;
+global $configFolderPath;
 
 //------------------------------------------------------------------------------
 // Handle incoming requests
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     // Access the 'config' parameter from the POST request
-    $base64Data = $_POST['config'] ?? null;
+    $base64Data = $_POST['base64data'] ?? null;
 
     if (!$base64Data) {
-        $msg = "Missing 'config' parameter.";
+        $msg = "Missing 'base64data' parameter.";
+        echo $msg;
+        http_response_code(400); // Bad request
+        die($msg);
+    }
+    $fileName = $_POST['fileName'] ?? null;
+
+    if (!$fileName) {
+        $msg = "Missing 'fileName' parameter.";
         echo $msg;
         http_response_code(400); // Bad request
         die($msg);
@@ -33,15 +41,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         die($msg);
     }
 
+    $fullPath = $configFolderPath.$fileName;
+
     // Backup the original file
-    if (file_exists($fullConfPath)) {
-        copy($fullConfPath, $fullConfPath . ".bak");
+    if (file_exists($fullPath)) {
+        copy($fullPath, $fullPath . ".bak");
     }
 
     // Write the new configuration
-    $file = fopen($fullConfPath, "w");
+    $file = fopen($fullPath, "w");
     if (!$file) {
-        $msg = "Unable to open file!";
+        $msg = "Unable to open file: ". $fullPath;
         echo $msg;
         http_response_code(500); // Server error
         die($msg);
@@ -50,6 +60,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     fwrite($file, $input);
     fclose($file);
 
-    echo "Configuration saved successfully.";
+    echo "Configuration file saved successfully: " .$fileName ;
 }
 ?>
diff --git a/front/php/server/util.php b/front/php/server/util.php
index af9de575..84c23107 100755
--- a/front/php/server/util.php
+++ b/front/php/server/util.php
@@ -8,7 +8,7 @@
 #  Puche 2021 / 2022+ jokob             jokob@duck.com                GNU GPLv3
 //------------------------------------------------------------------------------
 
-require dirname(__FILE__).'/../templates/timezone.php';
+require dirname(__FILE__).'/../templates/globals.php';
 require dirname(__FILE__).'/../templates/skinUI.php';
 
 //------------------------------------------------------------------------------
diff --git a/front/php/server/utilNotification.php b/front/php/server/utilNotification.php
index 178fa189..45cb4ccd 100755
--- a/front/php/server/utilNotification.php
+++ b/front/php/server/utilNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-require dirname(__FILE__).'/../templates/timezone.php';
+require dirname(__FILE__).'/../templates/globals.php';
 
 //------------------------------------------------------------------------------
 // check if authenticated
diff --git a/front/php/templates/timezone.php b/front/php/templates/globals.php
similarity index 64%
rename from front/php/templates/timezone.php
rename to front/php/templates/globals.php
index 9a190378..c32c2b05 100755
--- a/front/php/templates/timezone.php
+++ b/front/php/templates/globals.php
@@ -1,17 +1,21 @@
 <?php
 
-// ###################################
-// ## TimeZone processing start
-// ###################################
+// ######################################################################
+// ## Global constants and TimeZone processing
+// ######################################################################
 
-$configFolderPath = dirname(__FILE__)."/../../../config/";
-$config_file = "app.conf";
+$configFolderPath = "/app/config/";
 $logFolderPath = "/app/log/";
+
+$config_file = "app.conf";
+$workflows_file = "workflows.json";
+
 $log_file = "app_front.log";
 $default_tz = "Europe/Berlin";
 
 
 $fullConfPath = $configFolderPath.$config_file;
+$fullWorkflowsPath = $configFolderPath.$workflows_file;
 
 $config_file_lines = file($fullConfPath);
 $config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
@@ -44,7 +48,7 @@ date_default_timezone_set($timeZone);
 $date = new DateTime("now", new DateTimeZone($timeZone) );
 $timestamp = $date->format('Y-m-d_H-i-s');
 
-// ###################################
-// ## TimeZone processing end
-// ###################################
+// ######################################################################
+// ## Global constants and TimeZone processing
+// ######################################################################
 
diff --git a/front/workflowsCore.php b/front/workflowsCore.php
index 6075c495..11114777 100755
--- a/front/workflowsCore.php
+++ b/front/workflowsCore.php
@@ -5,19 +5,19 @@
 ?>
 
 
-<section class="content workflows col-sm-12">
-  <div id="workflowContainerWrap" class="bg-grey-dark color-palette  col-sm-12  box-default box-info ">
+<section class="content workflows col-sm-12 col-xs-12">
+  <div id="workflowContainerWrap" class="bg-grey-dark color-palette  col-sm-12 col-xs-12 box-default box-info ">
     <div id="workflowContainer"></div>
     
   </div>
-  <div id="buttons" class="bottom-buttons col-sm-12">
-    <div class="add-workflow col-sm-12">
-      <button type="button" class="btn btn-primary add-workflow-btn col-sm-12" id="save">
+  <div id="buttons" class="bottom-buttons col-sm-12 col-xs-12">
+    <div class="add-workflow col-sm-12 col-xs-12">
+      <button type="button" class="btn btn-primary add-workflow-btn col-sm-12 col-xs-12" id="save">
         <?= lang('Gen_Add');?>
       </button>
     </div>
-    <div class="save-workflows col-sm-12">
-      <button type="button" class="btn btn-primary col-sm-12" id="save" onclick="saveWorkflows()">
+    <div class="save-workflows col-sm-12 col-xs-12">
+      <button type="button" class="btn btn-primary col-sm-12 col-xs-12" id="save" onclick="saveWorkflows()">
         <?= lang('DevDetail_button_Save');?>
       </button>
     </div>
@@ -46,7 +46,7 @@ let operatorTypes = [
 ];
 
 let actionTypes = [
-  "update_field", "run_plugin", "delete_device"
+  "update_field", "delete_device"
 ];
 
 // --------------------------------------
@@ -57,13 +57,23 @@ function getData() {
 
   getSetting()
 
-  $.get('php/server/query_json.php?file=workflows.json', function (res) {
+  $.get('php/server/query_json.php?file=workflows.json')
+  .done(function (res) {
     workflows = res;
+    console.log("here workflows");
     console.log(workflows);
 
     updateWorkflowsJson(workflows);
     renderWorkflows();
-    hideSpinner();
+  })
+  .fail(function (jqXHR, textStatus, errorThrown) {
+    console.warn("Failed to load workflows.json:", textStatus, errorThrown);
+    workflows = []; // Set a default empty array to prevent crashes
+    updateWorkflowsJson(workflows);
+    renderWorkflows();
+  })
+  .always(function () {
+    hideSpinner(); // Ensure the spinner is hidden in all cases
   });
 }
 
@@ -91,21 +101,21 @@ function renderWorkflows() {
 function generateWorkflowUI(wf, wfIndex) {
 
   let $wfContainer = $("<div>", { 
-    class: "workflow-card col-sm-12 col-sx-12", 
+    class: "workflow-card panel col-sm-12 col-sx-12", 
     id: `wf-${wfIndex}-container` 
   });
 
   // Workflow Name
   let $wfLinkWrap = $("<div>",
     {
-      class: "box box-solid box-primary  ",
+      class: " ",
       id: `wf-${wfIndex}-header` 
     }
   )
 
   let $wfHeaderLink = $("<a>",
     {
-      "class": "",
+      "class": "pointer  ",
       "data-toggle": "collapse",
       "data-parent": "#workflowContainer",
       "aria-expanded": false,
@@ -131,7 +141,7 @@ function generateWorkflowUI(wf, wfIndex) {
   
 
   let $wfCollapsiblePanel = $("<div>", { 
-    class: `box panel-collapse collapse  ${isOpen ? 'in' : ''}`, 
+    class: ` panel-collapse collapse  ${isOpen ? 'in' : ''}`, 
     id: `wf-${wfIndex}-collapsible-panel` 
   });
 
@@ -185,7 +195,11 @@ function generateWorkflowUI(wf, wfIndex) {
     }
   ).text("Conditions:")
 
-  let $conditionsContainer = $("<div>").append($conditionsTitle);
+  let $conditionsContainer = $("<div>",
+    {
+      class: "col-sm-12 col-sx-12"
+    }
+  ).append($conditionsTitle);
 
   $conditionsContainer.append(renderConditions(wfIndex, `[${wfIndex}]`, 0, wf.conditions));
   
@@ -229,7 +243,7 @@ function generateWorkflowUI(wf, wfIndex) {
       `[${wfIndex}].actions[${actionIndex}].type`, 
       "Type", 
       actionTypes, 
-      action.field, 
+      action.type, 
       `wf-${wfIndex}-actionIndex-${actionIndex}-type`
     );
 
@@ -255,8 +269,8 @@ function generateWorkflowUI(wf, wfIndex) {
       class: "fa-solid fa-trash"
     });
 
-    let $actionRemoveButton = $("<button>", {
-      class: "btn btn-secondary remove-action btn-orange",
+    let $actionRemoveButton = $("<div>", {
+      class: "pointer remove-action ",
       actionIndex: actionIndex,
       wfIndex: wfIndex
     })
@@ -277,8 +291,8 @@ function generateWorkflowUI(wf, wfIndex) {
   let $actionAddIcon = $("<i>", { 
       class: "fa-solid fa-plus"
     });
-  let $actionAddButton = $("<button>", {
-      class : "btn btn-secondary add-action",
+  let $actionAddButton = $("<div>", {
+      class : "pointer add-action",
       lastActionIndex : lastActionIndex,
       wfIndex: wfIndex
     }).append($actionAddIcon).append("Add Action")
@@ -293,8 +307,8 @@ function generateWorkflowUI(wf, wfIndex) {
     class: "fa-solid fa-trash"
   });
 
-  let $wfRemoveButton = $("<button>", {
-    class: "btn btn-secondary remove-wf",
+  let $wfRemoveButton = $("<div>", {
+    class: "pointer remove-wf",
     wfIndex: wfIndex
   })
   .append($wfRemoveIcon) // Add icon
@@ -404,8 +418,8 @@ function renderConditions(wfIndex, parentIndexPath, conditionGroupsIndex, condit
       let $conditionRemoveButtonIcon = $("<i>", { 
         class: "fa-solid fa-trash"
       });
-      let $conditionRemoveButton = $("<button>", {
-        class : "btn btn-secondary remove-condition ",
+      let $conditionRemoveButton = $("<div>", {
+        class : "pointer remove-condition ",
         conditionIndex : conditionIndex,
         wfIndex: wfIndex,
         parentIndexPath: parentIndexPath
@@ -431,8 +445,8 @@ function renderConditions(wfIndex, parentIndexPath, conditionGroupsIndex, condit
     let $conditionAddIcon = $("<i>", { 
       class: "fa-solid fa-plus"
     });
-    let $conditionAddButton = $("<button>", {
-      class: "btn btn-secondary add-condition col-sx-12",
+    let $conditionAddButton = $("<div>", {
+      class: "pointer add-condition col-sx-12",
       wfIndex: wfIndex,
       parentIndexPath: parentIndexPath
     }).append($conditionAddIcon).append("Add Condition");
@@ -443,8 +457,8 @@ function renderConditions(wfIndex, parentIndexPath, conditionGroupsIndex, condit
     let $conditionGroupRemoveIcon = $("<i>", { 
       class: "fa-solid fa-trash"
     });
-    let $conditionGroupRemoveButton = $("<button>", {
-      class: "btn btn-secondary remove-condition-group col-sx-12",
+    let $conditionGroupRemoveButton = $("<div>", {
+      class: "pointer remove-condition-group col-sx-12",
       lastConditionIndex: lastConditionIndex,
       wfIndex: wfIndex,
       parentIndexPath: parentIndexPath
@@ -461,11 +475,11 @@ function renderConditions(wfIndex, parentIndexPath, conditionGroupsIndex, condit
   let $conditionsGroupAddIcon = $("<i>", { 
       class: "fa-solid fa-plus"
     });
-  let $conditionsGroupAddButton = $("<button>", {
-    class: "btn btn-secondary add-condition-group col-sx-12",
+  let $conditionsGroupAddButton = $("<div>", {
+    class: "pointer add-condition-group col-sx-12",
     wfIndex: wfIndex,
     parentIndexPath: parentIndexPath
-  }).append($conditionsGroupAddIcon).append("Add Condition Group");
+  }).append($conditionsGroupAddIcon).append("Add Group");
   $conditionsGroupAddWrap.append($conditionsGroupAddButton);
 
   $addButtonWrap.append($conditionsGroupAddWrap);
@@ -910,6 +924,21 @@ function getEmptyWorkflowJson()
     }
 } 
 
+// ---------------------------------------------------
+// Save workflows JSON
+function saveWorkflows()
+{
+  // encode for import
+  appConfBase64 = btoa(JSON.stringify(getWorkflowsJson()))
+
+  // import
+  $.post('php/server/query_replace_config.php', { base64data: appConfBase64, fileName: "workflows.json" }, function(msg) {
+    console.log(msg);            
+    // showMessage(msg);            
+    write_notification(`[WF]: ${msg}`, 'interrupt');
+  });
+} 
+
 // ---------------------------------------------------
 // Event listeners
 $(document).on("click", ".add-workflow-btn", function () {
diff --git a/server/workflows/manager.py b/server/workflows/manager.py
index 8740ec33..5a00c7d2 100755
--- a/server/workflows/manager.py
+++ b/server/workflows/manager.py
@@ -87,7 +87,7 @@ class WorkflowManager:
 
             if evaluator.evaluate(trigger):  # If any group evaluates to True
                 
-                mylog('none', [f"[WF] Workflow {workflow["name"]} will be executed - conditions were evalueted as TRUE"])
+                mylog('none', [f"[WF] Workflow {workflow["name"]} will be executed - conditions were evaluated as TRUE"])
                 mylog('debug', [f"[WF] Workflow condition_group: {condition_group}"])
 
                 self.execute_actions(workflow["actions"], trigger)