diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
index 40f90665..e901ab09 100644
--- a/Translations/translation_BE.json
+++ b/Translations/translation_BE.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nпрыпынак",
             "description": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Уключае рэжымы PPS & EPR."
+        },
         "BoostTemperature": {
             "displayText": "t° турба\nрэжыму",
             "description": "Тэмпература джала ў турба-рэжыме"
@@ -207,6 +211,10 @@
             "displayText": "Падрабязны\nэкран пайкі",
             "description": "Паказваць дэталёвую інформацыю на экране пайкі"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Межы\nмагутнасці",
             "description": "Максімальная магутнасць, якую можа выкарыстоўваць паяльнік (Ватт)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Мова:\n BY  Беларуская",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Уключаны",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nУключаны",
-	    "description": "Уключае рэжымы PPS/EPR."
-	}
+        }
     }
 }
diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
index 195e3153..af386423 100644
--- a/Translations/translation_BG.json
+++ b/Translations/translation_BG.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Турбо\nтемп.",
             "description": "Температура за \"турбо\" режим"
@@ -207,6 +211,10 @@
             "displayText": "Детайлен\nработен екран",
             "description": "Детайлна информация в работен режим при запояване"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Лимит на\nмощност",
             "description": "Максимална мощност на поялника (Watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Език:\n BG   Български",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
index 24f46003..7acadb35 100644
--- a/Translations/translation_CS.json
+++ b/Translations/translation_CS.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "Maximální prodleva při jednání PD ve 100ms krocích pro kompatibilitu s některými QC nabíječkami"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Teplota\nboostu",
             "description": "Teplota hrotu v \"režimu boost\""
@@ -207,6 +211,10 @@
             "displayText": "Podrobná obr.\npájení",
             "description": "Zobrazit detailní informace malým fontem na obrazovce pájení"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Omezení\nVýkonu",
             "description": "Maximální příkon páječky (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jazyk:\n CS       Český",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
index e8ee504d..1b665ede 100644
--- a/Translations/translation_DA.json
+++ b/Translations/translation_DA.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD-forhandlingstimeout i trin på 100 ms for kompatibilitet med nogle QC-opladere"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Temperatur i \"boost mode\""
@@ -207,6 +211,10 @@
             "displayText": "Detaljeret\nloddeskærm",
             "description": "Vis detaljeret information mens der loddes"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Strøm\nbegrænsning",
             "description": "Maksimal effekt Loddekolben kan bruge (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Sprog:\n DA       Dansk",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
index 7ab45b9f..07c10399 100644
--- a/Translations/translation_DE.json
+++ b/Translations/translation_DE.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Aktiviert PPS & EPR"
+        },
         "BoostTemperature": {
             "displayText": "Boost-\ntemperatur",
             "description": "Temperatur der Lötspitze im Boostmodus"
@@ -207,6 +211,10 @@
             "displayText": "Detaillierte\nLötansicht",
             "description": "Detaillierte Anzeige im Lötmodus"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Aktiviert Bluetooth LE"
+        },
         "PowerLimit": {
             "displayText": "Leistungs-\nmaximum",
             "description": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Sprache:\n DE     Deutsch",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "Bluetooth\naktivieren",
-            "description": "Aktiviert Bluetooth LE"
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\naktivieren",
-	    "description": "Aktiviert PPS/EPR"
-	}
+        }
     }
 }
diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json
index 64fe4f26..ae0fe454 100644
--- a/Translations/translation_EL.json
+++ b/Translations/translation_EL.json
@@ -119,6 +119,10 @@
             "displayText": "χρονικό όριο\nPD",
             "description": "Χρονικό όριο διαπραγμάτευσης PD σε βήματα 100ms για συμβατότητα με κάποιους φορτιστές QC"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Ενεργοποιεί λειτουργίες PPS & EPR."
