diff --git a/.gitignore b/.gitignore
index 96c9ab2c..11f60f9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,4 @@ fabric.properties
 .idea/httpRequests
 
 CoreCompileInputs.cache
+.vscode/settings.json
diff --git a/Translation Editor/make_translation.py b/Translation Editor/make_translation.py
index c777cb63..7757b29e 100755
--- a/Translation Editor/make_translation.py	
+++ b/Translation Editor/make_translation.py	
@@ -125,27 +125,6 @@ def getConstants():
     return consants
 
 
-def getTipModelEnumTS80():
-    constants = []
-    constants.append("B02")
-    constants.append("D25")
-    constants.append("TS80")  # end of miniware
-    constants.append("User")  # User
-    return constants
-
-
-def getTipModelEnumTS100():
-    constants = []
-    constants.append("B02")
-    constants.append("D24")
-    constants.append("BC2")
-    constants.append(" C1")
-    constants.append("TS100")  # end of miniware
-    constants.append("BC2")
-    constants.append("Hakko")  # end of hakko
-    constants.append("User")
-    return constants
-
 
 def getDebugMenu():
     constants = []
@@ -207,8 +186,6 @@ def getLetterCounts(defs, lang):
     constants = getConstants()
     for x in constants:
         textList.append(x[1])
-    textList.extend(getTipModelEnumTS100())
-    textList.extend(getTipModelEnumTS80())
     textList.extend(getDebugMenu())
 
     # collapse all strings down into the composite letters and store totals for these
@@ -329,17 +306,19 @@ def writeLanguage(languageCode, defs, f):
     f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
 
     maxLen = 25
+    index =0
     for mod in defs['menuOptions']:
         eid = mod['id']
         if 'feature' in mod:
             f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] " + eid.ljust(maxLen)[:maxLen] + " */ "))
         f.write(
             to_unicode("\"" +
                        convStr(symbolConversionTable, (obj[eid]['desc'])) +
                        "\"," + "//{} \n".format(obj[eid]['desc'])))
         if 'feature' in mod:
             f.write(to_unicode("#endif\n"))
+        index=index+1
 
     f.write(to_unicode("};\n\n"))
 
@@ -381,20 +360,6 @@ def writeLanguage(languageCode, defs, f):
                        convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
 
     f.write(to_unicode("\n"))
-    # Write out tip model strings
-
-    f.write(to_unicode("const char* TipModelStrings[] = {\n"))
-    f.write(to_unicode("#ifdef MODEL_TS100\n"))
-    for c in getTipModelEnumTS100():
-        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
-                                             c) + "\"," + "//{} \n".format(c)))
-    f.write(to_unicode("#else\n"))
-    for c in getTipModelEnumTS80():
-        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
-                                             c) + "\"," + "//{} \n".format(c)))
-    f.write(to_unicode("#endif\n"))
-
-    f.write(to_unicode("};\n\n"))
 
     # Debug Menu
     f.write(to_unicode("const char* DebugMenu[] = {\n"))
@@ -417,11 +382,12 @@ def writeLanguage(languageCode, defs, f):
     f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
 
     maxLen = 25
+    index = 0
     for mod in defs['menuOptions']:
         eid = mod['id']
         if 'feature' in mod:
             f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] "   + eid.ljust(maxLen)[:maxLen] + " */ "))
         if lang['menuDouble']:
             f.write(
                 to_unicode(
@@ -437,6 +403,7 @@ def writeLanguage(languageCode, defs, f):
                            "\" }," + "//{} \n".format(obj[eid]['text'])))
         if 'feature' in mod:
             f.write(to_unicode("#endif\n"))
+        index = index + 1 
 
     f.write(to_unicode("};\n\n"))
 
diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json
index 061f2748..643c13b5 100644
--- a/Translation Editor/translation_bg.json	
+++ b/Translation Editor/translation_bg.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Мощност на избраното захранване"
 		},