+        },
         "BoostTemperature": {
             "displayText": "Θερμοκ.\nboost",
             "description": "Θερμοκρασία στη \"λειτουργία boost\""
@@ -207,6 +211,10 @@
             "displayText": "Λεπτομερής\nοθ. κόλλησης",
             "description": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη κόλλησης"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Ενεργειακό\nόριο",
             "description": "Μέγιστη ενέργεια που μπορεί να χρησιμοποιεί το κολλητήρι (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Γλώσσα:\n EL    Ελληνικά",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Ενεργό",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nΕνεργό",
-	    "description": "Ενεργοποιεί λειτουργίες PPS/EPR."
-	}
+        }
     }
 }
diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
index c4fbdae9..b071d01d 100644
--- a/Translations/translation_EN.json
+++ b/Translations/translation_EN.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Tip temperature used in \"boost mode\""
@@ -207,6 +211,10 @@
             "displayText": "Detailed\nsolder screen",
             "description": "Display detailed info in a smaller font on soldering screen"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Language:\n EN     English",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "Bluetooth\nLow Energy",
-            "description": "Enables BLE"
-        },
-        "PDVpdoEnabled": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS/EPR modes"
         }
     }
 }
diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
index 4a6106fe..81f00026 100644
--- a/Translations/translation_ES.json
+++ b/Translations/translation_ES.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntiempo de espera",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Ajustar la\ntemp. extra",
             "description": "Temperatura de la punta utilizada en el \"modo de impulso\""
@@ -207,6 +211,10 @@
             "displayText": "Info extra\nal soldar",
             "description": "Mostrar información detallada en una fuente más pequeña en la pantalla de soldadura"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Habilita BLE"
+        },
         "PowerLimit": {
             "displayText": "Potencia\nlímite",
             "description": "Elige el límite de potencia máxima del soldador (en vatios)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Idioma:\n ES  Castellano",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Activado",
-            "description": "Habilita BLE"
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
index 9a048c5d..751ff7c7 100644
--- a/Translations/translation_FI.json
+++ b/Translations/translation_FI.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Tehostus-\nlämpötila",
             "description": "Tehostustilan lämpötila"
@@ -207,6 +211,10 @@
             "displayText": "Tarkempi\njuotosnäyttö",
             "description": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla juotostilassa"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Tehon-\nrajoitus",
             "description": "Suurin sallittu teho (Watti)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Kieli:\n FI       Suomi",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
index 8006ccd7..2309e330 100644
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -119,6 +119,10 @@
             "displayText": "Délai\nexpir. PD",
             "description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Temp.\nboost",
             "description": "Température utilisée en \"mode boost\""
@@ -207,6 +211,10 @@
             "displayText": "Écran soudure\ndétaillé",
             "description": "Afficher les informations détaillées sur l'écran de soudure"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Limite de\npuissance",
             "description": "Puissance maximale utilisable (W=watts)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Langue:\n FR    Français",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Activé",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
index 6ba62752..b1e55542 100644
--- a/Translations/translation_HR.json
+++ b/Translations/translation_HR.json
@@ -119,6 +119,10 @@
             "displayText": "USB-PD\ntimeout",
             "description": "Timeout za USB-Power Delivery u koracima od 100ms za kompatibilnost s nekim QC punjačima"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Temperatura u pojačanom (Boost) načinu."
@@ -207,6 +211,10 @@
             "displayText": "Detalji\npri lemljenju",
             "description": "Prikazivanje detaljnih informacija tijekom lemljenja"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Ograničenje\nsnage",
             "description": "Najveća snaga koju lemilica smije vući iz napajanja (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n HR    Hrvatski",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
index e04dd9de..db925956 100644
--- a/Translations/translation_HU.json
+++ b/Translations/translation_HU.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nidőtúllépés",
             "description": "PD egyeztetés időkerete (kompatibilitás QC töltőkkel) (x 100ms)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\nhőmérséklet",
             "description": "Hőmérséklet \"boost\" módban"
@@ -207,6 +211,10 @@
             "displayText": "Részletes\nforrasztás infó",
             "description": "Részletes információk megjelenítése forrasztás közben"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Teljesítmény\nmaximum",
             "description": "Maximális felvett teljesitmény beállitása"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Nyelv:\n HU      Magyar",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
index 46ea4be6..209f6a3b 100644
--- a/Translations/translation_IT.json
+++ b/Translations/translation_IT.json
@@ -119,6 +119,10 @@
             "displayText": "Abilitazione\nUSB PD",
             "description": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+	    "description": "Abilita le modalità Power Delivery PPS ed EPR"
+        },
         "BoostTemperature": {
             "displayText": "Temp\nTurbo",
             "description": "Imposta la temperatura della funzione Turbo [°C/°F]"
@@ -207,6 +211,10 @@
             "displayText": "Dettagli\nsaldatura",
             "description": "Mostra informazioni dettagliate durante la modalità Saldatura"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Abilita BLE"
+        },
         "PowerLimit": {
             "displayText": "Limite\npotenza",
             "description": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Lingua:\n IT    Italiano",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "Abilita\nBluetooth LE",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "Abilita\nPD VPDO",
-	    "description": "Abilita le modalità Power Delivery PPS ed EPR"
-	}
+        }
     }
 }
diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
index 9fc8d3f5..aa7f2a5f 100755
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
         },
+        "PDVpdo": {
+            "displayText": "PD VPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "ブースト温度",
             "description": "ブーストモードで使用される温度"
@@ -207,6 +211,10 @@
             "displayText": "詳細な作業画面",
             "description": "半田付け画面に詳細情報を表示する"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "電力制限",
             "description": "最大電力を制限する <W=ワット>"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "言語： 日本語",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE Enabled",
-            "description": "Enables BLE"
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
index c6abca98..1eb71ace 100644
--- a/Translations/translation_LT.json
+++ b/Translations/translation_LT.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nlaikas",
             "description": "PD suderinimo laikas žingsniais po 100ms suderinamumui su kai kuriais QC įkrovikliais"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Turbo\ntemperat.",
             "description": "Temperatūra turbo režimu"
@@ -207,6 +211,10 @@
             "displayText": "Detalus lita-\nvimo ekranas",
             "description": "Ar rodyti išsamią informaciją lituojant"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Galios\nriba",
             "description": "Didžiausia galia, kurią gali naudoti lituoklis (Vatai)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Kalba:\n LT    Lietuvių",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json
index 07d86d38..b4718137 100644
--- a/Translations/translation_NB.json
+++ b/Translations/translation_NB.json
@@ -119,6 +119,10 @@
             "displayText": "PD-\ntidsavb.",
             "description": "PD-forhandlingstidsavbrudd i steg på 100 ms for kompatibilitet med noen QC-ladere"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "KTmp\n",
             "description": "Temperatur i \"kraft-modus\""
@@ -207,6 +211,10 @@
             "displayText": "AvLdSk\n",
             "description": "Vis detaljert informasjon ved lodding"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Effekt-\ngrense",
             "description": "Maks effekt jernet kan bruke (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Språk:\n NB    Norsk bm",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
index e995a6fc..02a3c1f1 100644
--- a/Translations/translation_NL.json
+++ b/Translations/translation_NL.json
@@ -112,13 +112,17 @@
             "description": "Minimum toegestaan voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
         },
         "QCMaxVoltage": {
-            "displayText": "QC\nVoltage",
+            "displayText": "QC\nvoltage",
             "description": "Maximaal QC voltage dat gevraagd mag worden"
         },
         "PDNegTimeout": {
             "displayText": "PD\ntimeout",
             "description": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Punt temperatuur in boostmode"
@@ -207,6 +211,10 @@
             "displayText": "Gedetailleerd\nsoldeerscherm",
             "description": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Vermogen\nlimiet",
             "description": "Maximaal vermogen (W=Watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Taal:\n NL  Nederlands",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
index f6ef45d3..9f7f82c6 100644
--- a/Translations/translation_NL_BE.json
+++ b/Translations/translation_NL_BE.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Verhogings\ntemp",
             "description": "Verhogingstemperatuur"
@@ -207,6 +211,10 @@
             "displayText": "Gedetailleerd\nsoldeerscherm",
             "description": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Spraak:\n NL_BE   Vlaams",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
index d47392c5..9526f8b5 100644
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -119,6 +119,10 @@
             "displayText": "Limit czasu\nPD",
             "description": "Limit czasu negocjacji PD w krokach co 100 ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Włącza tryby PPS & EPR."
+        },
         "BoostTemperature": {
             "displayText": "Temp.\nboost",
             "description": "Temperatura w trybie \"boost\" "
@@ -207,6 +211,10 @@
             "displayText": "Sz. inf. w\ntr. lutowania",
             "description": "Wyświetl szczegółowe informacje w trybie lutowania"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Ogr.\nmocy",
             "description": "Maksymalna moc (W), jakiej może użyć lutownica"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Język:\n PL      Polski",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Włączony",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nWłączony",
-	    "description": "Włącza tryby PPS/EPR."
-	}
+        }
     }
 }
diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
index d89b8fe1..883a9677 100644
--- a/Translations/translation_PT.json
+++ b/Translations/translation_PT.json
@@ -119,6 +119,10 @@
             "displayText": "PD tempo\nlimite",
             "description": "Tempo limite de negoiciação de PD de 100ms para compatibilidade com alguns carregadores é (0: disabled)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Activa o modo PPS & EPR"
+        },
         "BoostTemperature": {
             "displayText": "Modo turbo\ntemperat.",
             "description": "Ajuste de temperatura do \"modo turbo\""
@@ -207,6 +211,10 @@
             "displayText": "Ecrã trabalho\navançado",
             "description": "Mostra informações avançadas durante o uso"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Limite de\npotência",
             "description": "Potência máxima a usar (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Idioma:\n PT   Português",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\nativado",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nactivado",
-	    "description": "Activa o modo PPS/EPR"
-	}
+        }
     }
 }
diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json
index e9f920e9..eff6ac37 100644
--- a/Translations/translation_RO.json
+++ b/Translations/translation_RO.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "Timp limită de negociere pentru tranzacţia PD, în paşi de 100ms, pentru compatibilitate cu alimentatoarele QC"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Modifică\ntemp. impuls",
             "description": "Temperatura utilizată în \"modul de impuls\""
@@ -207,6 +211,10 @@
             "displayText": "Detalii\necran lipire",
             "description": "Afisaţi informaţii detaliate într-un font mai mic pe ecranul de lipire"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Activează BLE"
+        },
         "PowerLimit": {
             "displayText": "Putere\nlimită",
             "description": "Puterea maximă pe care letconul o poate folosi (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Limbă:\n RO      Română",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\nactivat",
-            "description": "Activează BLE"
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nactivat",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
index 65888f88..fe52dc9a 100644
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nтайм-аут",
             "description": "Power Delivery тайм-аут согласования с шагом 100 мс для совместимости с некоторыми быстрыми зарядными QC (0: отключено)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Включает режимы PPS & EPR."
+        },
         "BoostTemperature": {
             "displayText": "t° турбо\nрежима",
             "description": "Температура жала в турбо-режиме"
@@ -207,6 +211,10 @@
             "displayText": "Подробный\nэкран пайки",
             "description": "Показывать детальную информацию на экране пайки"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Предел\nмощности",
             "description": "Максимальная мощность, которую может использовать паяльник (Ватт)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Язык:\n RU     Русский",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Включено",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nВключено",
-	    "description": "Включает режимы PPS/EPR."
-	}
+        }
     }
 }
diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
index 868dfff0..1642a2fc 100644
--- a/Translations/translation_SK.json
+++ b/Translations/translation_SK.json
@@ -119,6 +119,10 @@
             "displayText": "Čas vypršania\nPower Delivery",
             "description": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Boost\nteplota",
             "description": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
@@ -207,6 +211,10 @@
             "displayText": "Detaily počas\nspájkovania",
             "description": "Zobrazenie detailov počas spájkovania"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Obmedzenie\nvýkonu",
             "description": "Obmedzenie výkonu podľa použitého zdroja (watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jazyk:\n SK  Slovenčina",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
index 1a5fb1b0..5e775923 100644
--- a/Translations/translation_SL.json
+++ b/Translations/translation_SL.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Pospešena\ntemp.",
             "description": "Temperatura v pospešenem načinu"