-		"PowerLimitEnable": {
-			"text": "",
-			"text2": [
-				"Вкл. лимит",
-				"на мощност?"
-			],
-			"desc": "Включване на лимит на мощност"
-		},
 		"PowerLimit": {
 			"text": "",
 			"text2": [
diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json
index 1cef0ce8..c1d66a24 100755
--- a/Translation Editor/translation_cs.json	
+++ b/Translation Editor/translation_cs.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Výkon použítého napájecího adaptéru ve wattech."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Omez. výk.",
-				"Aktivovat"
-			],
-			"desc": "Aktivovat omezení výkonu"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json
index 6271ef61..8cefa35d 100644
--- a/Translation Editor/translation_da.json	
+++ b/Translation Editor/translation_da.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json
index a93c4a93..1a755d5d 100644
--- a/Translation Editor/translation_de.json	
+++ b/Translation Editor/translation_de.json	
@@ -237,14 +237,6 @@
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Leistungs-",
-				"Limit An"
-			],
-			"desc": "Leistungslimit aktivieren"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json
index 4b206c7c..66f58642 100644
--- a/Translation Editor/translation_en.json	
+++ b/Translation Editor/translation_en.json	
@@ -237,14 +237,6 @@
 			],
 			"desc": "Power wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Enable power",
-				"limit"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json
index 66a31e79..8de00bd7 100644
--- a/Translation Editor/translation_es.json	
+++ b/Translation Editor/translation_es.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Potencia en vatios del adaptador de corriente utilizado."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Limitar la",
-				"potenc. máx."
-			],
-			"desc": "Activa el límite de potencia máxima."
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json
index 451359fd..f179c530 100644
--- a/Translation Editor/translation_fi.json	
+++ b/Translation Editor/translation_fi.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json
index c2cbb387..f55d9ce8 100644
--- a/Translation Editor/translation_fr.json	
+++ b/Translation Editor/translation_fr.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Puissance de l'alimentation utilisée"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Activer?"
-			],
-			"desc": "Activer la limite de puissance"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json
index 6b91354d..cec60dba 100644
--- a/Translation Editor/translation_hr.json	
+++ b/Translation Editor/translation_hr.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Snaga modula za napajanje"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json
index ae4310eb..1b583503 100644
--- a/Translation Editor/translation_hu.json	
+++ b/Translation Editor/translation_hu.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "A tápegység által leadott teljesítmény"
 		},
-		"PowerLimitEnable": {
-			"text": "TELJH",
-			"text2": [
-				"Telj H",
-				"Bekapcsolva"
-			],
-			"desc": "Bemeneti teljesitmény korlátozása"
-		},
 		"PowerLimit": {
 			"text": "TELJM",
 			"text2": [
diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json
index 01c748a6..069ca63f 100644
--- a/Translation Editor/translation_it.json	
+++ b/Translation Editor/translation_it.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Limitatore",
-				"di potenza"
-			],
-			"desc": "Abilita un limitatore per la potenza massima erogabile al saldatore"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json
index 9e886301..ae489e19 100644
--- a/Translation Editor/translation_lt.json	
+++ b/Translation Editor/translation_lt.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Maitinimo bloko galia vatais"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json
index 67d73f8d..7b20ed69 100644
--- a/Translation Editor/translation_nl.json	
+++ b/Translation Editor/translation_nl.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json
index 510721fc..e636024f 100644
--- a/Translation Editor/translation_nl_be.json	
+++ b/Translation Editor/translation_nl_be.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Vermogen van de adapter"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json
index 887285af..673a7176 100644
--- a/Translation Editor/translation_no.json	
+++ b/Translation Editor/translation_no.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json
index cc7f6f17..1ed67998 100644
--- a/Translation Editor/translation_pl.json	
+++ b/Translation Editor/translation_pl.json	
@@ -237,14 +237,6 @@
 			],
 			"desc": "Moc używanego zasilacza w Wattach"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Włącz limit",