@@ -207,6 +211,10 @@
             "displayText": "Več info na\nzaslonu spaj.",
             "description": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Meja\nmoči",
             "description": "Največja dovoljena moč v vatih [W]"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n SL Slovenščina",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
index 2c836525..bca7ab62 100644
--- a/Translations/translation_SR_CYRL.json
+++ b/Translations/translation_SR_CYRL.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Темп.\nпојачања",
             "description": "Температура врха лемилице у току појачања."
@@ -207,6 +211,10 @@
             "displayText": "Детаљи током\nлемљења",
             "description": "Приказивање детаљних информација на екрану током лемљења."
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jезик:\n SR      Српски",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
index b9071857..83774e18 100644
--- a/Translations/translation_SR_LATN.json
+++ b/Translations/translation_SR_LATN.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Temp.\npojačanja",
             "description": "Temperatura vrha lemilice u toku pojačanja."
@@ -207,6 +211,10 @@
             "displayText": "Detalji tokom\nlemljenja",
             "description": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n SR      Srpski",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
index 6dd47517..075bcd30 100644
--- a/Translations/translation_SV.json
+++ b/Translations/translation_SV.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Turbo-\ntemp",
             "description": "Temperatur i \"turbo-läge\""
@@ -207,6 +211,10 @@
             "displayText": "Detaljerad\nlödng.skärm",
             "description": "Visa detaljerad information vid lödning"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Max-\neffekt",
             "description": "Maximal effekt som enheten kan använda (Watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Språk:\n SV     Svenska",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
index 64f9e3c4..e22aa7e5 100644
--- a/Translations/translation_TR.json
+++ b/Translations/translation_TR.json
@@ -119,6 +119,10 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "YKSC\n",
             "description": "Yüksek Performans Modu Sıcaklığı"
@@ -207,6 +211,10 @@
             "displayText": "GELLHM\n",
             "description": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Havyanın kullanacağı en yüksek güç (W=Watts)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Dil:\n TR      Türkçe",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
index 911b9152..873c3f16 100644
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nзатримка",
             "description": "Затримка у 100мс інкрементах для PD для сумісності з деякими QC зарядними пристроями (0: вимкнено)"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Вмикає режими PPS & EPR."
+        },
         "BoostTemperature": {
             "displayText": "Темпер.\nТурбо",
             "description": "Температура в \"Турбо\" режимі"
@@ -207,6 +211,10 @@
             "displayText": "Детальний\nрежим пайки",
             "description": "Показувати детальну інформацію при пайці."
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Макс.\nпотуж.",
             "description": "Макс. потужність, яку може використовувати паяльник (Ват)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Мова:\n UK  Українська",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Увімкнено",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nУвімкнено",
-	    "description": "Вмикає режими PPS/EPR."
-	}
+        }
     }
 }
diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json
index a7a9be81..e4dbeb3d 100644
--- a/Translations/translation_VI.json
+++ b/Translations/translation_VI.json
@@ -119,6 +119,10 @@
             "displayText": "PD\nsau",
             "description": "Thoi gian cho đàm phán PD trong các buoc 100ms đe tuong thích voi mot so bo sac QC"
         },
+        "PDVpdo": {
+            "displayText": "PD\nVPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "Tăng\nnhiet đo",
             "description": "Nhiet đo dùng trong che đo \"tăng cuong\""
@@ -207,6 +211,10 @@
             "displayText": "Chi tiet\nmàn hình hàn",
             "description": "-Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth\n",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "Công suat\ngioi han",
             "description": "-Công suat toi đa mà tay hàn có the su dung (W=watt)"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "Ngôn ngu:\n VI  Tieng Viet",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json
index 3572f81e..069671b4 100644
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -119,6 +119,10 @@
             "displayText": "PD逾時",
             "description": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
         },
+        "PDVpdo": {
+            "displayText": "PD VPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "增熱温度",
             "description": "喺增熱模式時使用嘅温度"
@@ -207,6 +211,10 @@
             "displayText": "詳細焊接畫面",
             "description": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制焫雞可用嘅最大功率 <W=watt（火）>"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "語言： 廣東話",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json
index 2a39bfb1..5ef18c92 100644
--- a/Translations/translation_ZH_CN.json
+++ b/Translations/translation_ZH_CN.json
@@ -119,6 +119,10 @@
             "displayText": "PD超时",
             "description": "设定USB-PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
         },
+        "PDVpdo": {
+            "displayText": "PD VPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "增热温度",
             "description": "增热模式时使用的温度"
@@ -207,6 +211,10 @@
             "displayText": "焊接画面详情",
             "description": "焊接模式画面以英语小字体显示详请"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制烙铁可用的最大功率 <W=瓦特>"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "语言：简体中文",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": ""
-	}
+        }
     }
 }
diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json
index 12a95e77..0be42f53 100644
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -119,6 +119,10 @@
             "displayText": "PD逾時",
             "description": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
         },
+        "PDVpdo": {
+            "displayText": "PD VPDO",
+            "description": "Enables PPS & EPR modes"
+        },
         "BoostTemperature": {
             "displayText": "增熱溫度",
             "description": "於增熱模式時使用的溫度"
@@ -207,6 +211,10 @@
             "displayText": "詳細焊接畫面",
             "description": "於焊接模式畫面以英文小字型顯示詳細資料"
         },
+        "BluetoothLE": {
+            "displayText": "Bluetooth",
+            "description": "Enables BLE"
+        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制烙鐵可用的最大功率 <W=watt（瓦特）>"
@@ -238,14 +246,6 @@
         "LanguageSwitch": {
             "displayText": "語言：正體中文",
             "description": ""
-        },
-        "BLEEnabled": {
-            "displayText": "BLE Enabled",
-            "description": ""
-        },
-	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+        }
     }
 }
diff --git a/Translations/translations_definitions.json b/Translations/translations_definitions.json
index 5f040f91..9548b7df 100644
--- a/Translations/translations_definitions.json
+++ b/Translations/translations_definitions.json
@@ -217,6 +217,12 @@
             "maxLen2": 15,
             "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
         },
+        {
+            "id": "PDVpdo",
+            "maxLen": 7,
+            "maxLen2": 15,
+            "description": "Enabled PPS & EPR modes."
+        },
         {
             "id": "BoostTemperature",
             "maxLen": 4,
@@ -349,6 +355,12 @@
             "maxLen2": 13,
             "description": "Should the device show an 'advanced' soldering view. This is a text-based view that shows more information at the cost of no nice graphics."
         },
+        {
+            "id": "BluetoothLE",
+            "maxLen": 7,
+            "maxLen2": 15,
+            "description": "Should BLE be enabled at boot time."
+        },
         {
             "id": "PowerLimit",
             "maxLen": 5,
@@ -396,18 +408,6 @@
             "maxLen": 7,
             "maxLen2": 15,
             "description": "Changes the device language on multi-lingual builds."
-        },
-        {
-            "id": "BLEEnabled",
-            "maxLen": 7,
-            "maxLen2": 15,
-            "description": "Should BLE be enabled at boot time."
-        },
-        {
-            "id": "PDVpdoEnabled",
-	    "maxLen": 7,
-	    "maxLen2": 15,
-	    "description": "Enabled PPS/EPR modes."
-	}
+        }
     ]
 }
diff --git a/source/Core/BSP/Pinecilv2/postRTOS.cpp b/source/Core/BSP/Pinecilv2/postRTOS.cpp
index 4b705be6..1e9049f6 100644
--- a/source/Core/BSP/Pinecilv2/postRTOS.cpp
+++ b/source/Core/BSP/Pinecilv2/postRTOS.cpp
@@ -20,7 +20,7 @@ void postRToSInit() {
   }
 #endif
 
-  if (getSettingValue(SettingsOptions::BLEEnabled)) {
+  if (getSettingValue(SettingsOptions::BluetoothLE)) {
     ble_stack_start();
   }
 }
diff --git a/source/Core/Drivers/USBPD.cpp b/source/Core/Drivers/USBPD.cpp
index ca5a72ee..64dfa989 100644
--- a/source/Core/Drivers/USBPD.cpp
+++ b/source/Core/Drivers/USBPD.cpp
@@ -152,7 +152,7 @@ bool parseCapabilitiesArray(const uint8_t numCaps, uint8_t *bestIndex, uint16_t
           }
         }
       }