-				"mocy"
-			],
-			"desc": "Włącza limit mocy"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json
index 6a213ca2..defb47b6 100644
--- a/Translation Editor/translation_pt.json	
+++ b/Translation Editor/translation_pt.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Potência da fonte usada (Watt)"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json
index d2dff2cc..4923001c 100644
--- a/Translation Editor/translation_ru.json	
+++ b/Translation Editor/translation_ru.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Мощность используемого источника питания"
 		},
-		"PowerLimitEnable": {
-			"text": "ВклЛимW",
-			"text2": [
-				"Ограничение",
-				"мощности"
-			],
-			"desc": "Включить лимит потребляемой мощности"
-		},
 		"PowerLimit": {
 			"text": "ЗначЛимW",
 			"text2": [
diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json
index ea19f6e0..c38bb7e9 100644
--- a/Translation Editor/translation_sk.json	
+++ b/Translation Editor/translation_sk.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json
index f6793c47..91c85fd6 100644
--- a/Translation Editor/translation_sl.json	
+++ b/Translation Editor/translation_sl.json	
@@ -235,14 +235,6 @@
 			],
 			"desc": "Moč v W napajalnega vira"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json
index 29ba5456..b96b1762 100644
--- a/Translation Editor/translation_sr_cyrl.json	
+++ b/Translation Editor/translation_sr_cyrl.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Снага напајања у ватима."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json
index 30e71cfd..8a97e6ac 100644
--- a/Translation Editor/translation_sr_latn.json	
+++ b/Translation Editor/translation_sr_latn.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Snaga napajanja u vatima."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json
index b5b40339..1d3d208f 100644
--- a/Translation Editor/translation_sv.json	
+++ b/Translation Editor/translation_sv.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json
index 748ad723..a5e1ed24 100644
--- a/Translation Editor/translation_tr.json	
+++ b/Translation Editor/translation_tr.json	
@@ -234,14 +234,6 @@
 			],
 			"desc": "Kullanılan adaptörün güç miktarı"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json
index 76b7d4fc..787e3e16 100644
--- a/Translation Editor/translation_uk.json	
+++ b/Translation Editor/translation_uk.json	
@@ -236,14 +236,6 @@
 			],
 			"desc": "Потужність джерела живлення в Ватах"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Ліміт",
-				"потужності"
-			],
-			"desc": "Вмикає обмеження потужності споживання"
-		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js
index 2e6d4a2f..9a9cb454 100644
--- a/Translation Editor/translations_def.js	
+++ b/Translation Editor/translations_def.js	
@@ -258,11 +258,6 @@ var def =
 			"maxLen": 8,
 			"maxLen2": 16
 		},
-		{
-			"id": "PowerLimitEnable",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
 		{
 			"id": "PowerLimit",
 			"maxLen": 5,
diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h
index 21d4b35d..05e43395 100644
--- a/workspace/TS100/Core/Inc/Settings.h
+++ b/workspace/TS100/Core/Inc/Settings.h
@@ -49,7 +49,6 @@ typedef struct {
 	uint16_t CalibrationOffset; // This stores the temperature offset for this tip
 								// in the iron.
 
-	uint8_t powerLimitEnable; // Allow toggling of power limit without changing value
 	uint8_t powerLimit;       // Maximum power iron allowed to output
 
 	uint16_t TipGain; // uV/C * 10, it can be used to convert tip thermocouple voltage to temperateture TipV/TipGain = TipTemp
diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp
index 3fe8a2ad..fcd8255b 100644
--- a/workspace/TS100/Core/Src/Settings.cpp
+++ b/workspace/TS100/Core/Src/Settings.cpp
@@ -71,7 +71,6 @@ void resetSettings() {
 	systemSettings.temperatureInF = TEMPERATURE_INF;          // default to 0
 #endif
 	systemSettings.descriptionScrollSpeed = DESCRIPTION_SCROLL_SPEED; // default to slow
-	systemSettings.powerLimitEnable = POWER_LIMIT_ENABLE; // Default to no power limit
 	systemSettings.CalibrationOffset = CALIBRATION_OFFSET; // the adc offset in uV
 	systemSettings.powerLimit = POWER_LIMIT; // 30 watts default limit
 	systemSettings.ReverseButtonTempChangeEnabled = REVERSE_BUTTON_TEMP_CHANGE; //
diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp
index ccfe0466..7062532b 100644
--- a/workspace/TS100/Core/Src/gui.cpp
+++ b/workspace/TS100/Core/Src/gui.cpp
@@ -42,8 +42,6 @@ static bool settings_setAdvancedIDLEScreens(void);
 static void settings_displayAdvancedIDLEScreens(void);
 static bool settings_setScrollSpeed(void);
 static void settings_displayScrollSpeed(void);
-static bool settings_setPowerLimitEnable(void);
-static void settings_displayPowerLimitEnable(void);
 static bool settings_setPowerLimit(void);
 static void settings_displayPowerLimit(void);
 static bool settings_setDisplayRotation(void);
@@ -137,13 +135,11 @@ const menuitem rootSettingsMenu[] {
 #endif
 		{ (const char*) NULL, settings_enterSolderingMenu,
 				settings_displaySolderingMenu }, /*Soldering*/
-		{ (const char*) NULL, settings_enterPowerMenu,
-				settings_displayPowerMenu }, /*Sleep Options Menu*/
-		{ (const char*) NULL, settings_enterUIMenu,
-				settings_displayUIMenu }, /*UI Menu*/
+		{ (const char*) NULL, settings_enterPowerMenu, settings_displayPowerMenu }, /*Sleep Options Menu*/
+		{ (const char*) NULL, settings_enterUIMenu, settings_displayUIMenu }, /*UI Menu*/
 		{ (const char*) NULL, settings_enterAdvancedMenu,
 				settings_displayAdvancedMenu }, /*Advanced Menu*/
-		{ NULL,  NULL , NULL }        // end of menu marker. DO NOT REMOVE
+		{ NULL, NULL, NULL }        // end of menu marker. DO NOT REMOVE
 };
 
 const menuitem solderingMenu[] = {
@@ -160,9 +156,9 @@ const menuitem solderingMenu[] = {
 		settings_displayBoostTemp }, /*Boost Temp*/
 { (const char*) SettingsDescriptions[10], settings_setAutomaticStartMode,
 		settings_displayAutomaticStartMode }, /*Auto start*/
-{ (const char*) SettingsDescriptions[24], settings_setTempChangeShortStep,
+{ (const char*) SettingsDescriptions[23], settings_setTempChangeShortStep,
 		settings_displayTempChangeShortStep }, /*Temp change short step*/
-{ (const char*) SettingsDescriptions[25], settings_setTempChangeLongStep,
+{ (const char*) SettingsDescriptions[24], settings_setTempChangeLongStep,
 		settings_displayTempChangeLongStep }, /*Temp change long step*/
 { NULL, NULL, NULL }                // end of menu marker. DO NOT REMOVE
 };
@@ -179,15 +175,14 @@ const menuitem UIMenu[] = {
 		{ (const char*) SettingsDescriptions[5], settings_setTempF,
 				settings_displayTempF }, /* Temperature units*/
 #endif
-		{ (const char*) SettingsDescriptions[7],
-				settings_setDisplayRotation,
-						settings_displayDisplayRotation }, /*Display Rotation*/
+		{ (const char*) SettingsDescriptions[7], settings_setDisplayRotation,
+				settings_displayDisplayRotation }, /*Display Rotation*/
 		{ (const char*) SettingsDescriptions[11],
 				settings_setCoolingBlinkEnabled,
 				settings_displayCoolingBlinkEnabled }, /*Cooling blink warning*/
 		{ (const char*) SettingsDescriptions[16], settings_setScrollSpeed,
 				settings_displayScrollSpeed }, /*Scroll Speed for descriptions*/
-		{ (const char*) SettingsDescriptions[23],
+		{ (const char*) SettingsDescriptions[22],
 				settings_setReverseButtonTempChangeEnabled,
 				settings_displayReverseButtonTempChangeEnabled }, /* Reverse Temp change buttons + - */
 		{ NULL, NULL, NULL }        // end of menu marker. DO NOT REMOVE
@@ -212,7 +207,6 @@ const menuitem PowerMenu[] = {
 const menuitem advancedMenu[] = {
 
 /*
- *  Power limit enable
  *  Power limit
  *  Detailed IDLE
  *  Detailed Soldering
@@ -221,24 +215,21 @@ const menuitem advancedMenu[] = {
  *  Reset Settings
  *  Power Pulse
  */
-{ (const char*) SettingsDescriptions[21], settings_setPowerLimitEnable,
-		settings_displayPowerLimitEnable }, /*Power limit enable*/
-{ (const char*) SettingsDescriptions[22], settings_setPowerLimit,
+{ (const char*) SettingsDescriptions[21], settings_setPowerLimit,
 		settings_displayPowerLimit }, /*Power limit*/
 { (const char*) SettingsDescriptions[6], settings_setAdvancedIDLEScreens,
 		settings_displayAdvancedIDLEScreens }, /* Advanced idle screen*/
-{ (const char*) SettingsDescriptions[15],
-		settings_setAdvancedSolderingScreens,
-				settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/
+{ (const char*) SettingsDescriptions[15], settings_setAdvancedSolderingScreens,
+		settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/
 { (const char*) SettingsDescriptions[13], settings_setResetSettings,
 		settings_displayResetSettings }, /*Resets settings*/
 { (const char*) SettingsDescriptions[12], settings_setCalibrate,
 		settings_displayCalibrate }, /*Calibrate tip*/
 { (const char*) SettingsDescriptions[14], settings_setCalibrateVIN,
 		settings_displayCalibrateVIN }, /*Voltage input cal*/
-{ (const char*) SettingsDescriptions[26], settings_setPowerPulse,
+{ (const char*) SettingsDescriptions[25], settings_setPowerPulse,
 		settings_displayPowerPulse }, /*Power Pulse adjustment */
-{ (const char*) SettingsDescriptions[27], settings_setTipGain,
+{ (const char*) SettingsDescriptions[26], settings_setTipGain,
 		settings_displayTipGain }, /*TipGain*/
 { NULL, NULL, NULL }  // end of menu marker. DO NOT REMOVE
 };
@@ -332,7 +323,7 @@ static int userConfirmation(const char *message) {
 static bool settings_setInputVRange(void) {
 	systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 5;
 	if (systemSettings.cutoutSetting)
-		systemSettings.powerLimitEnable = 0; // disable power limit if switching to a lipo power source
+		systemSettings.powerLimit = 0; // disable power limit if switching to a lipo power source
 	return systemSettings.cutoutSetting == 4;
 }
 
@@ -506,27 +497,21 @@ static void settings_displayAdvancedIDLEScreens(void) {
 	OLED::drawCheckbox(systemSettings.detailedIDLE);
 }
 
-static bool settings_setPowerLimitEnable(void) {
-	systemSettings.powerLimitEnable = !systemSettings.powerLimitEnable;
-	return false;
-}
-
-static void settings_displayPowerLimitEnable(void) {
-	printShortDescription(21, 7);
-	OLED::drawCheckbox(systemSettings.powerLimitEnable);
-}
-
 static bool settings_setPowerLimit(void) {
 	systemSettings.powerLimit += POWER_LIMIT_STEPS;
 	if (systemSettings.powerLimit > MAX_POWER_LIMIT)
-		systemSettings.powerLimit = POWER_LIMIT_STEPS;
+		systemSettings.powerLimit = 0;
 	return systemSettings.powerLimit + POWER_LIMIT_STEPS > MAX_POWER_LIMIT;
 }
 
 static void settings_displayPowerLimit(void) {
-	printShortDescription(22, 5);
-	OLED::printNumber(systemSettings.powerLimit, 2);
-	OLED::print(SymbolWatts);
+	printShortDescription(21, 5);
+	if (systemSettings.powerLimit == 0) {
+		OLED::print(OffString);
+	} else {
+		OLED::printNumber(systemSettings.powerLimit, 2);
+		OLED::print(SymbolWatts);
+	}
 }
 
 static bool settings_setScrollSpeed(void) {
@@ -824,7 +809,7 @@ static bool settings_setTipGain(void) {
 }
 
 static void settings_displayTipGain(void) {
-	printShortDescription(27, 5);
+	printShortDescription(26, 5);
 }
 
 static bool settings_setReverseButtonTempChangeEnabled(void) {
@@ -834,7 +819,7 @@ static bool settings_setReverseButtonTempChangeEnabled(void) {
 }
 
 static void settings_displayReverseButtonTempChangeEnabled(void) {
-	printShortDescription(23, 7);
+	printShortDescription(22, 7);
 	OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled);
 }
 
@@ -847,7 +832,7 @@ static bool settings_setTempChangeShortStep(void) {
 }
 
 static void settings_displayTempChangeShortStep(void) {
-	printShortDescription(24, 6);
+	printShortDescription(23, 6);
 	OLED::printNumber(systemSettings.TempChangeShortStep, 2);
 }
 
@@ -860,7 +845,7 @@ static bool settings_setTempChangeLongStep(void) {
 }
 
 static void settings_displayTempChangeLongStep(void) {
-	printShortDescription(25, 6);
+	printShortDescription(24, 6);
 	OLED::printNumber(systemSettings.TempChangeLongStep, 2);
 }
 
@@ -871,7 +856,7 @@ static bool settings_setPowerPulse(void) {
 	return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1;
 }
 static void settings_displayPowerPulse(void) {
-	printShortDescription(26, 5);
+	printShortDescription(25, 5);
 	if (systemSettings.KeepAwakePulse) {
 		OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1);
 		OLED::print(SymbolDot);
@@ -1042,7 +1027,8 @@ void gui_Menu(const menuitem *menu) {
 				descriptionStart = 0;
 			break;
 		case BUTTON_F_LONG:
-			if ((int)(xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) >
+			if ((int) (xTaskGetTickCount() - autoRepeatTimer
+					+ autoRepeatAcceleration) >
 			PRESS_ACCEL_INTERVAL_MAX) {
 				if ((lastValue = menu[currentScreen].incrementHandler()))
 					autoRepeatTimer = 1000;
diff --git a/workspace/TS100/Core/Threads/PIDThread.cpp b/workspace/TS100/Core/Threads/PIDThread.cpp
index b0e523dc..be94032e 100644
--- a/workspace/TS100/Core/Threads/PIDThread.cpp
+++ b/workspace/TS100/Core/Threads/PIDThread.cpp
@@ -112,7 +112,7 @@ void startPIDTask(void const *argument __unused) {
 			if (getTipRawTemp(0) > (0x7FFF - 150)) {
 				x10WattsOut = 0;
 			}
-			if (systemSettings.powerLimitEnable
+			if (systemSettings.powerLimit
 					&& x10WattsOut > (systemSettings.powerLimit * 10)) {
 				setTipX10Watts(systemSettings.powerLimit * 10);
 			} else {
diff --git a/workspace/TS100/configuration.h b/workspace/TS100/configuration.h
index 25e9ab7a..623a87cd 100644
--- a/workspace/TS100/configuration.h
+++ b/workspace/TS100/configuration.h
@@ -80,7 +80,6 @@
 #define CUT_OUT_SETTING           0         // default to no cut-off voltage (or 18W for TS80)
 #define TEMPERATURE_INF           0         // default to 0
 #define DESCRIPTION_SCROLL_SPEED  0         // 0: Slow 1: Fast - default to slow
-#define POWER_LIMIT_ENABLE        0         // 0: Disable 1: Enable - Default disabled power limit
 
 #define TIP_GAIN                210       // 21 uV/C * 10, uV per deg C constant of the tip, Tip uV * 10 / coeff = tip temp