-    } else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) && getSettingValue(SettingsOptions::PDVpdoEnabled)) {
+    } else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) && getSettingValue(SettingsOptions::PDVpdo)) {
       // If this is a PPS slot, calculate the max voltage in the PPS range that can we be used and maintain
       uint16_t max_voltage = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCapabilities[i]));
       // uint16_t min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCapabilities[i]));
@@ -179,7 +179,7 @@ bool parseCapabilitiesArray(const uint8_t numCaps, uint8_t *bestIndex, uint16_t
       }
     }
 #ifdef POW_EPR
-    else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) && getSettingValue(SettingsOptions::PDVpdoEnabled)) {
+    else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) && getSettingValue(SettingsOptions::PDVpdo)) {
       uint16_t max_voltage = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCapabilities[i]));
       uint8_t  max_wattage = PD_APDO_AVS_MAX_POWER_GET(lastCapabilities[i]);
 
diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h
index 0f3159c9..e1be959c 100644
--- a/source/Core/Inc/Settings.h
+++ b/source/Core/Inc/Settings.h
@@ -51,8 +51,8 @@ enum SettingsOptions {
   OLEDBrightness                 = 34, // Brightness for the OLED display
   LOGOTime                       = 35, // Duration the logo will be displayed for
   CalibrateCJC                   = 36, // Toggle calibrate CJC at next boot
-  BLEEnabled                     = 37, // Should BLE hardware be enabled if present
-  PDVpdoEnabled                  = 38, // Should PPS/EPR be enabled
+  BluetoothLE                    = 37, // Toggle BLE if present
+  PDVpdo                         = 38, // Toggle PPS & EPR
   //
   SettingsOptionsLength = 39, //
 };
diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h
index 0f36b5fb..abb877ed 100644
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -55,6 +55,7 @@ enum class SettingsItemIndex : uint8_t {
   MinVolCell,
   QCMaxVoltage,
   PDNegTimeout,
+  PDVpdo,
   BoostTemperature,
   AutoStart,
   TempChangeShortStep,
@@ -77,6 +78,7 @@ enum class SettingsItemIndex : uint8_t {
   LOGOTime,
   AdvancedIdle,
   AdvancedSoldering,
+  BluetoothLE,
   PowerLimit,
   CalibrateCJC,
   VoltageCalibration,
@@ -85,8 +87,6 @@ enum class SettingsItemIndex : uint8_t {
   PowerPulseDuration,
   SettingsReset,
   LanguageSwitch,
-  BLEEnabled,
-  PDVpdoEnabled,
   NUM_ITEMS,
 };
 
diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index a6e18b61..d097609a 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -86,8 +86,8 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {MIN_BRIGHTNESS, MAX_BRIGHTNESS, BRIGHTNESS_STEP, DEFAULT_BRIGHTNESS}, // OLEDBrightness
     {0, 5, 1, 1},                                                          // LOGOTime
     {0, 1, 1, 0},                                                          // CalibrateCJC
-    {0, 1, 1, 1},                                                          // BLEEnabled
-    {0, 1, 1, 1},                                                          // PDVpdoEnabled
+    {0, 1, 1, 1},                                                          // BluetoothLE
+    {0, 1, 1, 1},                                                          // PDVpdo
 };
 static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));
 
diff --git a/source/Core/Src/settingsGUI.cpp b/source/Core/Src/settingsGUI.cpp
index 4fe5a781..e5234b08 100644
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -26,7 +26,7 @@ static void displayQCInputV(void);
 #endif
 #if POW_PD
 static void displayPDNegTimeout(void);
-static void displayPDVpdoEnabled(void);
+static void displayPDVpdo(void);
 #endif
 static void displaySensitivity(void);
 static void displayShutdownTime(void);
@@ -43,7 +43,7 @@ static void displayAdvancedIDLEScreens(void);
 static void displayScrollSpeed(void);
 static void displayPowerLimit(void);
 #ifdef BLE_ENABLED
-static void displayBLEEnabled(void);
+static void displayBluetoothLE(void);
 #endif
 #ifndef NO_DISPLAY_ROTATE
 static bool setDisplayRotation(void);
@@ -101,6 +101,7 @@ static bool enterAdvancedMenu(void);
  *  -Minimum Voltage
  *  QC Voltage
  *  PD Timeout
+ *  PDVpdo
  *
  * Soldering
  *  Boost Mode Temp
@@ -131,6 +132,7 @@ static bool enterAdvancedMenu(void);
  *  Detailed Soldering
  *
  * Advanced
+ *  BluetoothLE
  *  Power Limit
  *  Calibrate CJC At Next Boot
  *  Calibrate Input V
@@ -170,6 +172,7 @@ const menuitem powerMenu[] = {
  *  -Minimum Voltage
  *  QC Voltage
  *  PD Timeout
+ *  PDVpdo
  */
 #ifdef POW_DC
     {SETTINGS_DESC(SettingsItemIndex::DCInCutoff), nullptr, displayInputVRange, nullptr, SettingsOptions::MinDCVoltageCells, SettingsItemIndex::DCInCutoff, 6},            /*Voltage input*/
@@ -180,7 +183,7 @@ const menuitem powerMenu[] = {
 #endif
 #if POW_PD
     {SETTINGS_DESC(SettingsItemIndex::PDNegTimeout), nullptr, displayPDNegTimeout, nullptr, SettingsOptions::PDNegTimeout, SettingsItemIndex::PDNegTimeout, 5}, /*PD timeout setup*/
-    {SETTINGS_DESC(SettingsItemIndex::PDVpdoEnabled), nullptr, displayPDVpdoEnabled, nullptr, SettingsOptions::PDVpdoEnabled, SettingsItemIndex::PDVpdoEnabled, 7 }, /*Toggle whether to use PPS/EPR*/
+    {SETTINGS_DESC(SettingsItemIndex::PDVpdo), nullptr, displayPDVpdo, nullptr, SettingsOptions::PDVpdo, SettingsItemIndex::PDVpdo, 7 }, /*Toggle PPS & EPR*/
 #endif
     {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0} // end of menu marker. DO NOT REMOVE
 };
@@ -261,7 +264,7 @@ const menuitem UIMenu[] = {
 };
 const menuitem advancedMenu[] = {
 /*
- *  BLE Enabled or not
+ *  BluetoothLE
  *  Power Limit
  *  Calibrate CJC At Next Boot
  *  Calibrate Input V
@@ -271,7 +274,7 @@ const menuitem advancedMenu[] = {
  *  Factory Reset
  */
 #ifdef BLE_ENABLED
-    {SETTINGS_DESC(SettingsItemIndex::BLEEnabled), nullptr, displayBLEEnabled, nullptr, SettingsOptions::BLEEnabled, SettingsItemIndex::BLEEnabled, 7}, /*Advanced idle screen*/
+    {SETTINGS_DESC(SettingsItemIndex::BluetoothLE), nullptr, displayBluetoothLE, nullptr, SettingsOptions::BluetoothLE, SettingsItemIndex::BluetoothLE, 7}, /*Toggle BLE*/
 #endif
     {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 4}, /*Power limit*/
     {SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC,
@@ -378,7 +381,7 @@ static void displayPDNegTimeout(void) {
     OLED::printNumber(value, 3, FontStyle::LARGE);
   }
 }
-static void displayPDVpdoEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::PDVpdoEnabled)); }
+static void displayPDVpdo(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::PDVpdo)); }
 #endif
 
 static bool setBoostTemp(void) {
@@ -644,7 +647,7 @@ static void displayAdvancedIDLEScreens(void) { OLED::drawCheckbox(getSettingValu
 
 static void displayAdvancedSolderingScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedSoldering)); }
 #ifdef BLE_ENABLED
-static void displayBLEEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::BLEEnabled)); }
+static void displayBluetoothLE(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::BluetoothLE)); }
 #endif
 static void displayPowerLimit(void) {