diff --git a/amt-0.2.0_de.js b/amt-0.2.0_de.js
index 18f08d6..078378d 100644
--- a/amt-0.2.0_de.js
+++ b/amt-0.2.0_de.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_es.js b/amt-0.2.0_es.js
index 681c687..87748ba 100644
--- a/amt-0.2.0_es.js
+++ b/amt-0.2.0_es.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_fr.js b/amt-0.2.0_fr.js
index 0b1687e..3083a65 100644
--- a/amt-0.2.0_fr.js
+++ b/amt-0.2.0_fr.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_it.js b/amt-0.2.0_it.js
index fab38d8..3f61b05 100644
--- a/amt-0.2.0_it.js
+++ b/amt-0.2.0_it.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_ja.js b/amt-0.2.0_ja.js
index b5ea3a7..9259670 100644
--- a/amt-0.2.0_ja.js
+++ b/amt-0.2.0_ja.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_ko.js b/amt-0.2.0_ko.js
index 4a6096d..d4e7226 100644
--- a/amt-0.2.0_ko.js
+++ b/amt-0.2.0_ko.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_nl.js b/amt-0.2.0_nl.js
index 991ce20..60b3c67 100644
--- a/amt-0.2.0_nl.js
+++ b/amt-0.2.0_nl.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_pt.js b/amt-0.2.0_pt.js
index 7c27bf5..6e28d44 100644
--- a/amt-0.2.0_pt.js
+++ b/amt-0.2.0_pt.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_ru.js b/amt-0.2.0_ru.js
index b193259..1e08d95 100644
--- a/amt-0.2.0_ru.js
+++ b/amt-0.2.0_ru.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/amt-0.2.0_zh-chs.js b/amt-0.2.0_zh-chs.js
index e896579..9278b52 100644
--- a/amt-0.2.0_zh-chs.js
+++ b/amt-0.2.0_zh-chs.js
@@ -302,7 +302,10 @@ function AmtStackCreateService(wsmanStack) {
     obj.AMT_TimeSynchronizationService_SetHighAccuracyTimeSynch = function (Ta0, Tm1, Tm2, callback_func, tag) { obj.Exec('AMT_TimeSynchronizationService', 'SetHighAccuracyTimeSynch', { 'Ta0': Ta0, 'Tm1': Tm1, 'Tm2': Tm2 }, callback_func, tag); }
     obj.AMT_UserInitiatedConnectionService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_UserInitiatedConnectionService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
     obj.AMT_WebUIService_RequestStateChange = function (RequestedState, TimeoutPeriod, callback_func) { obj.Exec('AMT_WebUIService', 'RequestStateChange', { 'RequestedState': RequestedState, 'TimeoutPeriod': TimeoutPeriod }, callback_func); }
-    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
+    obj.AMT_WiFiPortConfigurationService_AddWiFiSettings = function (WiFiEndpoint, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) {
+        console.log(JSON.stringify({ "WiFiEndpoint": WiFiEndpoint, "WiFiEndpointSettingsInput": WiFiEndpointSettingsInput, "IEEE8021xSettingsInput": IEEE8021xSettingsInput, "ClientCredential": ClientCredential, "CACredential": CACredential }, null, 2));
+        obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'AddWiFiSettings', { 'WiFiEndpoint': WiFiEndpoint, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func);
+    }
     obj.AMT_WiFiPortConfigurationService_UpdateWiFiSettings = function (WiFiEndpointSettings, WiFiEndpointSettingsInput, IEEE8021xSettingsInput, ClientCredential, CACredential, callback_func) { obj.ExecWithXml('AMT_WiFiPortConfigurationService', 'UpdateWiFiSettings', { 'WiFiEndpointSettings': WiFiEndpointSettings, 'WiFiEndpointSettingsInput': WiFiEndpointSettingsInput, 'IEEE8021xSettingsInput': IEEE8021xSettingsInput, 'ClientCredential': ClientCredential, 'CACredential': CACredential }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllITProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllITProfiles', { '_method_dummy': _method_dummy }, callback_func); }
     obj.AMT_WiFiPortConfigurationService_DeleteAllUserProfiles = function (_method_dummy, callback_func) { obj.Exec('AMT_WiFiPortConfigurationService', 'DeleteAllUserProfiles', { '_method_dummy': _method_dummy }, callback_func); }
@@ -548,7 +551,7 @@ function AmtStackCreateService(wsmanStack) {
                 return _SystemFirmwareError[eventDataField[1]];
             } else if (eventOffset == 3) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
-                    return format("AMT One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
+                    return format("One Click Recovery: {0}", _OCRErrorEvents[eventDataField[2]]);
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) return "Got an error erasing Device SSD";
                     if (eventDataField[2] == 2) return "Erasing Device TPM is not supported";
@@ -559,11 +562,11 @@ function AmtStackCreateService(wsmanStack) {
             } else if (eventOffset == 5) {
                 if ((eventDataField[0] == 170) && (eventDataField[1] == 48)) {
                     if (eventDataField[2] == 1) {
-                        return format("AMT One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
+                        return format("One Click Recovery: CSME Boot Option {0}:{1} added successfully", (eventDataField[3]), _OCRSource[(eventDataField[3])]);
                     } else if (eventDataField[2] < 7) {
-                        return format("AMT One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
+                        return format("One Click Recovery: {0}", _OCRProgressEvents[eventDataField[2]]);
                     } else {
-                        return format("AMT One Click Recovery: Unknown progress event {0}", eventDataField[2]);
+                        return format("One Click Recovery: Unknown progress event {0}", eventDataField[2]);
                     }
                 } else if ((eventDataField[0] == 170) && (eventDataField[1] == 64)) {
                     if (eventDataField[2] == 1) {
@@ -962,15 +965,14 @@ args = {
 }, 
 */
 function execArgumentsToXml(args) {
-	if(args === undefined || args === null) return null;
-	
+	if ((args === undefined) || (args === null)) return null;
 	var result = '';
-	for(var argName in args) {
+	for (var argName in args) {
 		var arg = args[argName];
-		if(!arg) continue;
-		if(arg['__parameterType'] === 'reference') result += referenceToXml(argName, arg);
-		else result += instanceToXml(argName, arg);
-		//if(arg['__isInstance']) result += instanceToXml(argName, arg);
+		if (!arg) continue;
+		if (arg['__parameterType'] === 'reference') { result += referenceToXml(argName, arg); }
+		else { result += instanceToXml(argName, arg); }
+		//if (arg['__isInstance']) result += instanceToXml(argName, arg);
 	}
 	return result;
 }
@@ -988,25 +990,28 @@ function execArgumentsToXml(args) {
 	</r:WiFiEndpointSettingsInput>
  */
 function instanceToXml(instanceName, inInstance) {
-	if(inInstance === undefined || inInstance === null) return null;
+	if (inInstance === undefined || inInstance === null) return null;
 	
 	var hasNamespace = !!inInstance['__namespace'];
 	var startTag = hasNamespace ? '<q:' : '<';
 	var endTag = hasNamespace ? '</q:' : '</';
 	var namespaceDef = hasNamespace ? (' xmlns:q="' + inInstance['__namespace'] + '"' ): '';
 	var result = '<r:' + instanceName + namespaceDef + '>';
-	for(var prop in inInstance) {
-		if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
-		
-		if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop]) ) continue;
-		
-		if (typeof inInstance[prop] === 'object') {
-			//result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
-			console.error('only convert one level down...');
-		}
-		else {
-			result += startTag + prop +'>' + inInstance[prop].toString() + endTag + prop +'>';
-		}
+	if (typeof inInstance == 'string') {
+	    result += inInstance;
+	} else {
+	    for (var prop in inInstance) {
+	        if (!inInstance.hasOwnProperty(prop) || prop.indexOf('__') === 0) continue;
+
+	        if (typeof inInstance[prop] === 'function' || Array.isArray(inInstance[prop])) continue;
+
+	        if (typeof inInstance[prop] === 'object') {
+	            //result += startTag + prop +'>' + instanceToXml('prop', inInstance[prop]) + endTag + prop +'>';
+	            console.error('only convert one level down...');
+	        } else {
+	            result += startTag + prop + '>' + inInstance[prop].toString() + endTag + prop + '>';
+	        }
+	    }
 	}
 	result += '</r:' + instanceName + '>';
 	return result;
diff --git a/index_de.html b/index_de.html
index b2b93e8..54fee0c 100644
--- a/index_de.html
+++ b/index_de.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Senden" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Zeigen Sie Strg-Alt-Entf</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Begrenzte Bildrate</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Maus nicht drehen</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Andere Einstellungen</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Priorität</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">Wpa psk</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Authentifizierung</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Keiner</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>Verschlüsselung</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Länge zwischen 8 und 63 Zeichen"><div title="Länge zwischen 8 und 63 Zeichen">Passwort*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Länge zwischen 8 und 63 Zeichen"><div title="Länge zwischen 8 und 63 Zeichen">Kennwort bestätigen</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Länge zwischen 8 und 63 Zeichen"><div title="Länge zwischen 8 und 63 Zeichen">Passwort*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Länge zwischen 8 und 63 Zeichen"><div title="Länge zwischen 8 und 63 Zeichen">Kennwort bestätigen</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protokoll</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximal 32 Zeichen"><div title="Maximal 32 Zeichen">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nutzername</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Passwort</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">aktiviert</option>
+                            <option value="0">Behindert</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Starteinstellungen</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Keiner</option>
-                        <option id="ForceDVDBootOption" value="1">CD / DVD-Start erzwingen</option>
-                        <option id="ForcePXEBootOption" value="2">PXE-Start erzwingen</option>
-                        <option id="ForceHDBootOption" value="3">Festplattenstart erzwingen</option>
-                        <option id="ForceDiagBootOption" value="4">Diagnosestart erzwingen</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Boot-Quelle</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">aktiviert<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Behindert<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Behindert</option>
+                        <option value="1">aktiviert</option>
+                    </select>
+                    <div>aktiviert</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protokoll</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximal 32 Zeichen"><div title="Maximal 32 Zeichen">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nutzername</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Passwort</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">aktiviert</option>
+                        <option value="1">Behindert</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Stornieren" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Wird geladen..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Unbekannt", 1: "Andere", 2: "aktiviert", 3: "Behindert", 4: "Herunterfahren", 5: "Unzutreffend", 6: "Aktiviert aber offline", 7: "Im Test", 8: "Aufgeschoben", 9: "Ruhe", 10: "Beginnend", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Unbekannt";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "aktiviert" : "Behindert"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "aktiviert":"Behindert", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Antworten Sie auf Ping", addLinkConditional(["Behindert", "ICMP-Antwort", "RMCP-Antwort", "ICMP & RMCP Antwort"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Behindert";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Aktiviert," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automatisch mit DHCP-Server" : "Statische IP-Adresse";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("IPv4-Status", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Kein Zertifikat, TLS deaktiviert" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Zertifikat" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Behindert", 32768: "Aktiviert in S0", 32769: "Aktiviert in S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Ein, Verbunden", 3: "aus", 6: "Ein, Nicht verbunden" };
-        var xxWifiAuthenticationMethod = { 1: "Andere", 2: "Öffnen", 3: "Gemeinsamer Schlüssel", 4: "Wpa psk", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Andere", 2: "Öffnen", 3: "Gemeinsamer Schlüssel", 4: "Wpa psk", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Andere", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Keiner" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Entfernen", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Profilname", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Authentifizierung", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("Verschlüsselung", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Priorität", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Authentifizierung", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Nutzername", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Drahtloses Profil", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Keiner") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Keiner") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "Wpa psk" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Drahtloses Profil hinzufügen", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Keiner") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Keiner") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Remotedesktop", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Remotedesktop", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Einschalten", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Zurücksetzen", 10);
-                    addOption('d5actionSelect', "Aus- und Wiedereinschalten", 5);
-                    addOption('d5actionSelect', "Stromausfall", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die Diagnose ein", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Auf Diagnose zurücksetzen", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "OS Wake aus dem Standby", 500);
-                    addOption('d5actionSelect', "Energiesparen des Betriebssystems", 501);
-                    addOption('d5actionSelect', "Soft-Off", 12);
-                    addOption('d5actionSelect', "Soft-Reset", 14);
-                    addOption('d5actionSelect', "Schlaf", 4);
-                    addOption('d5actionSelect', "Überwintern", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie das BIOS ein", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Auf BIOS zurücksetzen", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie das Gerät zum sicheren Löschen ein", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Zum sicheren Löschen zurücksetzen", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Auf IDE-R-Diskette zurücksetzen", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die IDE-R-Diskette ein", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Auf IDE-R-CD-ROM zurücksetzen", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die IDE-R-CD-ROM ein", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Auf PXE zurücksetzen", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie PXE ein", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Benutzerdefinierte Aktion ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Zustimmung des Benutzers ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Power-Aktionen", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Power Action", format("Systemfunktionen können nicht abgerufen werden, Fehler {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Einschalten", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Zurücksetzen", 10);
+                addOption('d5actionSelect', "Aus- und Wiedereinschalten", 5);
+                addOption('d5actionSelect', "Stromausfall", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die Diagnose ein", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Auf Diagnose zurücksetzen", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "OS Wake aus dem Standby", 500);
+                addOption('d5actionSelect', "Energiesparen des Betriebssystems", 501);
+                addOption('d5actionSelect', "Soft-Off", 12);
+                addOption('d5actionSelect', "Soft-Reset", 14);
+                addOption('d5actionSelect', "Schlaf", 4);
+                addOption('d5actionSelect', "Überwintern", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie das BIOS ein", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Auf BIOS zurücksetzen", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie das Gerät zum sicheren Löschen ein", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Zum sicheren Löschen zurücksetzen", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Auf IDE-R-Diskette zurücksetzen", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die IDE-R-Diskette ein", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Auf IDE-R-CD-ROM zurücksetzen", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie die IDE-R-CD-ROM ein", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Auf PXE zurücksetzen", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schalten Sie PXE ein", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Benutzerdefinierte Aktion ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Zustimmung des Benutzers ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Power-Aktionen", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> WARNUNG: </ b> Dadurch werden Daten auf dem Remote-System gelöscht." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Power-Aktionen", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Benutzerdefinierte Power-Aktion", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Power Action", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Zustimmung des Benutzers", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Power Action", format("Error #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Power Action", "Benutzereinwilligung senden ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Es wurden keine Weckalarme registriert." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Entfernen Sie alle Alarme", 'RemoveAllAlarms()') + AddButton("Hinzufügen", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Entfernen Sie alle Alarme", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Hinzufügen", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "Aktualisierung" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_es.html b/index_es.html
index 4ed4fba..2e6e436 100644
--- a/index_es.html
+++ b/index_es.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Enviar" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Mostrar Ctrl-Alt-Supr</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Límite de velocidad de fotogramas</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">No gire el mouse</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Otros ajustes</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Prioridad</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">PSK WPA</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Autenticación</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Ninguna</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>Cifrado</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longitud entre 8 y 63 caracteres."><div title="Longitud entre 8 y 63 caracteres.">Contraseña*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longitud entre 8 y 63 caracteres."><div title="Longitud entre 8 y 63 caracteres.">Confirmar contraseña</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longitud entre 8 y 63 caracteres."><div title="Longitud entre 8 y 63 caracteres.">Contraseña*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longitud entre 8 y 63 caracteres."><div title="Longitud entre 8 y 63 caracteres.">Confirmar contraseña</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protocolo</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Máximo 32 caracteres"><div title="Máximo 32 caracteres">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nombre de usuario</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Contraseña</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">Habilitado</option>
+                            <option value="0">Discapacitado</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Configuración de arranque</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Ninguna</option>
-                        <option id="ForceDVDBootOption" value="1">Forzar arranque de CD / DVD</option>
-                        <option id="ForcePXEBootOption" value="2">Arranque Force PXE</option>
-                        <option id="ForceHDBootOption" value="3">Forzar arranque de disco duro</option>
-                        <option id="ForceDiagBootOption" value="4">Arranque de diagnóstico de fuerza</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Fuente de arranque</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">Habilitado<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Discapacitado<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Discapacitado</option>
+                        <option value="1">Habilitado</option>
+                    </select>
+                    <div>Habilitado</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protocolo</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Máximo 32 caracteres"><div title="Máximo 32 caracteres">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nombre de usuario</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Contraseña</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Habilitado</option>
+                        <option value="1">Discapacitado</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Cancelar" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Cargando..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Desconocido", 1: "Otro", 2: "Habilitado", 3: "Discapacitado", 4: "Apagando", 5: "No aplica", 6: "Habilitado pero sin conexión", 7: "En prueba", 8: "Diferido", 9: "Quietud", 10: "Comenzando", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Desconocido";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "Habilitado" : "Discapacitado"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "Habilitado":"Discapacitado", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Responder al ping", addLinkConditional(["Discapacitado", "Respuesta ICMP", "Respuesta RMCP", "Respuesta ICMP y RMCP"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Discapacitado";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Habilitado," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automático usando el servidor DHCP" : "Dirección IP estática";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("Estado IPv4", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Sin certificado, TLS deshabilitado" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Certificado" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Discapacitado", 32768: "Habilitado en S0", 32769: "Habilitado en S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Encendido, conectado", 3: "Apagado", 6: "Encendido, desconectado" };
-        var xxWifiAuthenticationMethod = { 1: "Otro", 2: "Abierto", 3: "Llave compartida", 4: "PSK WPA", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Otro", 2: "Abierto", 3: "Llave compartida", 4: "PSK WPA", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Otro", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Ninguna" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Eliminar", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Nombre de perfil", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Autenticación", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("Cifrado", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Prioridad", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Autenticación", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Nombre de usuario", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Perfil inalámbrico", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Ninguna") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Ninguna") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "PSK WPA" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Agregar perfil inalámbrico", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Ninguna") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Ninguna") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Escritorio remoto", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Escritorio remoto", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Encender", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Reiniciar", 10);
-                    addOption('d5actionSelect', "Ciclo de poder", 5);
-                    addOption('d5actionSelect', "Corriente cortada", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Encendido al diagnóstico", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Restablecer a diagnóstico", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "OS Wake desde Standby", 500);
-                    addOption('d5actionSelect', "Ahorro de energía del sistema operativo", 501);
-                    addOption('d5actionSelect', "Soft-off", 12);
-                    addOption('d5actionSelect', "Reinicio suave", 14);
-                    addOption('d5actionSelect', "Dormir", 4);
-                    addOption('d5actionSelect', "Hibernar", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Encienda el BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Restablecer a BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Encender para borrar de forma segura", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Restablecer a borrado seguro", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Restablecer al disquete IDE-R", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Encienda el disquete IDE-R", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Restablecer a IDE-R CDROM", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Encienda el CDROM IDE-R", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Restablecer a PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Encender a PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Acción personalizada ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Consentimiento del usuario ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Acciones de poder", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Acción de poder", format("No se pueden obtener las capacidades del sistema, error {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Encender", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Reiniciar", 10);
+                addOption('d5actionSelect', "Ciclo de poder", 5);
+                addOption('d5actionSelect', "Corriente cortada", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Encendido al diagnóstico", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Restablecer a diagnóstico", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "OS Wake desde Standby", 500);
+                addOption('d5actionSelect', "Ahorro de energía del sistema operativo", 501);
+                addOption('d5actionSelect', "Soft-off", 12);
+                addOption('d5actionSelect', "Reinicio suave", 14);
+                addOption('d5actionSelect', "Dormir", 4);
+                addOption('d5actionSelect', "Hibernar", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Encienda el BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Restablecer a BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Encender para borrar de forma segura", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Restablecer a borrado seguro", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Restablecer al disquete IDE-R", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Encienda el disquete IDE-R", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Restablecer a IDE-R CDROM", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Encienda el CDROM IDE-R", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Restablecer a PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Encender a PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Acción personalizada ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Consentimiento del usuario ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Acciones de poder", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> ADVERTENCIA: </b> Esto borrará los datos del sistema remoto." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Acciones de poder", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Acción de poder personalizada", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Acción de poder", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Consentimiento del usuario", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Acción de poder", format("Error #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Acción de poder", "Enviando consentimiento del usuario ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "No hay alarmas de despertador registradas." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Eliminar todas las alarmas", 'RemoveAllAlarms()') + AddButton("Añadir", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Eliminar todas las alarmas", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Añadir", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "Actualizar" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_fr.html b/index_fr.html
index 1a30a9e..69fc625 100644
--- a/index_fr.html
+++ b/index_fr.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Envoyer" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Afficher Ctrl-Alt-Suppr</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Taux de trame limite</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Ne faites pas tourner la souris</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Autres réglages</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Priorité</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Authentification</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Aucun</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>Chiffrement</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longueur entre 8 et 63 caractères"><div title="Longueur entre 8 et 63 caractères">Mot de passe*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longueur entre 8 et 63 caractères"><div title="Longueur entre 8 et 63 caractères">Confirmez le mot de passe</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longueur entre 8 et 63 caractères"><div title="Longueur entre 8 et 63 caractères">Mot de passe*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Longueur entre 8 et 63 caractères"><div title="Longueur entre 8 et 63 caractères">Confirmez le mot de passe</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protocole</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="32 caractères maximum"><div title="32 caractères maximum">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nom d'utilisateur</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Mot de passe</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">Activée</option>
+                            <option value="0">désactivé</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Paramètres de démarrage</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Aucun</option>
-                        <option id="ForceDVDBootOption" value="1">Forcer le démarrage du CD / DVD</option>
-                        <option id="ForcePXEBootOption" value="2">Forcer le démarrage PXE</option>
-                        <option id="ForceHDBootOption" value="3">Forcer l'amorçage du disque dur</option>
-                        <option id="ForceDiagBootOption" value="4">Forcer le démarrage du diagnostic</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Source de démarrage</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">Activée<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">désactivé<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">désactivé</option>
+                        <option value="1">Activée</option>
+                    </select>
+                    <div>Activée</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protocole</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="32 caractères maximum"><div title="32 caractères maximum">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nom d'utilisateur</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Mot de passe</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Activée</option>
+                        <option value="1">désactivé</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Annuler" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Chargement..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Inconnue", 1: "Autre", 2: "Activée", 3: "désactivé", 4: "Éteindre", 5: "N'est pas applicable", 6: "Activé mais hors ligne", 7: "En test", 8: "Différé", 9: "Au repos", 10: "Départ", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Inconnue";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "Activée" : "désactivé"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "Activée":"désactivé", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Répondre au ping", addLinkConditional(["désactivé", "Réponse ICMP", "Réponse RMCP", "Réponse ICMP et RMCP"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "désactivé";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Activée," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automatique à l'aide du serveur DHCP" : "Adresse IP statique";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("État IPv4", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Aucun certificat, TLS désactivé" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Certificat" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "désactivé", 32768: "Activé dans S0", 32769: "Activé dans S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Allumé, connecté", 3: "De", 6: "Activé, déconnecté" };
-        var xxWifiAuthenticationMethod = { 1: "Autre", 2: "Ouvert", 3: "Clé partagée", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Autre", 2: "Ouvert", 3: "Clé partagée", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Autre", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Aucun" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Retirer", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Nom de profil", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Authentification", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("Chiffrement", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Priorité", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Authentification", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Nom d'utilisateur", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Profil sans fil", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Aucun") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Aucun") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Ajouter un profil sans fil", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Aucun") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Aucun") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Bureau à distance", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Bureau à distance", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Power up", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Réinitialiser", 10);
-                    addOption('d5actionSelect', "Cycle de puissance", 5);
-                    addOption('d5actionSelect', "Éteindre", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Mise sous tension du diagnostic", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser au diagnostic", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "Réveil du système d'exploitation en veille", 500);
-                    addOption('d5actionSelect', "Économie d'énergie du système d'exploitation", 501);
-                    addOption('d5actionSelect', "Soft-off", 12);
-                    addOption('d5actionSelect', "Redémarrage en douceur", 14);
-                    addOption('d5actionSelect', "Dormir", 4);
-                    addOption('d5actionSelect', "Hiberner", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Mettez le BIOS sous tension", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser au BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Mise sous tension pour effacement sécurisé", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser pour effacer sécurisé", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser sur la disquette IDE-R", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Mettez sous tension la disquette IDE-R", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser sur CD-ROM IDE-R", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Allumer le CD-ROM IDE-R", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser à PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Allumez PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Action personnalisée ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Consentement de l'utilisateur ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Actions de puissance", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Action de puissance", format("Impossible d'obtenir les capacités du système, erreur {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Power up", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Réinitialiser", 10);
+                addOption('d5actionSelect', "Cycle de puissance", 5);
+                addOption('d5actionSelect', "Éteindre", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Mise sous tension du diagnostic", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser au diagnostic", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "Réveil du système d'exploitation en veille", 500);
+                addOption('d5actionSelect', "Économie d'énergie du système d'exploitation", 501);
+                addOption('d5actionSelect', "Soft-off", 12);
+                addOption('d5actionSelect', "Redémarrage en douceur", 14);
+                addOption('d5actionSelect', "Dormir", 4);
+                addOption('d5actionSelect', "Hiberner", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Mettez le BIOS sous tension", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser au BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Mise sous tension pour effacement sécurisé", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser pour effacer sécurisé", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser sur la disquette IDE-R", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Mettez sous tension la disquette IDE-R", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser sur CD-ROM IDE-R", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Allumer le CD-ROM IDE-R", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Réinitialiser à PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Allumez PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Action personnalisée ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Consentement de l'utilisateur ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Actions de puissance", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> AVERTISSEMENT: </b> Cela effacera les données sur le système distant." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Actions de puissance", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Action de puissance personnalisée", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Action de puissance", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Consentement de l'utilisateur", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Action de puissance", format("Erreur #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Action de puissance", "Envoi du consentement de l'utilisateur ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Aucune alarme de réveil enregistrée." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Supprimer toutes les alarmes", 'RemoveAllAlarms()') + AddButton("Ajouter", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Supprimer toutes les alarmes", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Ajouter", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "Rafraîchir" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_it.html b/index_it.html
index f6d444a..ee42427 100644
--- a/index_it.html
+++ b/index_it.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Spedire" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Mostra Ctrl-Alt-Canc</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Frame rate limite</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Non ruotare il mouse</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Altre impostazioni</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Priorità</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Autenticazione</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Nessuna</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>crittografia</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lunghezza tra 8 e 63 caratteri"><div title="Lunghezza tra 8 e 63 caratteri">Parola d'ordine*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lunghezza tra 8 e 63 caratteri"><div title="Lunghezza tra 8 e 63 caratteri">conferma password</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lunghezza tra 8 e 63 caratteri"><div title="Lunghezza tra 8 e 63 caratteri">Parola d'ordine*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lunghezza tra 8 e 63 caratteri"><div title="Lunghezza tra 8 e 63 caratteri">conferma password</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protocollo</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Massimo 32 caratteri"><div title="Massimo 32 caratteri">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nome utente</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Parola d'ordine</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">Abilitato</option>
+                            <option value="0">Disabilitato</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Impostazioni di avvio</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Nessuna</option>
-                        <option id="ForceDVDBootOption" value="1">Forza avvio CD / DVD</option>
-                        <option id="ForcePXEBootOption" value="2">Forza avvio PXE</option>
-                        <option id="ForceHDBootOption" value="3">Forza l'avvio del disco rigido</option>
-                        <option id="ForceDiagBootOption" value="4">Forza avvio diagnostico</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Boot Source</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">Abilitato<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Disabilitato<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Disabilitato</option>
+                        <option value="1">Abilitato</option>
+                    </select>
+                    <div>Abilitato</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protocollo</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Massimo 32 caratteri"><div title="Massimo 32 caratteri">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nome utente</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Parola d'ordine</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Abilitato</option>
+                        <option value="1">Disabilitato</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Annulla" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Caricamento in corso..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Sconosciuto", 1: "Altro", 2: "Abilitato", 3: "Disabilitato", 4: "Chiudere", 5: "Non applicabile", 6: "Abilitato ma offline", 7: "In prova", 8: "differite", 9: "quiesce", 10: "Di partenza", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Sconosciuto";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "Abilitato" : "Disabilitato"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "Abilitato":"Disabilitato", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Rispondi al ping", addLinkConditional(["Disabilitato", "Risposta ICMP", "Risposta RMCP", "Risposta ICMP e RMCP"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Disabilitato";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Abilitato," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automatico tramite server DHCP" : "Indirizzo IP statico";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("Stato IPv4", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Nessun certificato, TLS disabilitato" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Certificato" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Disabilitato", 32768: "Abilitato in S0", 32769: "Abilitato in S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Acceso, connesso", 3: "via", 6: "Acceso, disconnesso" };
-        var xxWifiAuthenticationMethod = { 1: "Altro", 2: "Aperto", 3: "Chiave condivisa", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Altro", 2: "Aperto", 3: "Chiave condivisa", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Altro", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Nessuna" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Rimuovere", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Nome del profilo", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Autenticazione", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("crittografia", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Priorità", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Autenticazione", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Nome utente", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Profilo wireless", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Nessuna") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Nessuna") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Aggiungi profilo wireless", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Nessuna") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Nessuna") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Desktop remoto", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Desktop remoto", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Accendere", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Ripristina", 10);
-                    addOption('d5actionSelect', "Ciclo di alimentazione", 5);
-                    addOption('d5actionSelect', "Spegnere", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Accendi la diagnostica", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Ripristina diagnostica", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "OS Wake from Standby", 500);
-                    addOption('d5actionSelect', "Risparmio energetico del sistema operativo", 501);
-                    addOption('d5actionSelect', "Soft-off", 12);
-                    addOption('d5actionSelect', "Soft-reset", 14);
-                    addOption('d5actionSelect', "Dormire", 4);
-                    addOption('d5actionSelect', "Hibernate", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Accensione al BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Ripristina al BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Accensione per Cancellazione sicura", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Ripristina per cancellare sicura", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Ripristina IDE-R Floppy", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Accendi IDE-R Floppy", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Ripristinare su IDE-R CDROM", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Accendere il CD-ROM IDE-R", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Ripristina su PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Accendere a PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Azione personalizzata ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Consenso dell'utente ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Azioni di potere", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Azione di potere", format("Impossibile ottenere le funzionalità di sistema, errore {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Accendere", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Ripristina", 10);
+                addOption('d5actionSelect', "Ciclo di alimentazione", 5);
+                addOption('d5actionSelect', "Spegnere", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Accendi la diagnostica", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Ripristina diagnostica", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "OS Wake from Standby", 500);
+                addOption('d5actionSelect', "Risparmio energetico del sistema operativo", 501);
+                addOption('d5actionSelect', "Soft-off", 12);
+                addOption('d5actionSelect', "Soft-reset", 14);
+                addOption('d5actionSelect', "Dormire", 4);
+                addOption('d5actionSelect', "Hibernate", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Accensione al BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Ripristina al BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Accensione per Cancellazione sicura", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Ripristina per cancellare sicura", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Ripristina IDE-R Floppy", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Accendi IDE-R Floppy", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Ripristinare su IDE-R CDROM", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Accendere il CD-ROM IDE-R", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Ripristina su PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Accendere a PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Azione personalizzata ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Consenso dell'utente ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Azioni di potere", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> ATTENZIONE: </b> Questo cancellerà i dati sul sistema remoto." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Azioni di potere", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Azione di potenza personalizzata", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Azione di potere", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Consenso dell'utente", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Azione di potere", format("Errore n.", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Azione di potere", "Invio del consenso dell'utente ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Nessun allarme di sveglia registrato." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Rimuovi tutti gli allarmi", 'RemoveAllAlarms()') + AddButton("Inserisci", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Rimuovi tutti gli allarmi", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Inserisci", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "ricaricare" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_ja.html b/index_ja.html
index 1f78012..9a4dbe3 100644
--- a/index_ja.html
+++ b/index_ja.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="送る" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Ctrl-Alt-Delを表示する</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">フレームレートを制限</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">マウスを回転させない</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>その他の設定</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>優先</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>認証</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">無し</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>暗号化</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8〜63文字の長さ"><div title="8〜63文字の長さ">パスワード*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8〜63文字の長さ"><div title="8〜63文字の長さ">パスワードを認証する</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8〜63文字の長さ"><div title="8〜63文字の長さ">パスワード*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8〜63文字の長さ"><div title="8〜63文字の長さ">パスワードを認証する</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>プロトコル</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="最大32文字"><div title="最大32文字">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">ユーザー名</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">パスワード</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">有効</option>
+                            <option value="0">無効</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>起動設定</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">無し</option>
-                        <option id="ForceDVDBootOption" value="1">CD / DVDブートを強制する</option>
-                        <option id="ForcePXEBootOption" value="2">PXEブートを強制する</option>
-                        <option id="ForceHDBootOption" value="3">強制的にハードディスクを起動</option>
-                        <option id="ForceDiagBootOption" value="4">診断ブートを強制</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>ブートソース</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">有効<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">無効<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">無効</option>
+                        <option value="1">有効</option>
+                    </select>
+                    <div>有効</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>プロトコル</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="最大32文字"><div title="最大32文字">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">ユーザー名</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">パスワード</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">有効</option>
+                        <option value="1">無効</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="キャンセル" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "読み込んでいます..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "わからない", 1: "その他の", 2: "有効", 3: "無効", 4: "シャットダウン", 5: "適用できません", 6: "有効だがオフライン", 7: "テスト中", 8: "据え置き", 9: "休止", 10: "起動", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"わからない";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "有効" : "無効"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "有効":"無効", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("pingに応答する", addLinkConditional(["無効", "ICMP応答", "RMCP応答", "ICMPおよびRMCP応答"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "無効";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "有効、" + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "DHCPサーバーを使用して自動" : "静的IPアドレス";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("IPv4状態", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "証明書なし、TLS無効" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "証書" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "無効", 32768: "S0で有効", 32769: "S0、Sx / ACで有効" };
         var xxRadioState = 	{ 2: "オン、接続済み", 3: "オフ", 6: "オン、切断" };
-        var xxWifiAuthenticationMethod = { 1: "その他の", 2: "開いた", 3: "共有キー", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "その他の", 2: "開いた", 3: "共有キー", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "その他の", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "無し" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("削除する", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("プロファイル名", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("認証", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("暗号化", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("優先", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("認証", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("ユーザー名", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("ワイヤレスプロファイル", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("無し") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("無し") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "ワイヤレスプロファイルを追加", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("無し") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("無し") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("リモートデスクトップ", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("リモートデスクトップ", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "パワーアップ", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "リセット", 10);
-                    addOption('d5actionSelect', "パワーサイクル", 5);
-                    addOption('d5actionSelect', "パワーダウン", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "診断の電源を入れます", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "診断にリセット", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "スタンバイからのOSウェイク", 500);
-                    addOption('d5actionSelect', "OSの省電力", 501);
-                    addOption('d5actionSelect', "ソフトオフ", 12);
-                    addOption('d5actionSelect', "ソフトリセット", 14);
-                    addOption('d5actionSelect', "睡眠", 4);
-                    addOption('d5actionSelect', "ハイバネート", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "BIOSに電源投入", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "BIOSにリセット", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "安全な消去のための電源投入", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "安全な消去にリセット", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "IDE-Rフロッピーにリセット", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "IDE-Rフロッピーの電源を入れます", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "IDE-R CDROMにリセット", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "IDE-R CDROMの電源を入れます", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "PXEにリセット", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "PXEの電源を入れます", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "カスタムアクション...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "ユーザーの同意...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "パワーアクション", 3, powerActionDlgCheck);
-            } else {
-                messagebox("パワーアクション", format("システム機能を取得できません。エラー{0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "パワーアップ", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "リセット", 10);
+                addOption('d5actionSelect', "パワーサイクル", 5);
+                addOption('d5actionSelect', "パワーダウン", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "診断の電源を入れます", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "診断にリセット", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "スタンバイからのOSウェイク", 500);
+                addOption('d5actionSelect', "OSの省電力", 501);
+                addOption('d5actionSelect', "ソフトオフ", 12);
+                addOption('d5actionSelect', "ソフトリセット", 14);
+                addOption('d5actionSelect', "睡眠", 4);
+                addOption('d5actionSelect', "ハイバネート", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "BIOSに電源投入", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "BIOSにリセット", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "安全な消去のための電源投入", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "安全な消去にリセット", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "IDE-Rフロッピーにリセット", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "IDE-Rフロッピーの電源を入れます", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "IDE-R CDROMにリセット", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "IDE-R CDROMの電源を入れます", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "PXEにリセット", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "PXEの電源を入れます", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "カスタムアクション...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "ユーザーの同意...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "パワーアクション", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b>警告：</ b>これにより、リモートシステムのデータがワイプされます。" + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "パワーアクション", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "カスタム電源アクション", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("パワーアクション", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "ユーザーの同意", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("パワーアクション", format("エラー＃", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("パワーアクション", "ユーザーの同意を送信しています...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "ウェイクアラームは登録されていません。" + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("すべてのアラームを削除", 'RemoveAllAlarms()') + AddButton("追加", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("すべてのアラームを削除", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("追加", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "リフレッシュ" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_ko.html b/index_ko.html
index 9439307..44c48bd 100644
--- a/index_ko.html
+++ b/index_ko.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="보내다" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Ctrl-Alt-Del 표시</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">프레임 속도 제한</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">마우스를 돌리지 마십시오</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>다른 설정</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>우선 순위</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>입증</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">없음</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>암호화</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8 자에서 63 자 사이의 길이"><div title="8 자에서 63 자 사이의 길이">암호*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8 자에서 63 자 사이의 길이"><div title="8 자에서 63 자 사이의 길이">비밀번호 확인</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8 자에서 63 자 사이의 길이"><div title="8 자에서 63 자 사이의 길이">암호*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="8 자에서 63 자 사이의 길이"><div title="8 자에서 63 자 사이의 길이">비밀번호 확인</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>실험 계획안</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="최대 32 자"><div title="최대 32 자">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">사용자 이름</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">암호</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">가능</option>
+                            <option value="0">비활성화</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>부팅 설정</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">없음</option>
-                        <option id="ForceDVDBootOption" value="1">CD / DVD 부팅 강제</option>
-                        <option id="ForcePXEBootOption" value="2">PXE 부팅 강제</option>
-                        <option id="ForceHDBootOption" value="3">강제 하드 디스크 부팅</option>
-                        <option id="ForceDiagBootOption" value="4">강제 진단 부팅</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>부팅 소스</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">가능<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">비활성화<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">비활성화</option>
+                        <option value="1">가능</option>
+                    </select>
+                    <div>가능</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>실험 계획안</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="최대 32 자"><div title="최대 32 자">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">사용자 이름</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">암호</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">가능</option>
+                        <option value="1">비활성화</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="취소" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "불러오는 중 ..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "알 수 없는", 1: "다른", 2: "가능", 3: "비활성화", 4: "종료", 5: "해당 사항 없음", 6: "활성화되었지만 오프라인", 7: "테스트 중", 8: "연기 됨", 9: "Quiesce", 10: "시작", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"알 수 없는";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "가능" : "비활성화"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "가능":"비활성화", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("핑에 응답", addLinkConditional(["비활성화", "ICMP 응답", "RMCP 응답", "ICMP 및 RMCP 응답"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "비활성화";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "사용," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "DHCP 서버를 사용하여 자동" : "고정 IP 주소";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("IPv4 상태", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "인증서 없음, TLS 비활성화" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "증명서" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "비활성화", 32768: "S0에서 활성화", 32769: "S0, Sx / AC에서 활성화" };
         var xxRadioState = 	{ 2: "연결됨", 3: "떨어져서", 6: "켜기, 연결 끊기" };
-        var xxWifiAuthenticationMethod = { 1: "다른", 2: "열다", 3: "공용 열쇠", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "다른", 2: "열다", 3: "공용 열쇠", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "다른", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "없음" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("없애다", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("프로필 이름", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("입증", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("암호화", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("우선 순위", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("입증", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("사용자 이름", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("무선 프로파일", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("없음") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("없음") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "무선 프로파일 추가", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("없음") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("없음") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("원격 데스크탑", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("원격 데스크탑", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "파워 업", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "초기화", 10);
-                    addOption('d5actionSelect', "전원 사이클", 5);
-                    addOption('d5actionSelect', "전력 다운", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "진단 전원 켜기", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "진단으로 재설정", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "대기 모드에서 OS 웨이크", 500);
-                    addOption('d5actionSelect', "OS 절전", 501);
-                    addOption('d5actionSelect', "소프트 오프", 12);
-                    addOption('d5actionSelect', "소프트 리셋", 14);
-                    addOption('d5actionSelect', "자다", 4);
-                    addOption('d5actionSelect', "동면", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "BIOS 전원", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "BIOS로 재설정", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "안전한 지우기 기능", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "안전한 지우기로 재설정", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "IDE-R 플로피로 재설정", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "IDE-R 플로피 전원 켜기", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "IDE-R CDROM으로 재설정", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "IDE-R CDROM 전원 켜기", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "PXE로 재설정", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "PXE 전원 켜기", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "맞춤 작업 ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "사용자 동의 ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "파워 액션", 3, powerActionDlgCheck);
-            } else {
-                messagebox("파워 액션", format("시스템 기능을 가져올 수 없음, 오류 {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "파워 업", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "초기화", 10);
+                addOption('d5actionSelect', "전원 사이클", 5);
+                addOption('d5actionSelect', "전력 다운", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "진단 전원 켜기", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "진단으로 재설정", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "대기 모드에서 OS 웨이크", 500);
+                addOption('d5actionSelect', "OS 절전", 501);
+                addOption('d5actionSelect', "소프트 오프", 12);
+                addOption('d5actionSelect', "소프트 리셋", 14);
+                addOption('d5actionSelect', "자다", 4);
+                addOption('d5actionSelect', "동면", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "BIOS 전원", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "BIOS로 재설정", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "안전한 지우기 기능", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "안전한 지우기로 재설정", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "IDE-R 플로피로 재설정", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "IDE-R 플로피 전원 켜기", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "IDE-R CDROM으로 재설정", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "IDE-R CDROM 전원 켜기", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "PXE로 재설정", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "PXE 전원 켜기", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "맞춤 작업 ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "사용자 동의 ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "파워 액션", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> 경고 : </ b> 원격 시스템의 데이터를 지 웁니다." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "파워 액션", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "커스텀 파워 액션", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("파워 액션", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "사용자 동의", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("파워 액션", format("오류 #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("파워 액션", "사용자 동의를 보내는 중 ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "등록 된 깨우기 경보가 없습니다." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("모든 알람 제거", 'RemoveAllAlarms()') + AddButton("더하다", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("모든 알람 제거", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("더하다", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "새롭게 하다" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_nl.html b/index_nl.html
index 97db759..9debe31 100644
--- a/index_nl.html
+++ b/index_nl.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Sturen" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Toon Ctrl-Alt-Del</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Framesnelheid beperken</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Draai de muis niet</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Andere instellingen</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Prioriteit</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Verificatie</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Geen</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>Versleuteling</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lengte tussen 8 en 63 tekens"><div title="Lengte tussen 8 en 63 tekens">Wachtwoord*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lengte tussen 8 en 63 tekens"><div title="Lengte tussen 8 en 63 tekens">bevestig wachtwoord</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lengte tussen 8 en 63 tekens"><div title="Lengte tussen 8 en 63 tekens">Wachtwoord*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Lengte tussen 8 en 63 tekens"><div title="Lengte tussen 8 en 63 tekens">bevestig wachtwoord</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protocol</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximaal 32 tekens"><div title="Maximaal 32 tekens">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Gebruikersnaam</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Wachtwoord</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">Ingeschakeld</option>
+                            <option value="0">Gehandicapt</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Opstartinstellingen</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Geen</option>
-                        <option id="ForceDVDBootOption" value="1">Forceer CD / DVD Boot</option>
-                        <option id="ForcePXEBootOption" value="2">Forceer PXE Boot</option>
-                        <option id="ForceHDBootOption" value="3">Forceer harde schijf opstarten</option>
-                        <option id="ForceDiagBootOption" value="4">Forceer diagnostisch opstarten</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Opstartbron</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">Ingeschakeld<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Gehandicapt<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Gehandicapt</option>
+                        <option value="1">Ingeschakeld</option>
+                    </select>
+                    <div>Ingeschakeld</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protocol</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximaal 32 tekens"><div title="Maximaal 32 tekens">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Gebruikersnaam</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Wachtwoord</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Ingeschakeld</option>
+                        <option value="1">Gehandicapt</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="annuleren" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Bezig met laden..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Onbekend", 1: "Andere", 2: "Ingeschakeld", 3: "Gehandicapt", 4: "Afsluiten", 5: "Niet toepasbaar", 6: "Ingeschakeld maar offline", 7: "In Test", 8: "Uitgesteld", 9: "Rustig", 10: "Beginnend", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Onbekend";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "Ingeschakeld" : "Gehandicapt"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "Ingeschakeld":"Gehandicapt", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Reageer op ping", addLinkConditional(["Gehandicapt", "ICMP-reactie", "RMCP-reactie", "ICMP & RMCP-reactie"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Gehandicapt";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Ingeschakeld," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automatisch met DHCP-server" : "Statisch IP-adres";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("IPv4-status", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Geen certificaat, TLS uitgeschakeld" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Certificaat" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Gehandicapt", 32768: "Ingeschakeld in S0", 32769: "Ingeschakeld in S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Aan, verbonden", 3: "Uit", 6: "Aan, niet verbonden" };
-        var xxWifiAuthenticationMethod = { 1: "Andere", 2: "Open", 3: "Gedeelde sleutel", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Andere", 2: "Open", 3: "Gedeelde sleutel", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Andere", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Geen" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Verwijderen", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Profielnaam", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Verificatie", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("Versleuteling", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Prioriteit", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Verificatie", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Gebruikersnaam", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Draadloos profiel", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Geen") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Geen") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Voeg draadloos profiel toe", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Geen") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Geen") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Extern bureaublad", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Extern bureaublad", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Opstarten", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Reset", 10);
-                    addOption('d5actionSelect', "Power cyclus", 5);
-                    addOption('d5actionSelect', "Stroomstoring", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schakel diagnostisch in", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset naar diagnose", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "OS Wake from Standby", 500);
-                    addOption('d5actionSelect', "OS energiebesparing", 501);
-                    addOption('d5actionSelect', "Soft-off", 12);
-                    addOption('d5actionSelect', "Zachte reset", 14);
-                    addOption('d5actionSelect', "Slaap", 4);
-                    addOption('d5actionSelect', "Slaapstand", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schakel naar BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset naar BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Schakel in op Secure Erase", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset naar Secure Erase", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Reset naar IDE-R Floppy", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schakel de IDE-R-diskette in", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Reset naar IDE-R CDROM", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schakel in op IDE-R CDROM", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Reset naar PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Schakel PXE in", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Maatwerk actie ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Toestemming van de gebruiker ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Krachtige acties", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Krachtige actie", format("Kan systeemmogelijkheden niet krijgen, fout {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Opstarten", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Reset", 10);
+                addOption('d5actionSelect', "Power cyclus", 5);
+                addOption('d5actionSelect', "Stroomstoring", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schakel diagnostisch in", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset naar diagnose", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "OS Wake from Standby", 500);
+                addOption('d5actionSelect', "OS energiebesparing", 501);
+                addOption('d5actionSelect', "Soft-off", 12);
+                addOption('d5actionSelect', "Zachte reset", 14);
+                addOption('d5actionSelect', "Slaap", 4);
+                addOption('d5actionSelect', "Slaapstand", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schakel naar BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset naar BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Schakel in op Secure Erase", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset naar Secure Erase", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Reset naar IDE-R Floppy", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schakel de IDE-R-diskette in", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Reset naar IDE-R CDROM", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schakel in op IDE-R CDROM", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Reset naar PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Schakel PXE in", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Maatwerk actie ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Toestemming van de gebruiker ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Krachtige acties", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> WAARSCHUWING: </b> Hierdoor worden gegevens op het externe systeem gewist." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Krachtige acties", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Aangepaste krachtactie", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Krachtige actie", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Toestemming van de gebruiker", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Krachtige actie", format("Fout #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Krachtige actie", "Gebruikers toestemming sturen ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Geen wekkeralarmen geregistreerd." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Verwijder alle alarmen", 'RemoveAllAlarms()') + AddButton("Toevoegen", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Verwijder alle alarmen", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Toevoegen", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "Vernieuwen" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_pt.html b/index_pt.html
index e0b66a6..6146703 100644
--- a/index_pt.html
+++ b/index_pt.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="Enviar" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Mostrar Ctrl-Alt-Del</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Taxa de quadros de limite</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Não gire o mouse</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Outros ajustes</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>Prioridade</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Autenticação</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Nenhum</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>Criptografia</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Comprimento entre 8 e 63 caracteres"><div title="Comprimento entre 8 e 63 caracteres">Senha*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Comprimento entre 8 e 63 caracteres"><div title="Comprimento entre 8 e 63 caracteres">Confirme a Senha</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Comprimento entre 8 e 63 caracteres"><div title="Comprimento entre 8 e 63 caracteres">Senha*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Comprimento entre 8 e 63 caracteres"><div title="Comprimento entre 8 e 63 caracteres">Confirme a Senha</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>Protocolo</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Máximo de 32 caracteres"><div title="Máximo de 32 caracteres">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nome do usuário</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Senha</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">ativado</option>
+                            <option value="0">Desativado</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Configurações de inicialização</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Nenhum</option>
-                        <option id="ForceDVDBootOption" value="1">Forçar inicialização de CD / DVD</option>
-                        <option id="ForcePXEBootOption" value="2">Forçar inicialização PXE</option>
-                        <option id="ForceHDBootOption" value="3">Forçar inicialização do disco rígido</option>
-                        <option id="ForceDiagBootOption" value="4">Forçar inicialização de diagnóstico</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Fonte de Inicialização</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">ativado<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Desativado<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Desativado</option>
+                        <option value="1">ativado</option>
+                    </select>
+                    <div>ativado</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>Protocolo</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Máximo de 32 caracteres"><div title="Máximo de 32 caracteres">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Nome do usuário</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">Senha</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">ativado</option>
+                        <option value="1">Desativado</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Cancelar" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Carregando..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "Desconhecido", 1: "De outros", 2: "ativado", 3: "Desativado", 4: "Desligando", 5: "Não aplicável", 6: "Ativado, mas offline", 7: "Em teste", 8: "Diferido", 9: "Quiesce", 10: "Iniciando", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"Desconhecido";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "ativado" : "Desativado"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "ativado":"Desativado", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Responder ao ping", addLinkConditional(["Desativado", "Resposta ICMP", "Resposta RMCP", "Resposta ICMP e RMCP"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Desativado";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Ativado," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Automático usando servidor DHCP" : "Endereço IP estático";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("Estado IPv4", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Sem certificado, TLS desativado" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "Certificado" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Desativado", 32768: "Ativado em S0", 32769: "Habilitado em S0, Sx / AC" };
         var xxRadioState = 	{ 2: "Ligado, conectado", 3: "Fora", 6: "Ativado, Desconectado" };
-        var xxWifiAuthenticationMethod = { 1: "De outros", 2: "Aberto", 3: "Chave compartilhada", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "De outros", 2: "Aberto", 3: "Chave compartilhada", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "De outros", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Nenhum" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Retirar", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Nome do perfil", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Autenticação", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("Criptografia", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("Prioridade", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Autenticação", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("Nome do usuário", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Perfil sem fio", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Nenhum") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Nenhum") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Adicionar perfil sem fio", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Nenhum") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Nenhum") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Área de trabalho remota", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Área de trabalho remota", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Energizar", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Redefinir", 10);
-                    addOption('d5actionSelect', "Ciclo de energia", 5);
-                    addOption('d5actionSelect', "Desligar", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Ligar ao diagnóstico", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Redefinir para diagnóstico", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "Despertar do sistema operacional em modo de espera", 500);
-                    addOption('d5actionSelect', "Economia de energia do SO", 501);
-                    addOption('d5actionSelect', "Soft-off", 12);
-                    addOption('d5actionSelect', "Redefinição suave", 14);
-                    addOption('d5actionSelect', "Dormir", 4);
-                    addOption('d5actionSelect', "Hibernate", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Ligue o BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Redefinir para BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Ligue para apagar com segurança", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Redefinir para exclusão segura", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para disquete IDE-R", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Ligue o disquete IDE-R", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para CD-ROM IDE-R", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Ligue o CD-ROM IDE-R", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Ligue o PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Ação personalizada ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Consentimento do usuário ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Ações de poder", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Ação de poder", format("Não foi possível obter os recursos do sistema, erro {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Energizar", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Redefinir", 10);
+                addOption('d5actionSelect', "Ciclo de energia", 5);
+                addOption('d5actionSelect', "Desligar", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Ligar ao diagnóstico", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para diagnóstico", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "Despertar do sistema operacional em modo de espera", 500);
+                addOption('d5actionSelect', "Economia de energia do SO", 501);
+                addOption('d5actionSelect', "Soft-off", 12);
+                addOption('d5actionSelect', "Redefinição suave", 14);
+                addOption('d5actionSelect', "Dormir", 4);
+                addOption('d5actionSelect', "Hibernate", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Ligue o BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Ligue para apagar com segurança", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Redefinir para exclusão segura", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Redefinir para disquete IDE-R", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Ligue o disquete IDE-R", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Redefinir para CD-ROM IDE-R", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Ligue o CD-ROM IDE-R", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Redefinir para PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Ligue o PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Ação personalizada ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Consentimento do usuário ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Ações de poder", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> AVISO: </b> Isso limpará os dados no sistema remoto." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Ações de poder", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Ação de energia personalizada", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Ação de poder", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Consentimento do Usuário", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Ação de poder", format("Erro #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Ação de poder", "Enviando consentimento do usuário ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Nenhum alarme de ativação registrado." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Remova todos os alarmes", 'RemoveAllAlarms()') + AddButton("Adicionar", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Remova todos os alarmes", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Adicionar", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "Atualizar" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_ru.html b/index_ru.html
index b7f2694..0e776c5 100644
--- a/index_ru.html
+++ b/index_ru.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="послать" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">Показать Ctrl-Alt-Del</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">Ограничить частоту кадров</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">Не вращайте мышь</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>Другие настройки</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>приоритет</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>Аутентификация</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">CCMP-AES</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">Никто</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>шифрование</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Длина от 8 до 63 символов"><div title="Длина от 8 до 63 символов">Пароль*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Длина от 8 до 63 символов"><div title="Длина от 8 до 63 символов">Подтвердите Пароль</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Длина от 8 до 63 символов"><div title="Длина от 8 до 63 символов">Пароль*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="Длина от 8 до 63 символов"><div title="Длина от 8 до 63 символов">Подтвердите Пароль</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>протокол</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Максимум 32 символа"><div title="Максимум 32 символа">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">имя пользователя</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">пароль</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">Включено</option>
+                            <option value="0">Отключено</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>Настройки загрузки</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">Никто</option>
-                        <option id="ForceDVDBootOption" value="1">Force CD / DVD Boot</option>
-                        <option id="ForcePXEBootOption" value="2">Force PXE Boot</option>
-                        <option id="ForceHDBootOption" value="3">Принудительная загрузка жесткого диска</option>
-                        <option id="ForceDiagBootOption" value="4">Принудительный диагностический ботинок</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>Загрузочный источник</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">Включено<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">Отключено<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Отключено</option>
+                        <option value="1">Включено</option>
+                    </select>
+                    <div>Включено</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>протокол</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Максимум 32 символа"><div title="Максимум 32 символа">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">имя пользователя</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">пароль</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">Включено</option>
+                        <option value="1">Отключено</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="Отмена" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "Loading ..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "неизвестный", 1: "Другой", 2: "Включено", 3: "Отключено", 4: "Выключение", 5: "Непригодный", 6: "Включено, но в автономном режиме", 7: "В тесте", 8: "Отложенный", 9: "Замораживание", 10: "начало", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"неизвестный";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "Включено" : "Отключено"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "Включено":"Отключено", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("Ответить на пинг", addLinkConditional(["Отключено", "ICMP-ответ", "Ответ RMCP", "ICMP и RMCP ответ"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "Отключено";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "Включено," + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "Автоматически с использованием DHCP-сервера" : "Статический IP-адрес";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("Состояние IPv4", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "Нет сертификата, TLS отключен" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "сертификат" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "Отключено", 32768: "Включено в S0", 32769: "Включено в S0, Sx / AC" };
         var xxRadioState = 	{ 2: "На подключен", 3: "от", 6: "Отключен" };
-        var xxWifiAuthenticationMethod = { 1: "Другой", 2: "открыто", 3: "Общий ключ", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "Другой", 2: "открыто", 3: "Общий ключ", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "Другой", 2: "WEP", 3: "TKIP-RC4", 4: "CCMP-AES", 5: "Никто" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("Удалить", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("Имя профиля", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("Аутентификация", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("шифрование", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("приоритет", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("Аутентификация", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("имя пользователя", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("Беспроводной профиль", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Никто") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Никто") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "Добавить профиль беспроводной сети", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("Никто") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("Никто") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("Удаленный рабочий стол", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("Удаленный рабочий стол", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "Включите", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "Сброс", 10);
-                    addOption('d5actionSelect', "Силовой цикл", 5);
-                    addOption('d5actionSelect', "Выключить", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Включите диагностику", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Сброс к диагностике", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "OS Wake из режима ожидания", 500);
-                    addOption('d5actionSelect', "ОС энергосбережения", 501);
-                    addOption('d5actionSelect', "Soft-офф", 12);
-                    addOption('d5actionSelect', "Мягкий сброс", 14);
-                    addOption('d5actionSelect', "Спать", 4);
-                    addOption('d5actionSelect', "Hibernate", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Включите BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Сбросить в BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Включите безопасное стирание", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Сброс для безопасного стирания", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Сбросить на IDE-R дискету", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "Включите IDE-R Floppy", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "Сбросить на IDE-R CDROM", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "Включите IDR-R CDROM", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "Сброс к PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "Включите PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "Пользовательское действие ...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "Согласие пользователя ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "Силовые Действия", 3, powerActionDlgCheck);
-            } else {
-                messagebox("Действие силы", format("Невозможно получить системные возможности, ошибка {0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "Включите", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "Сброс", 10);
+                addOption('d5actionSelect', "Силовой цикл", 5);
+                addOption('d5actionSelect', "Выключить", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Включите диагностику", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "Сброс к диагностике", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "OS Wake из режима ожидания", 500);
+                addOption('d5actionSelect', "ОС энергосбережения", 501);
+                addOption('d5actionSelect', "Soft-офф", 12);
+                addOption('d5actionSelect', "Мягкий сброс", 14);
+                addOption('d5actionSelect', "Спать", 4);
+                addOption('d5actionSelect', "Hibernate", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Включите BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "Сбросить в BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "Включите безопасное стирание", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "Сброс для безопасного стирания", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Сбросить на IDE-R дискету", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "Включите IDE-R Floppy", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "Сбросить на IDE-R CDROM", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "Включите IDR-R CDROM", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "Сброс к PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "Включите PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "Пользовательское действие ...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "Согласие пользователя ...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "Силовые Действия", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b> ПРЕДУПРЕЖДЕНИЕ. </ b> Это приведет к удалению данных на удаленной системе." + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "Силовые Действия", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "Custom Power Action", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("Действие силы", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "Согласие пользователя", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("Действие силы", format("Ошибка #", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("Действие силы", "Отправка согласия пользователя ...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "Нет будильника зарегистрировано." + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("Удалить все тревоги", 'RemoveAllAlarms()') + AddButton("Добавить", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("Удалить все тревоги", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("Добавить", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "обновление" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/index_zh-chs.html b/index_zh-chs.html
index 53a48f8..1647773 100644
--- a/index_zh-chs.html
+++ b/index_zh-chs.html
@@ -874,6 +874,9 @@
                     <!-- ###BEGIN###{Wireless} -->
                     <span id="id_TableWifi2"></span>
                     <!-- ###END###{Wireless} -->
+                    <!-- ###BEGIN###{NetAuth} -->
+                    <span id="id_TableNetAuth"></span>
+                    <!-- ###END###{NetAuth} -->
                 </div>
                 <!-- ###END###{NetworkSettings} -->
                 <div id="p11" style="display:none">
@@ -1057,7 +1060,7 @@
                                 <div id="DeskFocus" style="color:transparent;border:3px dotted rgba(255,0,0,.2);position:absolute;border-radius:5px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)"></div>
                                 <!-- ###END###{DesktopFocus} -->
                                 <!-- ###BEGIN###{DesktopInband} -->
-                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onmousewheel="dmousewheel(event)" moz-opaque=""></canvas>
+                                <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" onwheel="dmousewheel(event)" moz-opaque=""></canvas>
                                 <!-- ###END###{DesktopInband} -->
                                 <!-- ###BEGIN###{!DesktopInband} -->
                                 <canvas id="Desk" width="640" height="400" style="-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown="dmousedown(event)" onmouseup="dmouseup(event)" onmousemove="dmousemove(event)" moz-opaque=""></canvas>
@@ -1114,6 +1117,7 @@
                                             <option value="15">F10</option>
                                             <option value="16">F11</option>
                                             <option value="17">F12</option>
+                                            <option value="25">Enter</option>
                                             <!-- <option value=18>LS+LA+PrtSc</option> -->
                                         </select>
                                         <input id="DeskWD" type="button" value="发送" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
@@ -1368,6 +1372,7 @@
                         <label><input type="checkbox" id="d7showcad">显示Ctrl-Alt-Del</label><br>
                         <label><input type="checkbox" id="d7limitFrameRate">极限帧率</label><br>
                         <label><input type="checkbox" id="d7noMouseRotate">不要旋转鼠标</label><br>
+                        <label><input type="checkbox" id="d7kvmrmw">Reverse Mouse Wheel</label><br>
                     </div>
                     <div>其他设定</div>
                 </div>
@@ -1439,28 +1444,67 @@
                     <div>优先</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()">
-                        <option id="idx_d12auth_wpa3" value="32768">WPA3 SAE</option>
-                        <!--<option value="7">WPA2 IEEE 802.1x</option>-->
-                        <option value="6">WPA2 PSK</option>
-                        <!--<option value="5">WPA IEEE 802.1x</option>-->
-                        <option value="4">WPA PSK</option>
-                        <!--<option value="3">Shared Key</option>-->
-                        <!--<option value="2">Open</option>-->
-                    </select>
+                    <select id="idx_d12auth" style="float:right;width:200px" onclick="updateWifiDialog()"></select>
                     <div>认证方式</div>
                 </div>
                 <div style="height:26px">
                     <select id="idx_d12enc" style="float:right;width:200px" onclick="updateWifiDialog()">
                         <option id="id_d12e4" value="4">认证协议</option>
                         <option id="id_d12e3" value="3">TKIP-RC4</option>
-                        <option id="id_d12e2" value="2">WEP</option>
-                        <option id="id_d12e5" value="5">没有</option>
+                        <!--<option id="id_d12e2" value="2">WEP</option>-->
+                        <!--<option id="id_d12e5" value="5">None</option>-->
                     </select>
                     <div>加密</div>
                 </div>
-                <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="长度介于8到63个字符之间"><div title="长度介于8到63个字符之间">密码*</div></div>
-                <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="长度介于8到63个字符之间"><div title="长度介于8到63个字符之间">确认密码</div></div>
+                <div id="idx_d12pass">
+                    <div style="height:26px"><input id="idx_d12password1" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="长度介于8到63个字符之间"><div title="长度介于8到63个字符之间">密码*</div></div>
+                    <div style="height:26px"><input id="idx_d12password2" type="password" style="float:right;width:200px" maxlength="63" onkeyup="updateWifiDialog()" title="长度介于8到63个字符之间"><div title="长度介于8到63个字符之间">确认密码</div></div>
+                </div>
+                <!-- ###BEGIN###{NetAuth} -->
+                <div id="idx_d12netauth" style="display:none">
+                    <div id="idx_d12protocoldiv" style="height:26px">
+                        <select id="idx_d12protocol" style="float:right;width:200px" onchange="updateNetAuth2Dialog(event)">
+                            <option value="0" selected="selected">EAP-TLS</option>
+                            <option value="1">EAP-TTLS/MSCHAPv2</option>
+                            <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                            <option value="3">PEAPv1/EAP-GTC</option>
+                            <option value="4">EAP-FAST/MSCHAPv2</option>
+                            <option value="5">EAP-FAST/GTC</option>
+                            <option value="6">EAP-FAST/TLS</option>
+                        </select>
+                        <div>协议</div>
+                    </div>
+                    <div id="idx_d12servernamediv" style="height:26px"><input id="idx_d12servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="最多32个字符"><div title="最多32个字符">Server Name</div></div>
+                    <div id="idx_d12servernamecomparediv" style="height:26px">
+                        <select id="idx_d12servernamecompare" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="0" selected="selected">Full Name</option>
+                            <option value="1">Domain Suffix</option>
+                        </select>
+                        <div>Server Name Compare</div>
+                    </div>
+                    <div id="idx_d12domaindiv" style="height:26px"><input id="idx_d12domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                    <div id="idx_d12usernamediv" style="height:26px"><input id="idx_d12username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuth2Dialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">用户名</div></div>
+                    <div id="idx_d12passworddiv" style="height:26px"><input id="idx_d12password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">密码</div></div>
+                    <div id="idx_d12roamingidentitydiv" style="height:26px"><input id="idx_d12roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuth2Dialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                    <div id="idx_d12pacdiv" style="height:26px"><input id="idx_d12pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                    <div id="idx_d12pacpassworddiv" style="height:26px"><input id="idx_d12pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuth2Dialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                    <div id="idx_d12clientcertdiv" style="height:26px">
+                        <select id="idx_d12clientcert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Client Certificate</div>
+                    </div>
+                    <div id="idx_d12servercertdiv" style="height:26px">
+                        <select id="idx_d12servercert" style="float:right;width:200px" onclick="updateNetAuth2Dialog()"></select>
+                        <div>Server Issuer Cert</div>
+                    </div>
+                    <div id="idx_d12activeins0div" style="height:26px">
+                        <select id="idx_d12activeins0" style="float:right;width:200px" onclick="updateNetAuth2Dialog()">
+                            <option value="1">已启用</option>
+                            <option value="0">残障人士</option>
+                        </select>
+                        <div>Active in S0</div>
+                    </div>
+                </div>
+                <!-- ###END###{NetAuth} -->
             </div>
             <!-- ###END###{Wireless} -->
             <!-- ###BEGIN###{USBSetup} -->
@@ -1605,18 +1649,7 @@
                     <div>开机设定</div>
                 </div>
                 <div style="height:26px">
-                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
-                        <option value="0">没有</option>
-                        <option id="ForceDVDBootOption" value="1">强制启动CD / DVD</option>
-                        <option id="ForcePXEBootOption" value="2">强制PXE引导</option>
-                        <option id="ForceHDBootOption" value="3">强制硬盘启动</option>
-                        <option id="ForceDiagBootOption" value="4">强制诊断启动</option>
-                        <!-- ###BEGIN###{PowerControl-OneClick} -->
-                        <option id="ForceUEFIBootOption" value="5">Force OCR UEFI Boot Option</option>
-                        <option id="ForceHttpBootOption" value="6">Force OCR UEFI HTTPS Boot (.iso)</option>
-                        <option id="ForceHttpUrlBootOption" value="7">Force OCR UEFI HTTPS Boot (url)</option>
-                        <!-- ###END###{PowerControl-OneClick} -->
-                    </select>
+                    <select id="idx_d24ForceBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()"></select>
                     <div>引导源</div>
                 </div>
                 <div id="idx_d24bootSource" style="height:26px">
@@ -1642,6 +1675,10 @@
                     <input id="idx_d24ocrBootUrl" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" placeholder="https://" style="float:right;width:200px">
                     <div>Boot URL</div>
                 </div>
+                <div id="idx_d24diskImageHttpTimeout" style="height:26px">
+                    <input id="idx_d24ocrBootHttpBootTimeout" type="text" onchange="showAdvPowerDlgChange()" onkeyup="showAdvPowerDlgChange()" value="0" style="float:right;width:200px">
+                    <div>Timeout (Seconds)</div>
+                </div>
                 <!-- ###END###{PowerControl-OneClick} -->
                 <div style="height:26px" id="idd_d24IDERBootDevice">
                     <select id="idx_d24IDERBootDevice" style="float:right;width:200px" onchange="showAdvPowerDlgChange()">
@@ -1713,6 +1750,60 @@
                 <label><input type="radio" name="d26a" id="idx_d26ocr1" value="1">已启用<br></label>
                 <label><input type="radio" name="d26a" id="idx_d26ocr0" value="0">残障人士<br></label>
             </div>
+            <!-- ###BEGIN###{NetAuth} -->
+            <div id="dialog27" style="margin:auto;margin:3px">
+                <br>
+                <div style="height:26px">
+                    <select id="idx_d27enabled" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">残障人士</option>
+                        <option value="1">已启用</option>
+                    </select>
+                    <div>已启用</div>
+                </div>
+                <div id="idx_d27protocoldiv" style="height:26px">
+                    <select id="idx_d27protocol" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">EAP-TLS</option>
+                        <option value="1">EAP-TTLS/MSCHAPv2</option>
+                        <option value="2">PEAPv0/EAP-MSCHAPv2</option>
+                        <option value="3">PEAPv1/EAP-GTC</option>
+                        <option value="4">EAP-FAST/MSCHAPv2</option>
+                        <option value="5">EAP-FAST/GTC</option>
+                        <option value="6">EAP-FAST/TLS</option>
+                    </select>
+                    <div>协议</div>
+                </div>
+                <div id="idx_d27servernamediv" style="height:26px"><input id="idx_d27servername" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="最多32个字符"><div title="最多32个字符">Server Name</div></div>
+                <div id="idx_d27servernamecomparediv" style="height:26px">
+                    <select id="idx_d27servernamecompare" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0" selected="selected">Full Name</option>
+                        <option value="1">Domain Suffix</option>
+                    </select>
+                    <div>Server Name Compare</div>
+                </div>
+                <div id="idx_d27domaindiv" style="height:26px"><input id="idx_d27domain" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">Domain</div></div>
+                <div id="idx_d27usernamediv" style="height:26px"><input id="idx_d27username" style="float:right;width:200px" maxlength="128" onkeyup="updateNetAuthDialog()" title="Maximum 128 characters"><div title="Maximum 128 characters">用户名</div></div>
+                <div id="idx_d27passworddiv" style="height:26px"><input id="idx_d27password" type="password" style="float:right;width:200px" maxlength="32" onkeyup="updateNetAuthDialog()" title="Maximum length is 32 characters"><div title="Maximum length is 32 characters">密码</div></div>
+                <div id="idx_d27roamingidentitydiv" style="height:26px"><input id="idx_d27roamingidentity" style="float:right;width:200px" maxlength="80" onkeyup="updateNetAuthDialog()" title="Maximum 80 characters"><div title="Maximum 80 characters">Roaming Identity</div></div>
+                <div id="idx_d27pacdiv" style="height:26px"><input id="idx_d27pac" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum 256 characters"><div title="Maximum 256 characters">Protected Access Credentials</div></div>
+                <div id="idx_d27pacpassworddiv" style="height:26px"><input id="idx_d27pacpassword" type="password" style="float:right;width:200px" maxlength="256" onkeyup="updateNetAuthDialog()" title="Maximum length is 256 characters"><div title="Maximum length is 256 characters">PAC Password</div></div>
+                <div id="idx_d27clientcertdiv" style="height:26px">
+                    <select id="idx_d27clientcert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Client Certificate</div>
+                </div>
+                <div id="idx_d27servercertdiv" style="height:26px">
+                    <select id="idx_d27servercert" style="float:right;width:200px" onclick="updateNetAuthDialog()"></select>
+                    <div>Server Issuer Cert</div>
+                </div>
+                <div id="idx_d27activeins0div" style="height:26px">
+                    <select id="idx_d27activeins0" style="float:right;width:200px" onclick="updateNetAuthDialog()">
+                        <option value="0">已启用</option>
+                        <option value="1">残障人士</option>
+                    </select>
+                    <div>Active in S0</div>
+                </div>
+                <div id="idx_d27pxetimeoutdiv" style="height:26px"><input id="idx_d27pxetimeout" style="float:right;width:200px" onkeyup="updateNetAuthDialog()"><div>PXE Timeout</div></div>
+            </div>
+            <!-- ###END###{NetAuth} -->
         </div>
         <div style="padding:10px;margin-bottom:4px">
             <input id="idx_dlgCancelButton" type="button" value="取消" style="float:right;width:80px;margin-left:5px" onclick="dialogclose(0)">
@@ -1729,7 +1820,7 @@
     <!-- ###END###{PowerControl} -->
         <script type="text/javascript">
         // ###BEGIN###{!Look-BrandedCommander}
-        var version = '0.9.3';
+        var version = '0.9.6';
         // ###END###{!Look-BrandedCommander}
         // ###BEGIN###{Look-BrandedCommander}
         var version = '1.2.0';
@@ -1748,7 +1839,7 @@
         var LoadingHtml = '<div style=text-align:center;padding-top:20px>' + "载入中..." + '<div>';
         var amtversion = 0;
         var amtversionmin = 0;
-        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog
+        var amtFirstPull = 0; // Bitmask, Set this when the first pull request is made on a device: 1 = HardwareInfo, 2 = WirelessInfo, 4 = SystemDefense, 8 = Storage, 16 = EventLog, 32 = AuditLog, 64 = ExtraInfo, 128 = 802.1x
 // ###BEGIN###{NetworkSettings}
         var amtwirelessif = -1; // Set to the interface index for the wireless interface, -1 if no wireless.
 // ###END###{NetworkSettings}
@@ -1915,6 +2006,8 @@
             QE('idx_connectbutton1', true);
             try { t = localStorage.getItem('desktopsettings'); } catch (ex) {}
             if (t) { desktopsettings = JSON.parse(t); }
+            if (urlvars.kvmenc) { var v = parseInt(urlvars.kvmenc); if (typeof v == 'number') { desktopsettings.encflags = v; } }
+            if (urlvars.kvmdec) { var v = parseInt(urlvars.kvmdec); if (typeof v == 'number') { desktopsettings.decimationMode = v; } }
             applyDesktopSettings();
             var s = '';
             //for (var c = 1; c < 13; c++) s += '<option value="' + (0xffbd + c) + '">F' + c +;
@@ -5282,10 +5375,13 @@
             amtstack.BatchEnum('', ['*AMT_GeneralSettings'], processSystemStatus);
             // ###END###{Look-Intel-SBT}
             // ###BEGIN###{!Look-Intel-SBT}
-            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData'];
+            var query = ['CIM_ServiceAvailableToElement', '*AMT_GeneralSettings', 'AMT_EthernetPortSettings', '*AMT_RedirectionService', 'CIM_ElementSettingData', '*AMT_BootCapabilities'];
             if (amtversion > 5) query.push('IPS_IPv6PortSettings', '*CIM_KVMRedirectionSAP', '*IPS_OptInService','*IPS_KVMRedirectionSettingData');
             if (amtversion > 9) query.push('*IPS_ScreenConfigurationService', '*IPS_PowerManagementService');
-            if ((amtversion > 15) && (amtstack.wsman.comm.xtls == 1)) query.push('*CIM_BootService');
+            if (amtversion > 15) query.push('*CIM_BootService');
+            // ###BEGIN###{NetAuth}
+            if (amtversion > 2) query.push('*AMT_8021XProfile');
+            // ###END###{NetAuth}
             amtstack.BatchEnum('', query, processSystemStatus, true);
             // ###END###{!Look-Intel-SBT}
             // ###BEGIN###{Wireless}
@@ -5531,7 +5627,7 @@
             }
 
             // Power Options
-            if ((amtstack.wsman.comm.xtls == 1) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
+            if ((amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] != null) && (amtsysstate['AMT_BootCapabilities'].response['PlatformErase'] > 0) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] != null)) {
                 var enabledBootStateStr = { 0: "未知", 1: "其他", 2: "已启用", 3: "残障人士", 4: "关机", 5: "不适用", 6: "已启用但离线", 7: "测试中", 8: "递延", 9: "停顿", 10: "开始", 32768: "OCR Disabled", 32769: "OCR Enabled", 32770: "OCR Disabled, RPE Enabled", 32771: "RPE & OCR Enabled" };
                 if (amtversion > 15) { enabledBootStateStr[32768] = "OCR & RPE Disabled"; enabledBootStateStr[32769] = "OCR Enabled, RPE Disabled"; }
                 var t = enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]?enabledBootStateStr[amtsysstate['CIM_BootService'].response['EnabledState']]:"未知";
@@ -5668,7 +5764,7 @@
                         x += TableEntry("Local WIFI Profile Sync", addLinkConditional(((xxWireless['AMT_WiFiPortConfigurationService'].response['localProfileSynchronizationEnabled'] == 1) ? "已启用" : "残障人士"), 'showWifiSyncDlg(' + y + ')', xxAccountAdminName));
                     }
                     // CSME UEFI Wifi profile sharing, check if it is enabled in boot setting and it is not null at AMT_WiFiPortConfigrationService
-                    if (xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']!=null && xxWireless['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare']==true 
+                    if (amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] != null && amtsysstate['AMT_BootCapabilities'].response['UEFIWiFiCoExistenceAndProfileShare'] == true
                         && xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']!=null) {
                             x += TableEntry("UEFI WiFi CoEx Profile sharing", addLinkConditional(xxWireless['AMT_WiFiPortConfigurationService'].response['UEFIWiFiProfileShareEnabled']==1? "已启用":"残障人士", 'showUefiWifiCoExDlg()', xxAccountAdminName));
                      } else {
@@ -5680,6 +5776,12 @@
                 if (amtwirelessif != y) {
                     // Things that are specific to the wired interface
                     x += TableEntry("回应ping", addLinkConditional(["残障人士", "ICMP回应", "RMCP响应", "ICMP和RMCP响应"][gs['PingResponseEnabled'] + (gs['RmcpPingResponseEnabled'] << 1)], 'showPingActionDlg()', xxAccountAdminName));
+                    // ###BEGIN###{NetAuth}
+                    // 802.1x
+                    var netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-FAST/TLS'], netAuthStr = "残障人士";
+                    if (amtsysstate['AMT_8021XProfile'].responses.Body['Enabled']) { netAuthStr = "已启用" + netAuthProtocols[amtsysstate['AMT_8021XProfile'].responses.Body['AuthenticationProtocol']]; }
+                    x += TableEntry("802.1x", addLinkConditional(netAuthStr, 'editNetAuthProfile()', xxAccountAdminName));
+                    // ###END###{NetAuth}
                     var ipStateString = z['DHCPEnabled'] == true ? "自动使用DHCP服务器" : "静态IP地址";
                     if (z['IpSyncEnabled'] == true) { ipStateString += ', IP sync with OS'; }
                     x += TableEntry("IPv4状态", addLinkConditional(ipStateString, 'showIPSetupDlg()', xxAccountAdminName));
@@ -6728,7 +6830,7 @@
             if (xxdialogMode) return;
             var x = '';
             x += '<div style=height:26px;margin-top:4px><select onchange=showSetTlsSecurityDlgUpdate() id=tlscert style=float:right;width:260px><option value=-1>' + "无证书，禁用TLS" + '</option>';
-            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey && (xxTlsCurrentCert == null || xxTlsCurrentCert == i)) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
+            for (var i in xxCertificates) { if (xxCertificates[i].TrustedRootCertficate == false && xxCertificates[i].XPrivateKey) { x += '<option value=' + i + '>' + xxCertificates[i].XSubject['CN'] + '</option>'; } }
             x += '</select><div style=padding-top:4px>' + "证书" + '</div></div>';
 
             x += '<div style=height:26px;margin-top:4px><select id=tlsremote style=float:right;width:260px onchange=showSetTlsSecurityDlgUpdate()><option value=0>Server-auth TLS only</option><option value=1>Server-auth, non-TLS allowed</option>';
@@ -7529,15 +7631,20 @@
         var xxWireless;
         function PullWireless() {
             amtFirstPull |= 2;
-            try { if (amtwirelessif == -1) return; } catch (e) {} // If the wireless adapter has no MAC, don't show this.
-            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', '*AMT_BootCapabilities'], processWireless);
+            try { if (amtwirelessif == -1) return; } catch (e) { } // If the wireless adapter has no MAC, don't show this.
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService'], processWireless);
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['*CIM_WiFiPortCapabilities', '*CIM_WiFiPort', '*CIM_WiFiEndpoint', 'CIM_WiFiEndpointSettings', '*AMT_WiFiPortConfigurationService', 'CIM_IEEE8021xSettings'], processWireless);
+            // ###END###{NetAuth}
         }
 
         function wifiRefresh() { if (!xxdialogMode) PullWireless(); }
 
         var xxWifiState = { 3: "残障人士", 32768: "在S0中启用", 32769: "在S0，Sx / AC中启用" };
         var xxRadioState = 	{ 2: "开启，已连接", 3: "关", 6: "开启，已断开" };
-        var xxWifiAuthenticationMethod = { 1: "其他", 2: "打开", 3: "共用金钥", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE" };
+        var xxWifiAuthenticationMethod = { 1: "其他", 2: "打开", 3: "共用金钥", 4: "WPA PSK", 5: "WPA IEEE 802.1x", 6: "WPA2 PSK", 7: "WPA2 IEEE 802.1x", 32768: "WPA3 SAE IEEE 802.1x", 32769: "WPA3 OWE IEEE 802.1x" };
         var xxWifiEncryptionMethod = { 1: "其他", 2: "WEP", 3: "TKIP-RC4", 4: "认证协议", 5: "没有" }; // For 2 & 5, AuthenticationMethod must be 2 or 3. For 3 & 4 AuthenticationMethod must be 4,5,6 or 7
 
         function processWireless(stack, name, responses, status) {
@@ -7560,7 +7667,17 @@
                     sc = xxWireless['CIM_WiFiEndpointSettings'].responses[j];
                     if (sc['AuthenticationMethod'] == 1) continue; // Skip "Endpoint User Settings"
                     if (sc['Priority'] == i) {
-                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + ' &nbsp; ';
+                        var details = '';
+                        // ###BEGIN###{NetAuth}
+                        var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+                        if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                            for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                                if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                            }
+                        }
+                        if (netAuthProfile) { details = ', ' + netAuthProtocols[netAuthProfile['AuthenticationProtocol']]; }
+                        // ###END###{NetAuth}
+                        x += '<div class=itemBar onclick=showWifiDetails(' + j + ')><div style=float:right>' + EscapeHtml(sc['SSID']) + ', ' + xxWifiAuthenticationMethod[sc['AuthenticationMethod']] + ', ' + xxWifiEncryptionMethod[sc['EncryptionMethod']] + details + ' &nbsp; ';
                         if (xxAccountAdminName) x += AddButton2("去掉", 'wifiRemoveButton(\"' + j + '\")');
                         x += '</div><div style=padding-top:3px><b>' + EscapeHtml(sc['ElementName']) + '</b></div></div>';
                         s++;
@@ -7616,10 +7733,24 @@
             if (xxdialogMode) return;
             var i, sc = xxWireless['CIM_WiFiEndpointSettings'].responses[h], x = '<div style=text-align:left>';
             x += addHtmlValue("个人资料名称", EscapeHtml(sc['ElementName']));
-            x += addHtmlValue("SSID", sc['SSID']);
+            x += addHtmlValue("SSID", EscapeHtml(sc['SSID']));
             x += addHtmlValue("认证方式", xxWifiAuthenticationMethod[sc['AuthenticationMethod']]);
             x += addHtmlValue("加密", xxWifiEncryptionMethod[sc['EncryptionMethod']]);
             x += addHtmlValue("优先", sc['Priority']);
+            // ###BEGIN###{NetAuth}
+            var netAuthProfile = null, netAuthProtocols = ['EAP-TLS', 'EAP-TTLS/MSCHAPv2', 'PEAPv0/EAP-MSCHAPv2', 'PEAPv1/EAP-GTC', 'EAP-FAST/MSCHAPv2', 'EAP-FAST/GTC', 'EAP-MD5', 'EAP-PSK', 'EAP-SIM', 'EAP-AKA', 'EAP-FAST/TLS'];
+            if (xxWireless['CIM_IEEE8021xSettings'].responses) {
+                for (var k in xxWireless['CIM_IEEE8021xSettings'].responses) {
+                    if (xxWireless['CIM_IEEE8021xSettings'].responses[k]['ElementName'] == sc['ElementName']) { netAuthProfile = xxWireless['CIM_IEEE8021xSettings'].responses[k]; }
+                }
+            }
+            if (netAuthProfile) {
+                x += '<div style="width:100%;border-bottom:1px solid #000;margin-bottom:5px;margin-top:5px">802.11x</div>'
+                x += addHtmlValue("认证方式", netAuthProtocols[netAuthProfile['AuthenticationProtocol']]);
+                if (netAuthProfile['Domain']) { x += addHtmlValue("Domain", EscapeHtml(netAuthProfile['Domain'])); }
+                if (netAuthProfile['Username']) { x += addHtmlValue("用户名", EscapeHtml(netAuthProfile['Username'])); }
+            }
+            // ###END###{NetAuth}
             x += '</div>';
             messagebox("无线配置文件", x);
         }
@@ -7638,7 +7769,23 @@
 
         function removeWifiEntryResponse(stack, name, response, status, tag) {
             if (methodcheck(response)) return;
-            amtstack.Enum('CIM_WiFiEndpointSettings', function(stack, name, responses, status) { if (status == 200) { xxWireless['CIM_WiFiEndpointSettings'].responses = responses; showWirelessInfo(); } } );
+            // ###BEGIN###{!NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{!NetAuth}
+            // ###BEGIN###{NetAuth}
+            amtstack.BatchEnum('', ['CIM_WiFiEndpointSettings', 'CIM_IEEE8021xSettings'], function (stack, name, responses, status) {
+                if (status == 200) {
+                    xxWireless['CIM_WiFiEndpointSettings'].responses = responses['CIM_WiFiEndpointSettings'].responses;
+                    xxWireless['CIM_IEEE8021xSettings'].responses = responses['CIM_IEEE8021xSettings'].responses;
+                    showWirelessInfo();
+                }
+            });
+            // ###END###{NetAuth}
         }
 
         function showWifiNewProfile() {
@@ -7650,11 +7797,34 @@
                 if (t) { x += '<option value='+ i +'>'+ i; } // Option is a tag that is self closing.
             }
             QH('idx_d12pri', x);
-            QV('idx_d12auth_wpa3', amtversion > 13);
+
+            // ###BEGIN###{NetAuth}
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("没有") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("没有") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d12clientcert', clientcertoptions);
+            QH('idx_d12servercert', servercertoptions);
+            // ###END###{NetAuth}
+
+            var authOptions = '';
+            // ###BEGIN###{NetAuth}
+            authOptions += '<option value=32769>' + "WPA3 OWE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=32768>' + "WPA3 SAE IEEE 802.1x" + '</option>';
+            authOptions += '<option value=7>' + "WPA2 IEEE 802.1x" + '</option>';
+            authOptions += '<option value=5>' + "WPA IEEE 802.1x" + '</option>';
+            // ###END###{NetAuth}
+            authOptions += '<option value=6>' + "WPA2 PSK" + '</option>';
+            authOptions += '<option value=4>' + "WPA PSK" + '</option>';
+            QH('idx_d12auth', authOptions);
 
             idx_d12auth.value = 6;
             idx_d12enc.value = 4;
-
             idx_d12name.value = idx_d12ssid.value = idx_d12password1.value = idx_d12password2.value = '';
 
             setDialogMode(12, "添加无线配置文件", 3, function () { addWifiProfile() });
@@ -7662,23 +7832,51 @@
         }
 
         function addWifiProfile() {
+            var sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert;
+            var v = {
+                '__parameterType': 'instance',
+                '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
+                'ElementName': idx_d12name.value,
+                'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
+                'AuthenticationMethod': idx_d12auth.value,
+                'EncryptionMethod': idx_d12enc.value,
+                'SSID': idx_d12ssid.value,
+                'Priority': idx_d12pri.value
+            };
+            if ((idx_d12auth.value == 4) || (idx_d12auth.value == 6)) { v['PSKPassPhrase'] = idx_d12password1.value; }
+            // ###BEGIN###{NetAuth}
+            if ((idx_d12auth.value == 5) || (idx_d12auth.value == 7) || (idx_d12auth.value == 32768) || (idx_d12auth.value == 32769)) {
+                sc = {
+                    '__parameterType': 'instance',
+                    '__namespace': amtstack.CompleteName('CIM_IEEE8021xSettings'),
+                    'ElementName': '8021x-' + idx_d12name.value,
+                    'InstanceID': '8021x-' + idx_d12name.value,
+                    'ActiveInS0': (Q('idx_d12activeins0').value == 1),
+                    'AuthenticationProtocol': Q('idx_d12protocol').value
+                };
+                if (Q('idx_d12roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d12roamingidentity').value; }
+                if (Q('idx_d12servername').value != '') { sc['ServerCertificateName'] = Q('idx_d12servername').value; sc['ServerCertificateNameComparison'] = Q('idx_d12servernamecompare').value; }
+                if (Q('idx_d12username').value != '') { sc['Username'] = Q('idx_d12username').value; }
+                if (Q('idx_d12password').value != '') { sc['Password'] = Q('idx_d12password').value; }
+                if (Q('idx_d12domain').value != '') { sc['Domain'] = Q('idx_d12domain').value; }
+                if (Q('idx_d12protocol').value > 3) { sc['ProtectedAccessCredential'] = Q('idx_d12pac').value; sc['PACPassword'] = Q('idx_d12pacpassword').value; }
+                if (parseInt(Q('idx_d12clientcert').value) >= 0) { netAuthSettingsClientCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12clientcert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+                if (parseInt(Q('idx_d12servercert').value) >= 0) { netAuthSettingsServerCaCert = '<Address xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing">http://schemas.xmlsoap.org/ws/2004/08/addressing</Address><ReferenceParameters xmlns="http://schemas.xmlsoap.org/ws/2004/08/addressing"><ResourceURI xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd">http://intel.com/wbem/wscim/1/amt-schema/1/AMT_PublicKeyCertificate</ResourceURI><SelectorSet xmlns="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd"><Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d12servercert').value)]['InstanceID'] + '</Selector></SelectorSet></ReferenceParameters>'; }
+            }
+            // ###END###{NetAuth}
+
+            console.log('wifiepsettinginput', JSON.sstringify(v, null, 2));
+            console.log('netAuthProfile', JSON.sstringify(sc, null, 2));
+            console.log('netAuthSettingsClientCert', netAuthSettingsClientCert);
+            console.log('netAuthSettingsServerCaCert', netAuthSettingsServerCaCert);
+
             amtstack.AMT_WiFiPortConfigurationService_AddWiFiSettings(
 				{
 				    '__parameterType': 'reference',
 				    '__resourceUri': amtstack.CompleteName('CIM_WiFiEndpoint'),
 				    'Name': 'WiFi Endpoint 0'
-				}, {
-				    '__parameterType': 'instance',
-				    '__namespace': amtstack.CompleteName('CIM_WiFiEndpointSettings'),
-				    'ElementName': idx_d12name.value,
-				    'InstanceID': 'Intel(r) AMT:WiFi Endpoint Settings ' + idx_d12name.value,
-				    'AuthenticationMethod': idx_d12auth.value,
-				    'EncryptionMethod': idx_d12enc.value,
-				    'SSID': idx_d12ssid.value,
-				    'Priority': idx_d12pri.value,
-				    'PSKPassPhrase': idx_d12password1.value
-				},
-				null, null, null, removeWifiEntryResponse
+				}, v,
+				sc, netAuthSettingsClientCert, netAuthSettingsServerCaCert, removeWifiEntryResponse
 			);
         }
 
@@ -7686,21 +7884,146 @@
             var r = true;
             var a = idx_d12auth.value;
             var e = idx_d12enc.value;
-            QV('id_d12e2', a < 4);
-            QV('id_d12e3', a > 3);
-            QV('id_d12e4', a > 3);
-            QV('id_d12e5', a < 4);
+            //QV('id_d12e2', a < 4);
+            //QV('id_d12e3', a > 3);
+            //QV('id_d12e4', a > 3);
+            //QV('id_d12e5', a < 4);
             if (a < 4 && (e == 3 || e == 4)) { idx_d12enc.value = 2; }
             if (a > 3 && (e == 2 || e == 5)) { idx_d12enc.value = 3; }
-            if (a == 32768) { idx_d12enc.value = 4; }
+            if ((a == 32768) || (a == 32769)) { idx_d12enc.value = 4; }
+            QV('idx_d12pass', (a == 4) || (a == 6));
+            QV('idx_d12netauth', (a == 5) || (a == 7) || (a == 32768) || (a == 32769));
 
             // Check if there is already a profile with this name
             for (var j in xxWireless['CIM_WiFiEndpointSettings'].responses) { if (xxWireless['CIM_WiFiEndpointSettings'].responses[j]['ElementName'] == idx_d12name.value) { r = false; } }
+            if ((idx_d12name.value.length == 0) && (idx_d12ssid.value.length == 0)) { r = false; }
+            if (((a == 4) || (a == 6)) && ((idx_d12password1.value.length < 8) || (idx_d12password1.value.length > 63) || (idx_d12password1.value != idx_d12password2.value))) { r = false; }
 
-            QE('idx_dlgOkButton', r == true && (idx_d12name.value.length > 0) && (idx_d12ssid.value.length > 0) && (idx_d12password1.value.length > 7) && (idx_d12password1.value == idx_d12password2.value));
+            QE('idx_dlgOkButton', r);
+
+            // ###BEGIN###{NetAuth}
+            updateNetAuthDialog();
+            // ###END###{NetAuth}
         }
 
+        // ###BEGIN###{NetAuth}
+        function updateNetAuth2Dialog() {
+            QV('idx_d12servernamecomparediv', (Q('idx_d12servernamediv').value != ''));
+            QV('idx_d12pacdiv', (Q('idx_d12protocol').value > 3));
+            QV('idx_d12pacpassworddiv', (Q('idx_d12protocol').value > 3));
+        }
+        // ###END###{NetAuth}
+
 // ###END###{Wireless}
+// ###BEGIN###{NetAuth}
+
+        //
+        // 802.1x SETTINGS
+        //
+
+        function editNetAuthProfile() {
+            if (xxdialogMode) return;
+
+            // Set certificates
+            var clientcertoptions = '<option value=-1>' + EscapeHtml("没有") + '</option>', servercertoptions = '<option value=-1>' + EscapeHtml("没有") + '</option>';
+            for (var i in xxCertificates) {
+                if (xxCertificates[i].TrustedRootCertficate) {
+                    servercertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                } else if (xxCertificates[i].XPrivateKey) {
+                    clientcertoptions += '<option value="' + i + '">' + EscapeHtml(xxCertificates[i].XSubject['CN']) + '</option>';
+                }
+            }
+            QH('idx_d27clientcert', clientcertoptions);
+            QH('idx_d27servercert', servercertoptions);
+
+            // Set profile
+            var sc = amtsysstate['AMT_8021XProfile'].responses.Body;
+            Q('idx_d27enabled').value = sc['Enabled'] ? 1 : 0;
+            Q('idx_d27activeins0').value = (sc['ActiveInS0'] ? 1 : 0);
+            Q('idx_d27pxetimeout').value = sc['PxeTimeout'];
+            if (sc['Enabled']) {
+                Q('idx_d27protocol').value = sc['AuthenticationProtocol'];
+                Q('idx_d27roamingidentity').value = sc['RoamingIdentity'] ? sc['RoamingIdentity'] : '';
+                Q('idx_d27servername').value = sc['ServerCertificateName'] ? sc['ServerCertificateName'] : '';
+                Q('idx_d27servernamecompare').value = sc['ServerCertificateNameComparison'] ? sc['ServerCertificateNameComparison'] : 0;
+                Q('idx_d27username').value = sc['Username'] ? sc['Username'] : '';
+                Q('idx_d27password').value = sc['Password'] ? sc['Password'] : '';
+                Q('idx_d27domain').value = sc['Domain'] ? sc['Domain'] : '';
+                Q('idx_d27pac').value = sc['ProtectedAccessCredential'] ? sc['ProtectedAccessCredential'] : '';
+                Q('idx_d27pacpassword').value = sc['PACPassword'] ? sc['PACPassword'] : '';
+                var scInstanceId = -1, ccInstanceId = -1;
+                if (sc['ServerCertificateIssuer']) { scInstanceId = sc['ServerCertificateIssuer']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                if (sc['ClientCertificate']) { ccInstanceId = sc['ClientCertificate']['ReferenceParameters']['SelectorSet']['Selector']['Value']; }
+                for (var i in xxCertificates) {
+                    if (xxCertificates[i]['InstanceID'] == scInstanceId) { Q('idx_d27servercert').value = i; }
+                    if (xxCertificates[i]['InstanceID'] == ccInstanceId) { Q('idx_d27clientcert').value = i; }
+                }
+            }
+            setDialogMode(27, "802.1x Profile", 3, function () { setNetAuthProfile() });
+            updateNetAuthDialog();
+        }
+
+        function updateNetAuthDialog() {
+            QV('idx_d27protocoldiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servernamecomparediv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27servername').value != ''));
+            QV('idx_d27domaindiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27usernamediv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27passworddiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27roamingidentitydiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pacdiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27pacpassworddiv', (Q('idx_d27enabled').value == 1) && (Q('idx_d27protocol').value > 3));
+            QV('idx_d27clientcertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27servercertdiv', Q('idx_d27enabled').value == 1);
+            QV('idx_d27activeins0div', Q('idx_d27enabled').value == 1);
+            QV('idx_d27pxetimeoutdiv', Q('idx_d27enabled').value == 1);
+        }
+
+        function setNetAuthProfile() {
+            var sc = Clone(amtsysstate['AMT_8021XProfile'].responses.Body);
+            sc['Enabled'] = (Q('idx_d27enabled').value == 1);
+            if (sc['Enabled']) {
+                sc['ActiveInS0'] = (Q('idx_d27activeins0').value == 1);
+                sc['AuthenticationProtocol'] = Q('idx_d27protocol').value;
+                if (Q('idx_d27roamingidentity').value != '') { sc['RoamingIdentity'] = Q('idx_d27roamingidentity').value; } else { delete sc['RoamingIdentity']; }
+                if (Q('idx_d27servername').value != '') {
+                    sc['ServerCertificateName'] = Q('idx_d27servername').value;
+                    sc['ServerCertificateNameComparison'] = Q('idx_d27servernamecompare').value;
+                } else {
+                    delete sc['ServerCertificateName'];
+                    delete sc['ServerCertificateNameComparison'];
+                }
+                if (Q('idx_d27username').value != '') { sc['Username'] = Q('idx_d27username').value; } else { delete sc['Username']; }
+                if (Q('idx_d27password').value != '') { sc['Password'] = Q('idx_d27password').value; } else { delete sc['Password']; }
+                if (Q('idx_d27domain').value != '') { sc['Domain'] = Q('idx_d27domain').value; } else { delete sc['Domain']; }
+                if (Q('idx_d27protocol').value > 3) {
+                    sc['ProtectedAccessCredential'] = Q('idx_d27pac').value;
+                    sc['PACPassword'] = Q('idx_d27pacpassword').value;
+                } else {
+                    delete sc['ProtectedAccessCredential'];
+                    delete sc['PACPassword'];
+                }
+                if (parseInt(Q('idx_d27clientcert').value) >= 0) { sc['ClientCertificate'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27clientcert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ClientCertificate']; }
+                if (parseInt(Q('idx_d27servercert').value) >= 0) { sc['ServerCertificateIssuer'] = '<a:Address>/wsman</a:Address><a:ReferenceParameters><w:ResourceURI>' + amtstack.CompleteName('AMT_PublicKeyCertificate') + '</w:ResourceURI><w:SelectorSet><w:Selector Name="InstanceID">' + xxCertificates[parseInt(Q('idx_d27servercert').value)]['InstanceID'] + '</w:Selector></w:SelectorSet></a:ReferenceParameters>'; } else { delete sc['ServerCertificateIssuer']; }
+                sc['PxeTimeout'] = Q('idx_d27pxetimeout').value;
+            }
+            amtstack.Put('AMT_8021XProfile', sc, setNetAuthProfileEx);
+        }
+
+        function setNetAuthProfileEx(stack, name, response, status) {
+            if (status == 200) {
+                amtsysstate['AMT_8021XProfile'].responses.Body = amtsysstate['AMT_8021XProfile'].response = response.Body;
+                updateSystemStatus();
+            } else {
+                if (response.Header['WsmanError']) {
+                    messagebox("802.1x Error", response.Header['WsmanError'].replace(/_/g, ' '));
+                } else {
+                    messagebox("802.1x Error", "Error, Status = " + status);
+                }
+            }
+        }
+
+// ###END###{NetAuth}
 // ###END###{NetworkSettings}
 
 // ###BEGIN###{HardwareInfo}
@@ -8332,7 +8655,7 @@
             connectDesktopConsent = false; // TODO, this is not a good idea when calls are pending.
             if (desktop.State == 0) {
                 // Check if user consent is needed
-                if ((skipConsent !== true) && (amtversion > 5) && (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != undefined) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] == 0xFFFFFFFF)) {
+                if ((skipConsent !== true) && (amtversion > 5) && ((amtsysstate == null) || (amtsysstate != null) && (amtsysstate['IPS_OptInService'] != null) && (amtsysstate['IPS_OptInService'].response != null) && (amtsysstate['IPS_OptInService'].response['OptInRequired'] != 0))) {
                     connectDesktopConsent = true; amtstack.Get('IPS_OptInService', powerActionResponse0, 0, 1); return; // User consent always required, ask for it before KVM.
                 }
                 // Encoding Flags: 1 = RLE, 2 = 16bit, 4 = Gray, 8 = ZLib, 16 = 4bit Color
@@ -8420,6 +8743,7 @@
                 // ###END###{DesktopInband}
                 desktop.m.frameRateDelay = ((desktopsettings.limitFrameRate == true)?200:0);
                 desktop.m.noMouseRotate = desktopsettings.noMouseRotate;
+                desktop.m.ReverseMouseWheel = desktopsettings.reverseMouseWheel;
                 // ###BEGIN###{Mode-MeshCentral2}
                 desktop.tlsv1only = amtstack.wsman.comm.tlsv1only;
                 desktop.Start(currentMeshNode._id, 16994, '*', '*', 0);
@@ -8547,7 +8871,7 @@
                         messagebox("远程桌面", "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.");
                     } else if (desktop.disconnectCode == 50001) { // Intel AMT disconnect, try to connect again if connection was more than 5 seconds long.
                         reconnect = (desktop.connectTime != null) && ((desktop.connectTime + 5000) < Date.now());
-                        console.log(desktop.disconnectCode, reconnect);
+                        //console.log(desktop.disconnectCode, reconnect);
                     } else if (desktop.disconnectCode == 50002) { // KVM-BufferOverflow
                         messagebox("远程桌面", "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.");
                     }
@@ -8606,6 +8930,7 @@
             desktopsettings.showcad = d7showcad.checked;
             desktopsettings.limitFrameRate = d7limitFrameRate.checked;
             desktopsettings.noMouseRotate = d7noMouseRotate.checked;
+            desktopsettings.reverseMouseWheel = d7kvmrmw.checked;
             // ###BEGIN###{DesktopInband}
             desktopsettings.quality = d7bitmapquality.value;
             desktopsettings.scaling = d7bitmapscaling.value;
@@ -8628,6 +8953,7 @@
             d7showcad.checked = desktopsettings.showcad;
             d7limitFrameRate.checked = desktopsettings.limitFrameRate;
             d7noMouseRotate.checked = desktopsettings.noMouseRotate;
+            d7kvmrmw.checked = desktopsettings.reverseMouseWheel;
             // ###BEGIN###{DesktopInband}
             if (desktopsettings.quality) { d7bitmapquality.value = desktopsettings.quality; }
             if (desktopsettings.scaling) { d7bitmapscaling.value = desktopsettings.scaling; }
@@ -8679,7 +9005,7 @@
                 console.log('deskToggleFull1', fullscreenonly, urlvars['kvmonly']);
                 fullscreenonly = false;
                 if (urlvars['kvmonly'] == 1) {
-                    console.log('deskToggleFull2');
+                    //console.log('deskToggleFull2');
                     // It was initiated by a command line switch, exit now.
                     // ###BEGIN###{Mode-NodeWebkit}
                     require('nw.gui').Window.get().close();
@@ -8808,7 +9134,8 @@
             21: [[0xffe9, 1], [0xffc1, 1], [0xffc1, 0], [0xffe9, 0]], // Alt-F4
             22: [[0xffe3, 1], [0x77, 1], [0x77, 0], [0xffe3, 0]], // Ctrl-W
             23: [[0xffe7, 1], [0xff51, 1], [0xff51, 0], [0xffe7, 0]], // WIN+Left
-            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]] // Win+Right
+            24: [[0xffe7, 1], [0xff53, 1], [0xff53, 0], [0xffe7, 0]], // Win+Right
+            25: [[0xff0d, 1], [0xff0d, 0]] // Enter
         }
 
         // Send special keys to the remote side.
@@ -10333,67 +10660,64 @@
             amtstack.Get('AMT_BootCapabilities', powerActionResponse00, 0, 1);
         }
 
-        function powerActionResponse00(stack, name, response, status) {
-            if (status == 200) {
-                var powerState = 3;
-                try {
-                    var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
-                    if (x == 2) { powerState = 1; } else { powerState = 2; }
-                } catch (ex) { }
-                amtPowerBootCapabilities = response.Body;
-                QH('d5actionSelect', '');
-                if (powerState & 2) { addOption('d5actionSelect', "充电", 2); }
-                if (powerState & 1) {
-                    addOption('d5actionSelect', "重启", 10);
-                    addOption('d5actionSelect', "电源周期", 5);
-                    addOption('d5actionSelect', "掉电", 8);
-                }
-                if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "开机进行诊断", 300); }
-                    if (powerState & 1) { addOption('d5actionSelect', "重置为诊断", 301); }
-                }
-                if ((amtversion > 9) && (powerState & 1)) {
-                    addOption('d5actionSelect', "操作系统从待机状态唤醒", 500);
-                    addOption('d5actionSelect', "操作系统省电", 501);
-                    addOption('d5actionSelect', "软脱", 12);
-                    addOption('d5actionSelect', "软复位", 14);
-                    addOption('d5actionSelect', "睡觉", 4);
-                    addOption('d5actionSelect', "冬眠", 7);
-                }
-                if (amtPowerBootCapabilities['BIOSSetup'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "启动BIOS", 100); }
-                    if (powerState & 1) { addOption('d5actionSelect', "重置为BIOS", 101); }
-                }
-                if (amtPowerBootCapabilities['SecureErase'] == true) {
-                    if (powerState & 2) { addOption('d5actionSelect', "上电以安全擦除", 104); }
-                    if (powerState & 1) { addOption('d5actionSelect', "重置为安全擦除", 105); }
-                }
-                if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
-                    if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
-                }
-                // ###BEGIN###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "重置为IDE-R软盘", 200); }
-                if (powerState & 2) { addOption('d5actionSelect', "打开IDE-R软盘", 201); }
-                if (powerState & 1) { addOption('d5actionSelect', "重置为IDE-R CDROM", 202); }
-                if (powerState & 2) { addOption('d5actionSelect', "开启IDE-R CDROM", 203); }
-                // ###END###{IDER}
-                if (powerState & 1) { addOption('d5actionSelect', "重置为PXE", 400); }
-                if (powerState & 2) { addOption('d5actionSelect', "开启PXE", 401); }
-                // ###BEGIN###{PowerControl-Advanced}
-                // ###BEGIN###{PowerControl-OneClick}
-                if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
-                    if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
-                    if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
-                }
-                // ###END###{PowerControl-OneClick}
-                addOption('d5actionSelect', "自定义动作...", 999);
-                // ###END###{PowerControl-Advanced}
-                if (amtversion > 5) { addOption('d5actionSelect', "用户同意...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
-                setDialogMode(5, "权力行动", 3, powerActionDlgCheck);
-            } else {
-                messagebox("权力行动", format("无法获得系统功能，错误{0}", status));
+        function showPowerActionDlg() {
+            if (xxdialogMode) return;
+            var powerState = 3;
+            try {
+                var x = amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'];
+                if (x == 2) { powerState = 1; } else { powerState = 2; }
+            } catch (ex) { }
+            amtPowerBootCapabilities = amtsysstate['AMT_BootCapabilities'].response;
+            QH('d5actionSelect', '');
+            if (powerState & 2) { addOption('d5actionSelect', "充电", 2); }
+            if (powerState & 1) {
+                addOption('d5actionSelect', "重启", 10);
+                addOption('d5actionSelect', "电源周期", 5);
+                addOption('d5actionSelect', "掉电", 8);
             }
+            if (amtPowerBootCapabilities['ForceDiagnosticBoot'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "开机进行诊断", 300); }
+                if (powerState & 1) { addOption('d5actionSelect', "重置为诊断", 301); }
+            }
+            if ((amtversion > 9) && (powerState & 1)) {
+                addOption('d5actionSelect', "操作系统从待机状态唤醒", 500);
+                addOption('d5actionSelect', "操作系统省电", 501);
+                addOption('d5actionSelect', "软脱", 12);
+                addOption('d5actionSelect', "软复位", 14);
+                addOption('d5actionSelect', "睡觉", 4);
+                addOption('d5actionSelect', "冬眠", 7);
+            }
+            if (amtPowerBootCapabilities['BIOSSetup'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "启动BIOS", 100); }
+                if (powerState & 1) { addOption('d5actionSelect', "重置为BIOS", 101); }
+            }
+            if (amtPowerBootCapabilities['SecureErase'] == true) {
+                if (powerState & 2) { addOption('d5actionSelect', "上电以安全擦除", 104); }
+                if (powerState & 1) { addOption('d5actionSelect', "重置为安全擦除", 105); }
+            }
+            if ((amtPowerBootCapabilities['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2)) {
+                if (powerState & 2) { addOption('d5actionSelect', "Power up to Platform Erase", 106); }
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to Platform Erase", 107); }
+            }
+            // ###BEGIN###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "重置为IDE-R软盘", 200); }
+            if (powerState & 2) { addOption('d5actionSelect', "打开IDE-R软盘", 201); }
+            if (powerState & 1) { addOption('d5actionSelect', "重置为IDE-R CDROM", 202); }
+            if (powerState & 2) { addOption('d5actionSelect', "开启IDE-R CDROM", 203); }
+            // ###END###{IDER}
+            if (powerState & 1) { addOption('d5actionSelect', "重置为PXE", 400); }
+            if (powerState & 2) { addOption('d5actionSelect', "开启PXE", 401); }
+            // ###BEGIN###{PowerControl-Advanced}
+            // ###BEGIN###{PowerControl-OneClick}
+            if (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] === true) {
+                if (powerState & 1) { addOption('d5actionSelect', "Reset to HTTPS Boot", 600); }
+                if (powerState & 2) { addOption('d5actionSelect', "Power on to HTTPS Boot", 601); }
+            }
+            // ###END###{PowerControl-OneClick}
+            addOption('d5actionSelect', "自定义动作...", 999);
+            // ###END###{PowerControl-Advanced}
+            if (amtversion > 5) { addOption('d5actionSelect', "用户同意...", 998); } // On AMT 5 and higher, offer the option of doing user consent alone.
+            setDialogMode(5, "权力行动", 3, powerActionDlgCheck);
         }
 
         // ###BEGIN###{PowerControl-Advanced}
@@ -10460,31 +10784,38 @@
             var x = ("Confirm execution of Intel&reg; Remote Platform Erase?" + '<br>');
             x += ('<br><div style=color:red>' + "<b>警告</ b>：这将擦除远程系统上的数据。" + '</div>');
             var actionTaken = [], platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'];
+            if (platfromEraseSupport & (1 << 1)) { actionTaken.push('<label><input id=rpef1 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Pyrite Revert" + '</label>'); }
             if (platfromEraseSupport & (1 << 2)) { actionTaken.push('<label><input id=rpef2 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Secure Erase All SSDs" + '</label>'); }
+            if (platfromEraseSupport & (1 << 3)) { actionTaken.push('<label><input id=rpef3 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Verify Storage Erase" + '</label>'); }
             if (platfromEraseSupport & (1 << 6)) { actionTaken.push('<label><input id=rpef6 type=checkbox onchange=powerActionDlgRPEValidate()>' + "TPM Clear" + '</label>'); }
+            if (platfromEraseSupport & (1 << 16)) { actionTaken.push('<label><input id=rpef16 type=checkbox onchange=powerActionDlgRPEValidate()>' + "OEM Custom Action" + '</label>'); }
             if (platfromEraseSupport & (1 << 25)) { actionTaken.push('<label><input id=rpef25 type=checkbox onchange=powerActionDlgRPEValidate()>' + "Clear BIOS NVM Variables" + '</label>'); }
             if (platfromEraseSupport & (1 << 26)) { actionTaken.push('<label><input id=rpef26 type=checkbox onchange=powerActionDlgRPEValidate()>' + "BIOS Reload of Golden Configuration" + '</label>'); }
             if (platfromEraseSupport & (1 << 31)) { actionTaken.push('<label><input id=rpef31 type=checkbox onchange=powerActionDlgRPEValidate()>' + "CSME Unconfigure" + '</label>'); }
-            if (actionTaken.length > 1) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            if (actionTaken.length > 0) { x += (format('<br />' + "Select the actions to take:" + '<br /><br /><div style=margin-left:16px>{0}</div><br />', actionTaken.join('<br />'))); }
+            x += '<div id=rpepsid style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("Pyrite PSID", '<input id=rpepsidx style=width:210px maxlength=64 type=input>') + '</div>';
             x += '<div id=rpessdpass style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("SSD Master Password", '<input id=rpessdpassx style=width:210px maxlength=64 type=input>') + '</div>';
+            x += '<div id=rpeeomdata style=margin-top:4px;margin-bottom:4px;display:none>' + addHtmlValue("OEM Data (HEX)", '<input id=rpeoemdatax style=width:210px maxlength=256 type=input>') + '</div>';
             setDialogMode(11, "权力行动", 3, powerActionDlgRPEEx, x, advanced);
             QE('idx_dlgOkButton', false);
         }
 
         function powerActionDlgRPEValidate() {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [2,6,25,26,31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             QV('rpessdpass', rpeFlags & 4);
+            QV('rpeeomdata', rpeFlags & (1 << 16));
             QE('idx_dlgOkButton', rpeFlags);
         }
 
         var platfromEraseTLV = null;
         function powerActionDlgRPEEx(b, advanced) {
-            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 6, 25, 26, 31];
+            var rpeFlags = 0, platfromEraseSupport = amtPowerBootCapabilities['PlatformErase'], sf = [1, 2, 3, 6, 16, 25, 26, 31];
             for (var i in sf) { if (platfromEraseSupport & (1 << sf[i])) { if (Q('rpef' + sf[i]).checked) { rpeFlags += (1 << sf[i]); } } }
             var tlv = makeUefiBootParam(1, rpeFlags, 4), tlvlen = 1;
             if (rpeFlags & 2) { tlv += makeUefiBootParam(10, Q('rpepsidx').value); tlvlen++; }
             if (rpeFlags & 4) { tlv += makeUefiBootParam(20, Q('rpessdpassx').value); tlvlen++; }
+            if ((rpeFlags & (1 << 16)) && (Q('rpeoemdatax').value != '')) { tlv += makeUefiBootParam(20, hex2rstr(Q('rpeoemdatax').value), null, 11); tlvlen++; }
             platfromEraseTLV = { tlv: btoa(tlv), tlvlen: tlvlen };
             if (advanced) {
                 // Attempt user consent
@@ -10561,6 +10892,9 @@
         function showAdvPowerDlg() {
             try { Q('idx_d24Command').value = (amtsysstate['CIM_ServiceAvailableToElement'].responses[0]['PowerState'] == 2)?10:2; } catch (ex) { }
 
+            // Available force boot options
+            var forceBootDeviceOptions = '<option value=0>None</option><option id="ForceDVDBootOption" value=1>Force CD/DVD Boot</option><option id="ForcePXEBootOption" value=2>Force PXE Boot</option><option id="ForceHDBootOption" value=3>Force Hard Disk Boot</option><option id="ForceDiagBootOption" value=4>Force Diagnostic Boot</option>';
+
             // Show boot capabilities
             QV('d24dBiosPause', amtPowerBootCapabilities['BIOSPause'] == true);
             QV('d24dBiosSecureBoot', amtPowerBootCapabilities['BIOSSecureBoot'] == true);
@@ -10573,17 +10907,15 @@
             //QV('', amtPowerBootCapabilities['ForceWinREBoot'] == true);
             QV('ForcePXEBootOption', amtPowerBootCapabilities['ForcePXEBoot'] == true);
             // ###BEGIN###{PowerControl-OneClick}
-            QV('ForceUEFIBootOption', false);
             if ((AmtOcrPbaLength > 0) && (amtPowerBootCapabilities['ForceUEFIPBABoot'] == true)) {
-                QV('ForceUEFIBootOption', true);
+                forceBootDeviceOptions += '<option id="ForceUEFIBootOption" value=5>Force OCR UEFI Boot Option</option>';
                 var x = '';
                 for (var i in AmtOcrPba) { x += '<option value=' + i + '>' + AmtOcrPba[i].instance + '</option>'; }
                 QH('idx_d24customBootMediaIndex', x);
             }
-            var httpsBootPossible = (meshCentralServer==null && wsstack.comm.xtlsCertificate != null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
-
-            QV('ForceHttpBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
-            QV('ForceHttpUrlBootOption', (amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible);
+            var httpsBootPossible = ((meshCentralServer == null) && (wsstack.comm.xtlsCertificate != null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 1) || (meshCentralServer!=null && ((currentcomputer.conn & 2) == 2) )
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpBootOption" value=6>Force OCR UEFI HTTPS Boot (.iso)</option>'; }
+            if ((amtPowerBootCapabilities['ForceUEFIHTTPSBoot'] == true) && httpsBootPossible) { forceBootDeviceOptions += '<option id="ForceHttpUrlBootOption" value=7>Force OCR UEFI HTTPS Boot (url)</option>'; }
             // ###END###{PowerControl-OneClick}
             QV('d24dForceProgressEvents', amtPowerBootCapabilities['ForcedProgressEvents'] == true);
             QV('d24dUseIDER', amtPowerBootCapabilities['IDER'] == true);
@@ -10602,6 +10934,7 @@
             QV('d24p500', amtversion > 9);
             QV('d24p501', amtversion > 9);
 
+            QH('idx_d24ForceBootDevice', forceBootDeviceOptions);
             setDialogMode(24, "自定义电源动作", 3, showAdvPowerDlgOk);
             showAdvPowerDlgChange();
         }
@@ -10633,8 +10966,13 @@
             QV('idx_d24customBootSource', bootSourceIndex == 5)
             QV('idx_d24diskImage', bootSourceIndex == 6);
             QV('idx_d24diskImageUrl', bootSourceIndex == 7);
+            QV('idx_d24diskImageHttpTimeout', (bootSourceIndex == 7) && (amtversion > 16));
             if ((bootSourceIndex == 6) && (Q('idx_d24ocrBootFile').files.length != 1)) { ok = false; }
-            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false;}
+            if ((bootSourceIndex == 7) && (Q('idx_d24ocrBootUrl').value.trim().toLowerCase().startsWith('https://') == false)) { ok = false; }
+            if ((bootSourceIndex == 7) && (amtversion > 16)) {
+                var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                if (isNaN(timeout) || (timeout > 65535) || (timeout < 0)) { ok = false; }
+            }
             // ###END###{PowerControl-OneClick}
 
             QE('idx_dlgOkButton', ok);
@@ -10645,7 +10983,7 @@
             var forceBootSelection = Q('idx_d24ForceBootDevice').value;
             // ###BEGIN###{Mode-NodeWebkit}            
             if (((forceBootSelection == 5) || (forceBootSelection == 6) || (forceBootSelection == 7)) && 
-                ((meshCentralServer==null && wsstack.comm.xtlsCertificate == null) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
+                (((meshCentralServer == null) && (wsstack.comm.xtlsCertificate == null)) || (meshCentralServer!=null && ((currentcomputer.conn & 4) == 4) &&  currentcomputer.tls == 0))) {
                 messagebox("权力行动", "This feature requires a TLS connection to Intel AMT"); return;
             }
             // ###END###{Mode-NodeWebkit}
@@ -10713,9 +11051,9 @@
             //console.log("OptInRequired:", response.Body['OptInRequired']);
             //console.log("OptInState:", response.Body['OptInState']);
             //console.log(response);
-            if (response.Body['OptInRequired'] == 0xFFFFFFFF && response.Body['OptInState'] != 3 && response.Body['OptInState'] != 4) {
+            if (((response.Body['OptInRequired'] == 0xFFFFFFFF) || (connectDesktopConsent && (response.Body['OptInRequired'] != 0))) && (response.Body['OptInState'] != 3) && (response.Body['OptInState'] != 4)) {
                 if (response.Body['OptInState'] == 2) {
-                    // amtstack.IPS_OptInService_CancelOptIn(null);
+                    amtstack.IPS_OptInService_CancelOptIn(null);
                     d6ConsentText.value = ''; // Reset user consent code to empty
                     setDialogMode(6, "用户同意", 11, powerActionSendConsent);
                     checkConsentDisplay();
@@ -10735,7 +11073,7 @@
 
         function powerActionResponseC1(stack, name, response, status) {
             //if (errcheck(status, stack)) return;
-            //console.log('powerActionResponseC1', action, status, response);
+            //console.log('powerActionResponseC1', name, status, response);
             if (status != 200) { if (connectDesktopConsent) { setDialogMode(0); connectDesktop(true); } else { messagebox("权力行动", format("错误编号", status)); } return; }
             //console.log("powerActionResponseC1(" + name + "," + ObjectToString2(response) + "," + status + ")");
             if (response.Body['ReturnValue'] != 0) {
@@ -10764,9 +11102,12 @@
         //function powerActionCancelConsent() { amtstack.IPS_OptInService_CancelOptIn(null); }
 
         function powerActionSendConsent(buttons) {
+            console.log('powerActionSendConsent', buttons);
             if (buttons == 0) {
                 // Cancel button
-                amtstack.IPS_OptInService_CancelOptIn(function() {});
+                amtstack.IPS_OptInService_CancelOptIn(function () { });
+                connectDesktopConsent = false;
+                desktop.Stop();
             } else {
                 // OK Button
                 statusbox("权力行动", "正在传送使用者同意...");
@@ -10829,10 +11170,14 @@
                     r['SecureErase'] = ((AvdPowerDlg.SecureErase) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] == true) && (AvdPowerDlg.RSEPassword)) { r['RSEPassword'] = AvdPowerDlg.RSEPassword; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && ((AvdPowerDlg.PlatformErase) && (amtPowerBootCapabilities['PlatformErase'] != null) && ((amtPowerBootCapabilities['PlatformErase'] & 1) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
                 if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = AvdPowerDlg.FirmwareReset; }
             } else {
@@ -10858,14 +11203,16 @@
                     r['SecureErase'] = (((action == 104) || (action == 105)) && (amtPowerBootCapabilities['SecureErase'] == true));
                     if ((r['SecureErase'] === true) && (rsepass.length > 0)) { r['RSEPassword'] = rsepass; }
                 }
-                if ((r['PlatformErase'] != null) && (amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
-                    r['PlatformErase'] = true;
-                    r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
-                    r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
-                }
-                if (r['ConfigurationDataReset'] != null) {
-                    r['ConfigurationDataReset'] = false;
+                if (r['PlatformErase'] != null) {
+                    if ((amtsysstate['CIM_BootService'] != null) && (amtsysstate['CIM_BootService'].response['EnabledState'] >= 32768) && (amtsysstate['CIM_BootService'].response['EnabledState'] & 2) && (((action == 106) || (action == 107)) && (amtPowerBootCapabilities['PlatformErase'] != null) && (((amtPowerBootCapabilities['PlatformErase'] & 1)) != 0))) {
+                        r['PlatformErase'] = true;
+                        r['UefiBootParametersArray'] = platfromEraseTLV.tlv;
+                        r['UefiBootNumberOfParams'] = platfromEraseTLV.tlvlen;
+                    } else {
+                        r['PlatformErase'] = false;
+                    }
                 }
+                if (r['ConfigurationDataReset'] != null) { r['ConfigurationDataReset'] = false; }
                 rsepass = null;
                 // ###BEGIN###{PowerControl-Advanced}
             }
@@ -10873,7 +11220,18 @@
             // ###BEGIN###{PowerControl-OneClick}
             // Add OCR TLV parameters if firmware supports OCR and Force HTTPS Boot is requested
             if ((action == 999) && (Q('idx_d24ForceBootDevice').value == 7)) { // Force UEFI HTTPS Boot using URL
-                r['UefiBootParametersArray'] = btoa(makeUefiBootParam(1, Q('idx_d24ocrBootUrl').value.trim()) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2));
+                const bootUrl = new URL(Q('idx_d24ocrBootUrl').value.trim());
+                const bootUrlUsername = bootUrl.username;
+                const bootUrlPassword = bootUrl.password;
+                bootUrl.username = bootUrl.password = '';
+                var uefiParams = makeUefiBootParam(1, bootUrl.href) + makeUefiBootParam(20, 1, 1) + makeUefiBootParam(30, 0, 2);
+                if (bootUrlUsername != '') { uefiParams += makeUefiBootParam(40, bootUrlUsername); } // HTTP basic auth username
+                if (bootUrlPassword != '') { uefiParams += makeUefiBootParam(41, bootUrlPassword); } // HTTP basic auth password
+                if (amtversion > 16) {
+                    var timeout = parseInt(Q('idx_d24ocrBootHttpBootTimeout').value);
+                    if (timeout > 0) { uefiParams += makeUefiBootParam(30, timeout, 2); }
+                }
+                r['UefiBootParametersArray'] = btoa(uefiParams);
                 r['UefiBootNumberOfParams'] = 3;
                 r['BootMediaIndex'] = 0; // Do not use boot media index for One Click Recovery (OCR)
             } else if ((action == 600) || (action == 601) || ((action == 999) && (Q('idx_d24ForceBootDevice').value == 6))) { // Force UEFI HTTPS Boot
@@ -10930,10 +11288,7 @@
                 if (action == 300 || action == 301) { bootSource = 'Force Diagnostic Boot'; }
                 if (action == 400 || action == 401) { bootSource = 'Force PXE Boot'; }
             // ###BEGIN###{PowerControl-Advanced}
-                if (action == 600 || action == 601) {
-
-                    bootSource = 'Force OCR UEFI HTTPS Boot';
-                }
+                if (action == 600 || action == 601) { bootSource = 'Force OCR UEFI HTTPS Boot'; }
             }
 
             // Resetting Force boot data in case it was changed so that it won't be used on the next power action
@@ -10946,7 +11301,7 @@
 
         var targetPowerAction = 0;
         function powerActionResponse3(stack, name, response, status) {
-            console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
+            //console.log('powerActionResponse3(' + name + ',' + response + ',' + status + ')');
             if (errcheck(status, stack)) return;
             if (response.Body['ReturnValue'] != 0) { messagebox("Change Boot Order", "(2) Change Boot Order returns "+ response.Body.ReturnValueStr); return; }
 
@@ -11357,7 +11712,7 @@
                         x += '<div style=padding-left:15px><br><i>' + "没有注册唤醒警报。" + '</i></div><br>';
                     }
                     var y = '<div>&nbsp;' + AddRefreshButton('PullAlarms()');
-                    if (xxAccountAdminName) { y += AddButton("删除所有警报", 'RemoveAllAlarms()') + AddButton("加", 'showAddAlarm()'); }
+                    if (xxAccountAdminName) { y += AddButton2("删除所有警报", 'RemoveAllAlarms()', xxAlarms ? '' : 'disabled') + AddButton("加", 'showAddAlarm()'); }
                     x += '<br><td class=r1>' + TableEnd(y + '</div>');
                     QH('id_TableAlarm', x);
                 }
@@ -13407,7 +13762,7 @@
             QV('id_dialogclose', b & 2);
             QV('idx_dlgDeleteButton', b & 4);
             if (y) QH('id_dialogtitle', y);
-            for (var i = 1; i < 27; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
+            for (var i = 1; i < 28; i++) { QV('dialog' + i, i == x); } // Edit this line when more dialogs are added
             QV('dialog', x);
             if (c) { if (x == 11) { QH('id_dialogOptions', c); } else { QH('id_dialogMessage', c); } }
 
@@ -13657,8 +14012,8 @@
         function AddButton(v, f) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' style=margin:4px>'; }
         function AddButton2(v, f, s) { return '<input type=button value=\'' + v + '\' onclick=\'' + f + '\' ' + s + '>'; }
         function AddRefreshButton(f) { return '<input type=button name=refreshbtn value="' + "刷新" + '" onclick=\'refreshButtons(false);' + f + '\' style=margin:4px ' + (refreshButtonsState==false?'disabled':'') + '>'; }
-        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; More</a><div id=morexxx2 style=display:none><br><hr>'; };
-        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; Less</a></div>'; };
+        function MoreStart() { return '<a style=cursor:pointer;color:blue id=morexxx1 onclick=QV(\"morexxx1\",false);QV(\"morexxx2\",true)>&#x25BC; ' + "More" + '</a><div id=morexxx2 style=display:none><br><hr>'; };
+        function MoreEnd() { return '<a style=cursor:pointer;color:blue onclick=QV(\"morexxx2\",false);QV(\"morexxx1\",true)>&#x25B2; ' + "Less" + '</a></div>'; };
         function getSelectedOptions(sel) { var opts = [], opt; for (var i = 0, len = sel.options.length; i < len; i++) { opt = sel.options[i]; if (opt.selected) { opts.push(opt.value); } } return opts; }
         function getInstance(x, y) { for (var i in x) { if (x[i]['InstanceID'] == y) return x[i]; } return null; }
         function getItem(x, y, z) { for (var i in x) { if (x[i][y] == z) return x[i]; } return null; }
diff --git a/translate/translate.json b/translate/translate.json
index bbf1315..96755fa 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -13,7 +13,7 @@
       "ru": " 1 день",
       "zh-chs": " 1天",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1505"
+        "index.html->id_computerSelector->dialog->21->1529"
       ]
     },
     {
@@ -29,7 +29,7 @@
       "ru": " 1 дней",
       "zh-chs": " 1天",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1504"
+        "index.html->id_computerSelector->dialog->21->1528"
       ]
     },
     {
@@ -45,7 +45,7 @@
       "ru": " 1 час",
       "zh-chs": " 1小时",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1507"
+        "index.html->id_computerSelector->dialog->21->1531"
       ]
     },
     {
@@ -61,7 +61,7 @@
       "ru": " 1 час",
       "zh-chs": " 1小时",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1506"
+        "index.html->id_computerSelector->dialog->21->1530"
       ]
     },
     {
@@ -77,7 +77,7 @@
       "ru": " 1 минута ",
       "zh-chs": " 1分钟 ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1509"
+        "index.html->id_computerSelector->dialog->21->1533"
       ]
     },
     {
@@ -93,7 +93,7 @@
       "ru": " 1 минута ",
       "zh-chs": " 1分钟 ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1508"
+        "index.html->id_computerSelector->dialog->21->1532"
       ]
     },
     {
@@ -109,7 +109,7 @@
       "ru": " : Событие для входа",
       "zh-chs": " ：要记录的事件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->770"
+        "index.html->id_computerSelector->dialog->21->773"
       ]
     },
     {
@@ -147,7 +147,7 @@
       "ru": " подробности",
       "zh-chs": " 细节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->644"
+        "index.html->id_computerSelector->dialog->21->647"
       ]
     },
     {
@@ -163,8 +163,8 @@
       "ru": " Информация об оборудовании собирается во время загрузки системы.",
       "zh-chs": " 硬件信息在系统启动时收集。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1007",
-        "index.html->id_computerSelector->dialog->21->1009"
+        "index.html->id_computerSelector->dialog->21->1028",
+        "index.html->id_computerSelector->dialog->21->1030"
       ]
     },
     {
@@ -180,8 +180,8 @@
       "ru": " мегабайт",
       "zh-chs": " 兆字节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1039",
-        "index.html->id_computerSelector->dialog->21->1048"
+        "index.html->id_computerSelector->dialog->21->1060",
+        "index.html->id_computerSelector->dialog->21->1069"
       ]
     },
     {
@@ -197,7 +197,7 @@
       "ru": " МГц",
       "zh-chs": " 兆赫",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1032"
+        "index.html->id_computerSelector->dialog->21->1053"
       ]
     },
     {
@@ -213,7 +213,7 @@
       "ru": " действия",
       "zh-chs": " 行动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->765"
+        "index.html->id_computerSelector->dialog->21->768"
       ]
     },
     {
@@ -274,7 +274,7 @@
       "ru": " и каждый",
       "zh-chs": " 和每个",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1513"
+        "index.html->id_computerSelector->dialog->21->1537"
       ]
     },
     {
@@ -290,7 +290,7 @@
       "ru": " и не TLS",
       "zh-chs": " 和非TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->648"
+        "index.html->id_computerSelector->dialog->21->651"
       ]
     },
     {
@@ -306,9 +306,9 @@
       "ru": " в",
       "zh-chs": " 在",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1512",
-        "index.html->id_computerSelector->dialog->21->821",
-        "index.html->id_computerSelector->dialog->21->825"
+        "index.html->id_computerSelector->dialog->21->1536",
+        "index.html->id_computerSelector->dialog->21->824",
+        "index.html->id_computerSelector->dialog->21->828"
       ]
     },
     {
@@ -324,12 +324,12 @@
       "ru": " байтов",
       "zh-chs": " 个字节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1474",
-        "index.html->id_computerSelector->dialog->21->1545",
+        "index.html->id_computerSelector->dialog->21->1498",
+        "index.html->id_computerSelector->dialog->21->1569",
         "index.html->id_computerSelector->dialog->21->297",
-        "index.html->id_computerSelector->dialog->21->519",
-        "index.html->id_computerSelector->dialog->21->521",
-        "index.html->id_computerSelector->dialog->21->674"
+        "index.html->id_computerSelector->dialog->21->522",
+        "index.html->id_computerSelector->dialog->21->524",
+        "index.html->id_computerSelector->dialog->21->677"
       ]
     },
     {
@@ -345,11 +345,11 @@
       "ru": " байт,",
       "zh-chs": " 字节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1574",
+        "index.html->id_computerSelector->dialog->21->1598",
         "index.html->id_computerSelector->dialog->21->294",
-        "index.html->id_computerSelector->dialog->21->514",
         "index.html->id_computerSelector->dialog->21->517",
-        "index.html->id_computerSelector->dialog->21->671"
+        "index.html->id_computerSelector->dialog->21->520",
+        "index.html->id_computerSelector->dialog->21->674"
       ]
     },
     {
@@ -378,7 +378,7 @@
       "ru": " дней",
       "zh-chs": " 天",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1501"
+        "index.html->id_computerSelector->dialog->21->1525"
       ]
     },
     {
@@ -394,7 +394,7 @@
       "ru": " часов",
       "zh-chs": " 小时",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1502"
+        "index.html->id_computerSelector->dialog->21->1526"
       ]
     },
     {
@@ -410,7 +410,7 @@
       "ru": " в,",
       "zh-chs": " 在，",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1197"
+        "index.html->id_computerSelector->dialog->21->1218"
       ]
     },
     {
@@ -471,7 +471,7 @@
       "ru": " минут",
       "zh-chs": " 分钟",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1503"
+        "index.html->id_computerSelector->dialog->21->1527"
       ]
     },
     {
@@ -516,7 +516,7 @@
       "ru": " вне.",
       "zh-chs": " 出来。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1198"
+        "index.html->id_computerSelector->dialog->21->1219"
       ]
     },
     {
@@ -532,7 +532,7 @@
       "ru": " пакет",
       "zh-chs": " 包",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->812"
+        "index.html->id_computerSelector->dialog->21->815"
       ]
     },
     {
@@ -548,8 +548,8 @@
       "ru": " пакет / сек",
       "zh-chs": " 包/秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->822",
-        "index.html->id_computerSelector->dialog->21->826"
+        "index.html->id_computerSelector->dialog->21->825",
+        "index.html->id_computerSelector->dialog->21->829"
       ]
     },
     {
@@ -565,7 +565,7 @@
       "ru": " пакеты",
       "zh-chs": " 包",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->813"
+        "index.html->id_computerSelector->dialog->21->816"
       ]
     },
     {
@@ -581,7 +581,7 @@
       "ru": " царств",
       "zh-chs": " 领域",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1076"
+        "index.html->id_computerSelector->dialog->21->1097"
       ]
     },
     {
@@ -597,7 +597,7 @@
       "ru": " запись (ы),",
       "zh-chs": " 记录），",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->614"
+        "index.html->id_computerSelector->dialog->21->617"
       ]
     },
     {
@@ -626,8 +626,8 @@
       "ru": " секунд (ы)",
       "zh-chs": " 秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->778",
-        "index.html->id_computerSelector->dialog->21->780"
+        "index.html->id_computerSelector->dialog->21->781",
+        "index.html->id_computerSelector->dialog->21->783"
       ]
     },
     {
@@ -698,7 +698,7 @@
       "ru": " сторожевые собаки",
       "zh-chs": " 监察者",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->763"
+        "index.html->id_computerSelector->dialog->21->766"
       ]
     },
     {
@@ -714,7 +714,7 @@
       "ru": "% бесплатно",
       "zh-chs": "％ 自由",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->615"
+        "index.html->id_computerSelector->dialog->21->618"
       ]
     },
     {
@@ -733,13 +733,13 @@
     {
       "en": "(1) Change Boot Order returns ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1456"
+        "index.html->id_computerSelector->dialog->21->1480"
       ]
     },
     {
       "en": "(2) Change Boot Order returns ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1462"
+        "index.html->id_computerSelector->dialog->21->1486"
       ]
     },
     {
@@ -755,7 +755,7 @@
       "ru": "(Пусто)",
       "zh-chs": "（空）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1105"
+        "index.html->id_computerSelector->dialog->21->1126"
       ]
     },
     {
@@ -771,8 +771,8 @@
       "ru": "(Никто)",
       "zh-chs": "（没有）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1231",
-        "index.html->id_computerSelector->dialog->21->1236"
+        "index.html->id_computerSelector->dialog->21->1252",
+        "index.html->id_computerSelector->dialog->21->1257"
       ]
     },
     {
@@ -836,14 +836,14 @@
       "ru": ",",
       "zh-chs": "，",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1100",
-        "index.html->id_computerSelector->dialog->21->1337",
+        "index.html->id_computerSelector->dialog->21->1121",
+        "index.html->id_computerSelector->dialog->21->1358",
         "index.html->id_computerSelector->dialog->21->407",
         "index.html->id_computerSelector->dialog->21->410",
-        "index.html->id_computerSelector->dialog->21->500",
-        "index.html->id_computerSelector->dialog->21->627",
-        "index.html->id_computerSelector->dialog->21->628",
-        "index.html->id_computerSelector->dialog->21->629"
+        "index.html->id_computerSelector->dialog->21->503",
+        "index.html->id_computerSelector->dialog->21->630",
+        "index.html->id_computerSelector->dialog->21->631",
+        "index.html->id_computerSelector->dialog->21->632"
       ]
     },
     {
@@ -865,7 +865,7 @@
       "ru": ", Почти полный",
       "zh-chs": "， 几乎满",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->608"
+        "index.html->id_computerSelector->dialog->21->611"
       ]
     },
     {
@@ -881,7 +881,7 @@
       "ru": "Аудитор",
       "zh-chs": "审计员",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1099"
+        "index.html->id_computerSelector->dialog->21->1120"
       ]
     },
     {
@@ -903,7 +903,7 @@
     {
       "en": ", Compressed",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1139"
+        "index.html->id_computerSelector->dialog->21->1160"
       ]
     },
     {
@@ -919,7 +919,7 @@
       "ru": ", Граф",
       "zh-chs": "，计数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->899"
+        "index.html->id_computerSelector->dialog->21->902"
       ]
     },
     {
@@ -931,7 +931,7 @@
     {
       "en": ", Downscaled",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1138"
+        "index.html->id_computerSelector->dialog->21->1159"
       ]
     },
     {
@@ -947,7 +947,7 @@
       "ru": ", Событие",
       "zh-chs": "，活动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->900"
+        "index.html->id_computerSelector->dialog->21->903"
       ]
     },
     {
@@ -963,8 +963,8 @@
       "ru": "Событие на матч",
       "zh-chs": "，比赛进行中",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->823",
-        "index.html->id_computerSelector->dialog->21->827"
+        "index.html->id_computerSelector->dialog->21->826",
+        "index.html->id_computerSelector->dialog->21->830"
       ]
     },
     {
@@ -980,7 +980,7 @@
       "ru": ", Полный",
       "zh-chs": "满",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->609"
+        "index.html->id_computerSelector->dialog->21->612"
       ]
     },
     {
@@ -1044,7 +1044,7 @@
       "ru": ", Заблокирован",
       "zh-chs": "，已锁定",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->607"
+        "index.html->id_computerSelector->dialog->21->610"
       ]
     },
     {
@@ -1060,7 +1060,7 @@
       "ru": ", Нет ключа",
       "zh-chs": "，NoKey",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->610"
+        "index.html->id_computerSelector->dialog->21->613"
       ]
     },
     {
@@ -1124,7 +1124,7 @@
       "ru": "Закрытый ключ",
       "zh-chs": "，私钥",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->654"
+        "index.html->id_computerSelector->dialog->21->657"
       ]
     },
     {
@@ -1172,7 +1172,7 @@
       "ru": ", Взбитый",
       "zh-chs": "，加扰",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1645"
+        "index.html->id_computerSelector->dialog->21->1669"
       ]
     },
     {
@@ -1220,7 +1220,7 @@
       "ru": ", Софт-КВМ",
       "zh-chs": "，软KVM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1137"
+        "index.html->id_computerSelector->dialog->21->1158"
       ]
     },
     {
@@ -1236,7 +1236,7 @@
       "ru": ", Сертификат TLS",
       "zh-chs": "，TLS证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->655"
+        "index.html->id_computerSelector->dialog->21->658"
       ]
     },
     {
@@ -1252,7 +1252,7 @@
       "ru": "Доверенный корень",
       "zh-chs": "，受信任的根",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->653"
+        "index.html->id_computerSelector->dialog->21->656"
       ]
     },
     {
@@ -1288,7 +1288,7 @@
       "ru": "удалите когда закончите",
       "zh-chs": "，完成后删除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1514"
+        "index.html->id_computerSelector->dialog->21->1538"
       ]
     },
     {
@@ -1320,7 +1320,7 @@
       "ru": "каждые {0} секунд",
       "zh-chs": "，每{0}秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1220"
+        "index.html->id_computerSelector->dialog->21->1241"
       ]
     },
     {
@@ -1377,8 +1377,8 @@
       "ru": "...",
       "zh-chs": "...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1164",
-        "index.html->id_computerSelector->dialog->21->1556"
+        "index.html->id_computerSelector->dialog->21->1185",
+        "index.html->id_computerSelector->dialog->21->1580"
       ]
     },
     {
@@ -1436,7 +1436,7 @@
       "ru": "1 байт",
       "zh-chs": "1个字节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1176"
+        "index.html->id_computerSelector->dialog->21->1197"
       ]
     },
     {
@@ -1452,7 +1452,7 @@
       "ru": "1 царство",
       "zh-chs": "1个境界",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1075"
+        "index.html->id_computerSelector->dialog->21->1096"
       ]
     },
     {
@@ -1468,7 +1468,7 @@
       "ru": "1 секунда",
       "zh-chs": "1秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1669"
+        "index.html->id_computerSelector->dialog->21->1693"
       ]
     },
     {
@@ -1635,8 +1635,8 @@
       "en": "3",
       "ko": "",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1168",
-        "index.html->id_computerSelector->dialog->21->1173"
+        "index.html->id_computerSelector->dialog->21->1189",
+        "index.html->id_computerSelector->dialog->21->1194"
       ]
     },
     {
@@ -1684,7 +1684,7 @@
       "ru": "3DRAM",
       "zh-chs": "3DRAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->968"
+        "index.html->id_computerSelector->dialog->21->989"
       ]
     },
     {
@@ -1701,7 +1701,7 @@
       "zh-chs": "第三显示",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->404",
-        "index.html->id_computerSelector->dialog->21->527"
+        "index.html->id_computerSelector->dialog->21->530"
       ]
     },
     {
@@ -1782,7 +1782,7 @@
       "ru": "5900 паролей (8 символов)",
       "zh-chs": "5900密码（8个字符）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->534"
+        "index.html->id_computerSelector->dialog->21->537"
       ]
     },
     {
@@ -1817,6 +1817,25 @@
         "index.html->id_computerSelector->dialog->dialog->5->dialog7->d7softkvmsettings->5->d7bitmapscaling->5"
       ]
     },
+    {
+      "en": "802.1x",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->490"
+      ]
+    },
+    {
+      "en": "802.1x Error",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->964",
+        "index.html->id_computerSelector->dialog->21->965"
+      ]
+    },
+    {
+      "en": "802.1x Profile",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->963"
+      ]
+    },
     {
       "de": "80 x 25",
       "en": "80x25",
@@ -1852,9 +1871,9 @@
     {
       "en": ":",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1085",
-        "index.html->id_computerSelector->dialog->21->1086",
-        "index.html->id_computerSelector->dialog->21->1221"
+        "index.html->id_computerSelector->dialog->21->1106",
+        "index.html->id_computerSelector->dialog->21->1107",
+        "index.html->id_computerSelector->dialog->21->1242"
       ]
     },
     {
@@ -1870,7 +1889,7 @@
       "ru": "<b> CDROM </ b>, блоки - {0} байтов.",
       "zh-chs": "<b> CDROM </ b>，块为{0}字节。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1199"
+        "index.html->id_computerSelector->dialog->21->1220"
       ]
     },
     {
@@ -1886,7 +1905,7 @@
       "ru": "<b> Флоппи-диск </ b>, блоки имеют размер {0}.",
       "zh-chs": "<b>软盘</ b>，块为{0}字节。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1200"
+        "index.html->id_computerSelector->dialog->21->1221"
       ]
     },
     {
@@ -1902,7 +1921,7 @@
       "ru": "<b> ВНИМАНИЕ: </ b> TLS не используется, пароль будет отправлен в открытом виде.",
       "zh-chs": "<b>警告：</ b>不使用TLS，密码将以明文形式发送。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1398"
+        "index.html->id_computerSelector->dialog->21->1417"
       ]
     },
     {
@@ -1918,8 +1937,8 @@
       "ru": "<b> ПРЕДУПРЕЖДЕНИЕ. </ b> Это приведет к удалению данных на удаленной системе.",
       "zh-chs": "<b>警告</ b>：这将擦除远程系统上的数据。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1397",
-        "index.html->id_computerSelector->dialog->21->1403"
+        "index.html->id_computerSelector->dialog->21->1416",
+        "index.html->id_computerSelector->dialog->21->1422"
       ]
     },
     {
@@ -2075,7 +2094,7 @@
       "ru": "Имя доступа",
       "zh-chs": "访问名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1256"
+        "index.html->id_computerSelector->dialog->21->1277"
       ]
     },
     {
@@ -2091,7 +2110,7 @@
       "ru": "Имя доступа",
       "zh-chs": "访问名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1268"
+        "index.html->id_computerSelector->dialog->21->1289"
       ]
     },
     {
@@ -2107,7 +2126,7 @@
       "ru": "Счет",
       "zh-chs": "帐户",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1103"
+        "index.html->id_computerSelector->dialog->21->1124"
       ]
     },
     {
@@ -2123,7 +2142,7 @@
       "ru": "Ошибка аккаунта",
       "zh-chs": "帐户错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1083"
+        "index.html->id_computerSelector->dialog->21->1104"
       ]
     },
     {
@@ -2139,7 +2158,7 @@
       "ru": "действие",
       "zh-chs": "行动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->852"
+        "index.html->id_computerSelector->dialog->21->855"
       ]
     },
     {
@@ -2204,6 +2223,13 @@
         "index.html->id_topheader->5->1->0->1->1"
       ]
     },
+    {
+      "en": "Active in S0",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12activeins0div->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27activeins0div->3"
+      ]
+    },
     {
       "de": "Hinzufügen",
       "en": "Add",
@@ -2217,7 +2243,7 @@
       "ru": "Добавить",
       "zh-chs": "加",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1518"
+        "index.html->id_computerSelector->dialog->21->1542"
       ]
     },
     {
@@ -2233,7 +2259,7 @@
       "ru": "Добавить",
       "zh-chs": "加",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1538"
+        "index.html->id_computerSelector->dialog->21->1562"
       ]
     },
     {
@@ -2249,7 +2275,7 @@
       "ru": "Добавить действие ...",
       "zh-chs": "添加动作...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->768"
+        "index.html->id_computerSelector->dialog->21->771"
       ]
     },
     {
@@ -2265,8 +2291,8 @@
       "ru": "Добавить сертификат",
       "zh-chs": "添加证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->693",
-        "index.html->id_computerSelector->dialog->21->725"
+        "index.html->id_computerSelector->dialog->21->696",
+        "index.html->id_computerSelector->dialog->21->728"
       ]
     },
     {
@@ -2282,7 +2308,7 @@
       "ru": "Добавить сертификат ...",
       "zh-chs": "添加证书...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->657"
+        "index.html->id_computerSelector->dialog->21->660"
       ]
     },
     {
@@ -2330,7 +2356,7 @@
       "ru": "Добавить подписку на событие",
       "zh-chs": "添加事件订阅",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->593"
+        "index.html->id_computerSelector->dialog->21->596"
       ]
     },
     {
@@ -2346,7 +2372,7 @@
       "ru": "Добавить фильтр",
       "zh-chs": "添加过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->889"
+        "index.html->id_computerSelector->dialog->21->892"
       ]
     },
     {
@@ -2362,7 +2388,7 @@
       "ru": "Добавить фильтр ...",
       "zh-chs": "添加过滤器...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->828"
+        "index.html->id_computerSelector->dialog->21->831"
       ]
     },
     {
@@ -2378,7 +2404,7 @@
       "ru": "Добавить HTTP прокси",
       "zh-chs": "添加HTTP代理",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1280"
+        "index.html->id_computerSelector->dialog->21->1301"
       ]
     },
     {
@@ -2410,8 +2436,8 @@
       "ru": "Добавить интернет-сервер",
       "zh-chs": "添加Internet服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1299",
-        "index.html->id_computerSelector->dialog->21->1301"
+        "index.html->id_computerSelector->dialog->21->1320",
+        "index.html->id_computerSelector->dialog->21->1322"
       ]
     },
     {
@@ -2427,7 +2453,7 @@
       "ru": "Добавить политику ...",
       "zh-chs": "新增政策...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->829"
+        "index.html->id_computerSelector->dialog->21->832"
       ]
     },
     {
@@ -2443,8 +2469,8 @@
       "ru": "Добавить прокси-сервер",
       "zh-chs": "添加代理服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1284",
-        "index.html->id_computerSelector->dialog->21->1286"
+        "index.html->id_computerSelector->dialog->21->1305",
+        "index.html->id_computerSelector->dialog->21->1307"
       ]
     },
     {
@@ -2460,7 +2486,7 @@
       "ru": "Добавить прокси ...",
       "zh-chs": "添加代理...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1228"
+        "index.html->id_computerSelector->dialog->21->1249"
       ]
     },
     {
@@ -2476,7 +2502,7 @@
       "ru": "Добавить запись",
       "zh-chs": "添加记录",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1636"
+        "index.html->id_computerSelector->dialog->21->1660"
       ]
     },
     {
@@ -2492,7 +2518,7 @@
       "ru": "Добавить удаленный сервер",
       "zh-chs": "添加远程服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1298"
+        "index.html->id_computerSelector->dialog->21->1319"
       ]
     },
     {
@@ -2508,7 +2534,7 @@
       "ru": "Добавить сервер...",
       "zh-chs": "添加服务器...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1227"
+        "index.html->id_computerSelector->dialog->21->1248"
       ]
     },
     {
@@ -2524,8 +2550,8 @@
       "ru": "Добавить фильтр защиты системы",
       "zh-chs": "添加系统防御过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->857",
-        "index.html->id_computerSelector->dialog->21->859"
+        "index.html->id_computerSelector->dialog->21->860",
+        "index.html->id_computerSelector->dialog->21->862"
       ]
     },
     {
@@ -2541,8 +2567,8 @@
       "ru": "Добавить политику защиты системы",
       "zh-chs": "添加系统防御策略",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->890",
-        "index.html->id_computerSelector->dialog->21->893"
+        "index.html->id_computerSelector->dialog->21->893",
+        "index.html->id_computerSelector->dialog->21->896"
       ]
     },
     {
@@ -2558,7 +2584,7 @@
       "ru": "Добавить переменную",
       "zh-chs": "添加变量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1640"
+        "index.html->id_computerSelector->dialog->21->1664"
       ]
     },
     {
@@ -2574,7 +2600,7 @@
       "ru": "Добавить переменную к записи № {0}",
       "zh-chs": "将变量添加到记录＃{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1658"
+        "index.html->id_computerSelector->dialog->21->1682"
       ]
     },
     {
@@ -2590,7 +2616,7 @@
       "ru": "Добавить сторож",
       "zh-chs": "添加看门狗",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->787"
+        "index.html->id_computerSelector->dialog->21->790"
       ]
     },
     {
@@ -2606,7 +2632,7 @@
       "ru": "Добавить Watchdog Action",
       "zh-chs": "添加看门狗动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->794"
+        "index.html->id_computerSelector->dialog->21->797"
       ]
     },
     {
@@ -2622,7 +2648,7 @@
       "ru": "Добавить сторожевой таймер ...",
       "zh-chs": "添加看门狗...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->771"
+        "index.html->id_computerSelector->dialog->21->774"
       ]
     },
     {
@@ -2638,7 +2664,7 @@
       "ru": "Добавить профиль беспроводной сети",
       "zh-chs": "添加无线配置文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->945"
+        "index.html->id_computerSelector->dialog->21->960"
       ]
     },
     {
@@ -2654,7 +2680,7 @@
       "ru": "Добавить новую запись",
       "zh-chs": "添加新记录",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1635"
+        "index.html->id_computerSelector->dialog->21->1659"
       ]
     },
     {
@@ -2670,7 +2696,7 @@
       "ru": "Добавить новую переменную",
       "zh-chs": "添加一个新变量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1639"
+        "index.html->id_computerSelector->dialog->21->1663"
       ]
     },
     {
@@ -2686,8 +2712,8 @@
       "ru": "Добавить будильник",
       "zh-chs": "添加闹钟",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1522",
-        "index.html->id_computerSelector->dialog->21->1524"
+        "index.html->id_computerSelector->dialog->21->1546",
+        "index.html->id_computerSelector->dialog->21->1548"
       ]
     },
     {
@@ -2703,7 +2729,7 @@
       "ru": "Добавить из файла сертификата",
       "zh-chs": "从证书文件添加",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->685"
+        "index.html->id_computerSelector->dialog->21->688"
       ]
     },
     {
@@ -2719,7 +2745,7 @@
       "ru": "Добавить из менеджера сертификатов",
       "zh-chs": "从证书管理器添加",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->684"
+        "index.html->id_computerSelector->dialog->21->687"
       ]
     },
     {
@@ -2735,7 +2761,7 @@
       "ru": "Добавить новый будильник",
       "zh-chs": "新增警报",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1521"
+        "index.html->id_computerSelector->dialog->21->1545"
       ]
     },
     {
@@ -2751,7 +2777,7 @@
       "ru": "Адрес",
       "zh-chs": "地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->637"
+        "index.html->id_computerSelector->dialog->21->640"
       ]
     },
     {
@@ -2767,7 +2793,7 @@
       "ru": "Адреса",
       "zh-chs": "地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1673"
+        "index.html->id_computerSelector->dialog->21->1697"
       ]
     },
     {
@@ -2783,11 +2809,11 @@
       "ru": "администратор",
       "zh-chs": "管理员",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1074",
-        "index.html->id_computerSelector->dialog->21->1077",
-        "index.html->id_computerSelector->dialog->21->1087",
-        "index.html->id_computerSelector->dialog->21->1096",
-        "index.html->id_computerSelector->dialog->21->1098"
+        "index.html->id_computerSelector->dialog->21->1095",
+        "index.html->id_computerSelector->dialog->21->1098",
+        "index.html->id_computerSelector->dialog->21->1108",
+        "index.html->id_computerSelector->dialog->21->1117",
+        "index.html->id_computerSelector->dialog->21->1119"
       ]
     },
     {
@@ -2803,7 +2829,7 @@
       "ru": "После пробуждения",
       "zh-chs": "醒后",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1530",
+        "index.html->id_computerSelector->dialog->21->1554",
         "index.html->id_computerSelector->dialog->dialog->5->dialog25->1->9->3"
       ]
     },
@@ -2902,7 +2928,7 @@
       "ru": "Аварийная сигнализация",
       "zh-chs": "报警",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1534"
+        "index.html->id_computerSelector->dialog->21->1558"
       ]
     },
     {
@@ -2934,7 +2960,7 @@
       "ru": "Тревога {0}",
       "zh-chs": "警报{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1533"
+        "index.html->id_computerSelector->dialog->21->1557"
       ]
     },
     {
@@ -2976,7 +3002,7 @@
       "ru": "Оповещение инициировано соединение",
       "zh-chs": "警报启动的连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1216"
+        "index.html->id_computerSelector->dialog->21->1237"
       ]
     },
     {
@@ -3005,7 +3031,7 @@
       "ru": "Все (локально и по сети)",
       "zh-chs": "全部（本地和网络）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1090"
+        "index.html->id_computerSelector->dialog->21->1111"
       ]
     },
     {
@@ -3021,7 +3047,7 @@
       "ru": "Все пакеты ARP",
       "zh-chs": "所有ARP数据包",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->802"
+        "index.html->id_computerSelector->dialog->21->805"
       ]
     },
     {
@@ -3037,9 +3063,9 @@
       "ru": "Все протокол Ethernet",
       "zh-chs": "所有以太网协议",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->820",
-        "index.html->id_computerSelector->dialog->21->824",
-        "index.html->id_computerSelector->dialog->21->862"
+        "index.html->id_computerSelector->dialog->21->823",
+        "index.html->id_computerSelector->dialog->21->827",
+        "index.html->id_computerSelector->dialog->21->865"
       ]
     },
     {
@@ -3055,8 +3081,8 @@
       "ru": "Весь Фокус",
       "zh-chs": "全部聚焦",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1141",
-        "index.html->id_computerSelector->dialog->21->1154"
+        "index.html->id_computerSelector->dialog->21->1162",
+        "index.html->id_computerSelector->dialog->21->1175"
       ]
     },
     {
@@ -3072,7 +3098,7 @@
       "ru": "Все IP-пакеты",
       "zh-chs": "所有IP数据包",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->801"
+        "index.html->id_computerSelector->dialog->21->804"
       ]
     },
     {
@@ -3088,7 +3114,7 @@
       "ru": "Все IP протокол",
       "zh-chs": "全IP协议",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->864"
+        "index.html->id_computerSelector->dialog->21->867"
       ]
     },
     {
@@ -3130,10 +3156,10 @@
       "ru": "Позволять",
       "zh-chs": "允许",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->808",
-        "index.html->id_computerSelector->dialog->21->850",
-        "index.html->id_computerSelector->dialog->21->882",
-        "index.html->id_computerSelector->dialog->21->898"
+        "index.html->id_computerSelector->dialog->21->811",
+        "index.html->id_computerSelector->dialog->21->853",
+        "index.html->id_computerSelector->dialog->21->885",
+        "index.html->id_computerSelector->dialog->21->901"
       ]
     },
     {
@@ -3149,8 +3175,8 @@
       "ru": "Разрешить, граф",
       "zh-chs": "允许，计数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->805",
-        "index.html->id_computerSelector->dialog->21->847"
+        "index.html->id_computerSelector->dialog->21->808",
+        "index.html->id_computerSelector->dialog->21->850"
       ]
     },
     {
@@ -3166,8 +3192,8 @@
       "ru": "Разрешить, граф",
       "zh-chs": "允许计数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->877",
-        "index.html->id_computerSelector->dialog->21->884"
+        "index.html->id_computerSelector->dialog->21->880",
+        "index.html->id_computerSelector->dialog->21->887"
       ]
     },
     {
@@ -3183,8 +3209,8 @@
       "ru": "Allow, граф, событие",
       "zh-chs": "允许，计数，事件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->879",
-        "index.html->id_computerSelector->dialog->21->886"
+        "index.html->id_computerSelector->dialog->21->882",
+        "index.html->id_computerSelector->dialog->21->889"
       ]
     },
     {
@@ -3232,7 +3258,7 @@
       "ru": "Альтернативный (F10 = ESC + 0)",
       "zh-chs": "备用（F10 = ESC + 0）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1117"
+        "index.html->id_computerSelector->dialog->21->1138"
       ]
     },
     {
@@ -3310,7 +3336,7 @@
       "ru": "Любой штат",
       "zh-chs": "任何国家",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->772"
+        "index.html->id_computerSelector->dialog->21->775"
       ]
     },
     {
@@ -3326,7 +3352,7 @@
       "ru": "Приложение",
       "zh-chs": "应用程式",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1493"
+        "index.html->id_computerSelector->dialog->21->1517"
       ]
     },
     {
@@ -3342,9 +3368,9 @@
       "ru": "заявка",
       "zh-chs": "应用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1480",
-        "index.html->id_computerSelector->dialog->21->638",
-        "index.html->id_computerSelector->dialog->21->760"
+        "index.html->id_computerSelector->dialog->21->1504",
+        "index.html->id_computerSelector->dialog->21->641",
+        "index.html->id_computerSelector->dialog->21->763"
       ]
     },
     {
@@ -3360,7 +3386,7 @@
       "ru": "Имя приложения",
       "zh-chs": "应用名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1494"
+        "index.html->id_computerSelector->dialog->21->1518"
       ]
     },
     {
@@ -3376,7 +3402,7 @@
       "ru": "Применение новых настроек безопасности ...",
       "zh-chs": "正在应用新的安全设置...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->738"
+        "index.html->id_computerSelector->dialog->21->741"
       ]
     },
     {
@@ -3392,7 +3418,7 @@
       "ru": "аргументы",
       "zh-chs": "争论",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->592"
+        "index.html->id_computerSelector->dialog->21->595"
       ]
     },
     {
@@ -3408,8 +3434,8 @@
       "ru": "Тег актива",
       "zh-chs": "资产标签",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1021",
-        "index.html->id_computerSelector->dialog->21->1042"
+        "index.html->id_computerSelector->dialog->21->1042",
+        "index.html->id_computerSelector->dialog->21->1063"
       ]
     },
     {
@@ -3425,7 +3451,7 @@
       "ru": "Необходимо выбрать хотя бы один файл образа диска.",
       "zh-chs": "必须至少选择一个磁盘映像文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1190"
+        "index.html->id_computerSelector->dialog->21->1211"
       ]
     },
     {
@@ -3444,7 +3470,7 @@
       "ru": "Аудит Событие №",
       "zh-chs": "审核事件编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->643"
+        "index.html->id_computerSelector->dialog->21->646"
       ]
     },
     {
@@ -3460,8 +3486,8 @@
       "ru": "Аудит Журнал",
       "zh-chs": "审核日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->632",
-        "index.html->id_computerSelector->dialog->21->633",
+        "index.html->id_computerSelector->dialog->21->635",
+        "index.html->id_computerSelector->dialog->21->636",
         "index.html->id_computerSelector->id_mainview->id_leftbar->go15->0",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p15->3"
       ]
@@ -3479,7 +3505,7 @@
       "ru": "Настройки журнала аудита",
       "zh-chs": "审核日志设置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->611"
+        "index.html->id_computerSelector->dialog->21->614"
       ]
     },
     {
@@ -3495,7 +3521,7 @@
       "ru": "аудитор,",
       "zh-chs": "审核员",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1073"
+        "index.html->id_computerSelector->dialog->21->1094"
       ]
     },
     {
@@ -3530,7 +3556,7 @@
     {
       "en": "Authentic CSME",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->522"
+        "index.html->id_computerSelector->dialog->21->525"
       ]
     },
     {
@@ -3549,8 +3575,9 @@
         "index.html->id_computerSelector->dialog->21->224",
         "index.html->id_computerSelector->dialog->21->226",
         "index.html->id_computerSelector->dialog->21->228",
-        "index.html->id_computerSelector->dialog->21->589",
-        "index.html->id_computerSelector->dialog->21->939",
+        "index.html->id_computerSelector->dialog->21->592",
+        "index.html->id_computerSelector->dialog->21->943",
+        "index.html->id_computerSelector->dialog->21->946",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->9->3"
       ]
     },
@@ -3567,8 +3594,8 @@
       "ru": "Ошибка аутентификации",
       "zh-chs": "授权错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1690",
-        "index.html->id_computerSelector->dialog->21->1699"
+        "index.html->id_computerSelector->dialog->21->1714",
+        "index.html->id_computerSelector->dialog->21->1723"
       ]
     },
     {
@@ -3584,8 +3611,8 @@
       "ru": "Тип аутентификации",
       "zh-chs": "认证类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1259",
-        "index.html->id_computerSelector->dialog->21->1262"
+        "index.html->id_computerSelector->dialog->21->1280",
+        "index.html->id_computerSelector->dialog->21->1283"
       ]
     },
     {
@@ -3614,7 +3641,7 @@
       "ru": "Тип аутентификации",
       "zh-chs": "认证方式",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1294"
+        "index.html->id_computerSelector->dialog->21->1315"
       ]
     },
     {
@@ -3649,7 +3676,7 @@
       "ru": "Автоматическая настройка с использованием DHCP-сервера",
       "zh-chs": "使用DHCP服务器自动配置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1348"
+        "index.html->id_computerSelector->dialog->21->1369"
       ]
     },
     {
@@ -3665,7 +3692,7 @@
       "ru": "Автоматически с использованием DHCP-сервера",
       "zh-chs": "自动使用DHCP服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->488"
+        "index.html->id_computerSelector->dialog->21->491"
       ]
     },
     {
@@ -3697,7 +3724,7 @@
       "ru": "BIOS",
       "zh-chs": "的BIOS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1023"
+        "index.html->id_computerSelector->dialog->21->1044"
       ]
     },
     {
@@ -3713,7 +3740,7 @@
       "ru": "BIOS и ОС включены",
       "zh-chs": "启用BIOS和操作系统",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1208"
+        "index.html->id_computerSelector->dialog->21->1229"
       ]
     },
     {
@@ -3729,7 +3756,7 @@
       "ru": "Процесс загрузки BIOS",
       "zh-chs": "BIOS引导过程",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->759"
+        "index.html->id_computerSelector->dialog->21->762"
       ]
     },
     {
@@ -3751,7 +3778,7 @@
     {
       "en": "BIOS Reload of Golden Configuration",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1407"
+        "index.html->id_computerSelector->dialog->21->1429"
       ]
     },
     {
@@ -3783,7 +3810,7 @@
       "ru": "BIOS включен",
       "zh-chs": "启用BIOS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1206"
+        "index.html->id_computerSelector->dialog->21->1227"
       ]
     },
     {
@@ -3815,7 +3842,7 @@
       "ru": "BRAM",
       "zh-chs": "内存",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->974"
+        "index.html->id_computerSelector->dialog->21->995"
       ]
     },
     {
@@ -3848,7 +3875,7 @@
       "ru": "Банк Метка",
       "zh-chs": "银行标签",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1035"
+        "index.html->id_computerSelector->dialog->21->1056"
       ]
     },
     {
@@ -3864,13 +3891,13 @@
       "ru": "плинтус",
       "zh-chs": "踢脚线",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1016"
+        "index.html->id_computerSelector->dialog->21->1037"
       ]
     },
     {
       "en": "Battery",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1049"
+        "index.html->id_computerSelector->dialog->21->1070"
       ]
     },
     {
@@ -3886,7 +3913,7 @@
       "ru": "Бинарный файл,",
       "zh-chs": "二进制文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1544"
+        "index.html->id_computerSelector->dialog->21->1568"
       ]
     },
     {
@@ -3902,7 +3929,7 @@
       "ru": "Пустой экран",
       "zh-chs": "黑屏",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->23->idx_d24Verbocity->idx_d24Verbocity3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->25->idx_d24Verbocity->idx_d24Verbocity3",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->4->1->25->id_DeskSBspan"
       ]
     },
@@ -3919,23 +3946,23 @@
       "ru": "Действие загрузки: ",
       "zh-chs": "开机动作：",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1449"
+        "index.html->id_computerSelector->dialog->21->1473"
       ]
     },
     {
       "en": "Boot Features",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1317",
+        "index.html->id_computerSelector->dialog->21->1338",
         "index.html->id_computerSelector->dialog->21->439"
       ]
     },
     {
       "en": "Boot Features Error",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1318",
-        "index.html->id_computerSelector->dialog->21->1319",
-        "index.html->id_computerSelector->dialog->21->1320",
-        "index.html->id_computerSelector->dialog->21->1322"
+        "index.html->id_computerSelector->dialog->21->1339",
+        "index.html->id_computerSelector->dialog->21->1340",
+        "index.html->id_computerSelector->dialog->21->1341",
+        "index.html->id_computerSelector->dialog->21->1343"
       ]
     },
     {
@@ -4066,7 +4093,7 @@
       "ru": "браузер",
       "zh-chs": "浏览器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1104"
+        "index.html->id_computerSelector->dialog->21->1125"
       ]
     },
     {
@@ -4189,7 +4216,7 @@
       "ru": "CCMP-AES",
       "zh-chs": "认证协议",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->924",
+        "index.html->id_computerSelector->dialog->21->928",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->11->idx_d12enc->id_d12e4"
       ]
     },
@@ -4206,7 +4233,7 @@
       "ru": "CDRAM",
       "zh-chs": "记忆体",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->967"
+        "index.html->id_computerSelector->dialog->21->988"
       ]
     },
     {
@@ -4222,7 +4249,7 @@
       "ru": "CDROM (.iso)",
       "zh-chs": "光盘（.iso）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1183"
+        "index.html->id_computerSelector->dialog->21->1204"
       ]
     },
     {
@@ -4254,8 +4281,8 @@
       "ru": "CILA - Внутренний",
       "zh-chs": "CILA-内部",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1234",
-        "index.html->id_computerSelector->dialog->21->1239"
+        "index.html->id_computerSelector->dialog->21->1255",
+        "index.html->id_computerSelector->dialog->21->1260"
       ]
     },
     {
@@ -4287,8 +4314,8 @@
       "ru": "CIRA - Внешний",
       "zh-chs": "CIRA-外部",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1233",
-        "index.html->id_computerSelector->dialog->21->1238"
+        "index.html->id_computerSelector->dialog->21->1254",
+        "index.html->id_computerSelector->dialog->21->1259"
       ]
     },
     {
@@ -4321,7 +4348,7 @@
       "ru": "CR + LF",
       "zh-chs": "CR +低频",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1120",
+        "index.html->id_computerSelector->dialog->21->1141",
         "index.html->id_computerSelector->dialog->21->7",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p13->13->1->4->1->1"
       ]
@@ -4329,8 +4356,8 @@
     {
       "en": "CRL ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->516",
-        "index.html->id_computerSelector->dialog->21->520"
+        "index.html->id_computerSelector->dialog->21->519",
+        "index.html->id_computerSelector->dialog->21->523"
       ]
     },
     {
@@ -4339,7 +4366,7 @@
     {
       "en": "CSME Unconfigure",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1408"
+        "index.html->id_computerSelector->dialog->21->1430"
       ]
     },
     {
@@ -4355,7 +4382,7 @@
       "ru": "Кэш-память",
       "zh-chs": "缓存DRAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->956"
+        "index.html->id_computerSelector->dialog->21->977"
       ]
     },
     {
@@ -4371,7 +4398,7 @@
       "ru": "Ошибка вызова",
       "zh-chs": "通话错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1702"
+        "index.html->id_computerSelector->dialog->21->1726"
       ]
     },
     {
@@ -4416,16 +4443,16 @@
       "ru": "сертификат",
       "zh-chs": "证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1292",
-        "index.html->id_computerSelector->dialog->21->1297",
-        "index.html->id_computerSelector->dialog->21->1578",
+        "index.html->id_computerSelector->dialog->21->1313",
+        "index.html->id_computerSelector->dialog->21->1318",
+        "index.html->id_computerSelector->dialog->21->1602",
         "index.html->id_computerSelector->dialog->21->293",
         "index.html->id_computerSelector->dialog->21->296",
-        "index.html->id_computerSelector->dialog->21->670",
         "index.html->id_computerSelector->dialog->21->673",
-        "index.html->id_computerSelector->dialog->21->688",
-        "index.html->id_computerSelector->dialog->21->698",
-        "index.html->id_computerSelector->dialog->21->730"
+        "index.html->id_computerSelector->dialog->21->676",
+        "index.html->id_computerSelector->dialog->21->691",
+        "index.html->id_computerSelector->dialog->21->701",
+        "index.html->id_computerSelector->dialog->21->733"
       ]
     },
     {
@@ -4441,9 +4468,9 @@
       "ru": "Сертификат -",
       "zh-chs": "证书 -",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1591",
+        "index.html->id_computerSelector->dialog->21->1615",
         "index.html->id_computerSelector->dialog->21->258",
-        "index.html->id_computerSelector->dialog->21->682"
+        "index.html->id_computerSelector->dialog->21->685"
       ]
     },
     {
@@ -4459,7 +4486,7 @@
       "ru": "Сертификат / Mutual-Auth TLS",
       "zh-chs": "证书/相互认证TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1263"
+        "index.html->id_computerSelector->dialog->21->1284"
       ]
     },
     {
@@ -4475,10 +4502,10 @@
       "ru": "Файл сертификата",
       "zh-chs": "证书文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1621",
-        "index.html->id_computerSelector->dialog->21->1623",
-        "index.html->id_computerSelector->dialog->21->1625",
-        "index.html->id_computerSelector->dialog->21->1627"
+        "index.html->id_computerSelector->dialog->21->1645",
+        "index.html->id_computerSelector->dialog->21->1647",
+        "index.html->id_computerSelector->dialog->21->1649",
+        "index.html->id_computerSelector->dialog->21->1651"
       ]
     },
     {
@@ -4530,7 +4557,7 @@
       "ru": "Название сертификата",
       "zh-chs": "证书名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1264"
+        "index.html->id_computerSelector->dialog->21->1285"
       ]
     },
     {
@@ -4546,8 +4573,8 @@
       "ru": "Пароль сертификата",
       "zh-chs": "证书密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1595",
-        "index.html->id_computerSelector->dialog->21->1620"
+        "index.html->id_computerSelector->dialog->21->1619",
+        "index.html->id_computerSelector->dialog->21->1644"
       ]
     },
     {
@@ -4579,10 +4606,10 @@
       "ru": "Сертификат Тема",
       "zh-chs": "证书科目",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1588",
+        "index.html->id_computerSelector->dialog->21->1612",
         "index.html->id_computerSelector->dialog->21->255",
         "index.html->id_computerSelector->dialog->21->307",
-        "index.html->id_computerSelector->dialog->21->680"
+        "index.html->id_computerSelector->dialog->21->683"
       ]
     },
     {
@@ -4598,7 +4625,7 @@
       "ru": "Использование сертификата",
       "zh-chs": "证书用法",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1587",
+        "index.html->id_computerSelector->dialog->21->1611",
         "index.html->id_computerSelector->dialog->21->306"
       ]
     },
@@ -4615,7 +4642,7 @@
       "ru": "Использование сертификата",
       "zh-chs": "证书用法",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->705"
+        "index.html->id_computerSelector->dialog->21->708"
       ]
     },
     {
@@ -4631,9 +4658,9 @@
       "ru": "Файл сертификата",
       "zh-chs": "证书文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->687",
-        "index.html->id_computerSelector->dialog->21->689",
-        "index.html->id_computerSelector->dialog->21->696"
+        "index.html->id_computerSelector->dialog->21->690",
+        "index.html->id_computerSelector->dialog->21->692",
+        "index.html->id_computerSelector->dialog->21->699"
       ]
     },
     {
@@ -4649,8 +4676,8 @@
       "ru": "Пароль сертификата",
       "zh-chs": "证书密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->697",
-        "index.html->id_computerSelector->dialog->21->699"
+        "index.html->id_computerSelector->dialog->21->700",
+        "index.html->id_computerSelector->dialog->21->702"
       ]
     },
     {
@@ -4666,7 +4693,7 @@
       "ru": "Тип сертификата",
       "zh-chs": "证书类别",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->692"
+        "index.html->id_computerSelector->dialog->21->695"
       ]
     },
     {
@@ -4699,14 +4726,14 @@
       "ru": "Цепной сертификат",
       "zh-chs": "连锁证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->691"
+        "index.html->id_computerSelector->dialog->21->694"
       ]
     },
     {
       "en": "Change Boot Order",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1455",
-        "index.html->id_computerSelector->dialog->21->1461"
+        "index.html->id_computerSelector->dialog->21->1479",
+        "index.html->id_computerSelector->dialog->21->1485"
       ]
     },
     {
@@ -4748,7 +4775,7 @@
     {
       "en": "Checking boot sources...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1401"
+        "index.html->id_computerSelector->dialog->21->1420"
       ]
     },
     {
@@ -4764,7 +4791,7 @@
       "ru": "Проверка возможностей ...",
       "zh-chs": "正在检查功能...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1355"
+        "index.html->id_computerSelector->dialog->21->1376"
       ]
     },
     {
@@ -4780,10 +4807,10 @@
       "ru": "Проверка состояния ...",
       "zh-chs": "正在检查状态...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1413",
-        "index.html->id_computerSelector->dialog->21->1417",
-        "index.html->id_computerSelector->dialog->21->1425",
-        "index.html->id_computerSelector->dialog->21->1446"
+        "index.html->id_computerSelector->dialog->21->1437",
+        "index.html->id_computerSelector->dialog->21->1441",
+        "index.html->id_computerSelector->dialog->21->1449",
+        "index.html->id_computerSelector->dialog->21->1470"
       ]
     },
     {
@@ -4815,7 +4842,7 @@
       "ru": "чип",
       "zh-chs": "芯片",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->987"
+        "index.html->id_computerSelector->dialog->21->1008"
       ]
     },
     {
@@ -4850,7 +4877,7 @@
     {
       "en": "Clear BIOS NVM Variables",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1406"
+        "index.html->id_computerSelector->dialog->21->1428"
       ]
     },
     {
@@ -4872,10 +4899,10 @@
       "ru": "Очистить журнал",
       "zh-chs": "清除日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->547",
-        "index.html->id_computerSelector->dialog->21->549",
-        "index.html->id_computerSelector->dialog->21->620",
-        "index.html->id_computerSelector->dialog->21->623"
+        "index.html->id_computerSelector->dialog->21->550",
+        "index.html->id_computerSelector->dialog->21->552",
+        "index.html->id_computerSelector->dialog->21->623",
+        "index.html->id_computerSelector->dialog->21->626"
       ]
     },
     {
@@ -4891,7 +4918,7 @@
       "ru": "Очистить журнал аудита?",
       "zh-chs": "清除审核日志？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->631"
+        "index.html->id_computerSelector->dialog->21->634"
       ]
     },
     {
@@ -4907,7 +4934,7 @@
       "ru": "Очистить журнал событий?",
       "zh-chs": "清除事件日志？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->553"
+        "index.html->id_computerSelector->dialog->21->556"
       ]
     },
     {
@@ -4932,6 +4959,13 @@
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p20->3->3"
       ]
     },
+    {
+      "en": "Client Certificate",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12clientcertdiv->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27clientcertdiv->3"
+      ]
+    },
     {
       "en": "Client control mode activation not allowed",
       "xloc": [
@@ -4951,7 +4985,7 @@
       "ru": "буфер обмена",
       "zh-chs": "剪贴板",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1162",
+        "index.html->id_computerSelector->dialog->21->1183",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->4->1"
       ]
     },
@@ -4985,10 +5019,10 @@
       "ru": "Подписание кода",
       "zh-chs": "代码签名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1580",
-        "index.html->id_computerSelector->dialog->21->1615",
+        "index.html->id_computerSelector->dialog->21->1604",
+        "index.html->id_computerSelector->dialog->21->1639",
         "index.html->id_computerSelector->dialog->21->299",
-        "index.html->id_computerSelector->dialog->21->709"
+        "index.html->id_computerSelector->dialog->21->712"
       ]
     },
     {
@@ -5004,7 +5038,7 @@
       "ru": "Разделенный запятыми список общих имен сертификатов, которым будет разрешено удаленное подключение.",
       "zh-chs": "逗号分隔的证书通用名称列表，将允许它们远程连接。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->731"
+        "index.html->id_computerSelector->dialog->21->734"
       ]
     },
     {
@@ -5037,11 +5071,11 @@
       "ru": "Распространенное имя",
       "zh-chs": "通用名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1258",
-        "index.html->id_computerSelector->dialog->21->1600",
-        "index.html->id_computerSelector->dialog->21->1605",
-        "index.html->id_computerSelector->dialog->21->661",
-        "index.html->id_computerSelector->dialog->21->701"
+        "index.html->id_computerSelector->dialog->21->1279",
+        "index.html->id_computerSelector->dialog->21->1624",
+        "index.html->id_computerSelector->dialog->21->1629",
+        "index.html->id_computerSelector->dialog->21->664",
+        "index.html->id_computerSelector->dialog->21->704"
       ]
     },
     {
@@ -5129,7 +5163,7 @@
       "ru": "Имя компьютера",
       "zh-chs": "电脑名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1308"
+        "index.html->id_computerSelector->dialog->21->1329"
       ]
     },
     {
@@ -5145,7 +5179,7 @@
       "ru": "Компьютерная модель",
       "zh-chs": "电脑型号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1011"
+        "index.html->id_computerSelector->dialog->21->1032"
       ]
     },
     {
@@ -5198,7 +5232,7 @@
       "ru": "Подтвердите Пароль",
       "zh-chs": "确认密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->15->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->3->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog18->d18showpassword->3->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog2->7->1"
       ]
@@ -5206,7 +5240,7 @@
     {
       "en": "Confirm execution of Intel&reg; Remote Platform Erase?",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1402"
+        "index.html->id_computerSelector->dialog->21->1421"
       ]
     },
     {
@@ -5222,7 +5256,7 @@
       "ru": "Подтвердить выполнение Intel&reg; Remote Secure Erase?",
       "zh-chs": "确认执行Intel&reg;远程安全擦除？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1394"
+        "index.html->id_computerSelector->dialog->21->1413"
       ]
     },
     {
@@ -5238,7 +5272,7 @@
       "ru": "Подтвердить удаление всех будильников?",
       "zh-chs": "确认删除所有唤醒警报？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1520"
+        "index.html->id_computerSelector->dialog->21->1544"
       ]
     },
     {
@@ -5254,8 +5288,8 @@
       "ru": "Connect",
       "zh-chs": "连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1107",
-        "index.html->id_computerSelector->dialog->21->1127",
+        "index.html->id_computerSelector->dialog->21->1128",
+        "index.html->id_computerSelector->dialog->21->1148",
         "index.html->id_computerSelector->dialog->21->156",
         "index.html->id_computerSelector->dialog->21->203",
         "index.html->id_computerSelector->dialog->21->212",
@@ -5385,8 +5419,8 @@
       "ru": "Тип соединения",
       "zh-chs": "连接类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1277",
-        "index.html->id_computerSelector->dialog->21->1289"
+        "index.html->id_computerSelector->dialog->21->1298",
+        "index.html->id_computerSelector->dialog->21->1310"
       ]
     },
     {
@@ -5466,7 +5500,7 @@
       "ru": "Потребляемый",
       "zh-chs": "已消耗",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1644"
+        "index.html->id_computerSelector->dialog->21->1668"
       ]
     },
     {
@@ -5514,10 +5548,10 @@
       "ru": "Страна",
       "zh-chs": "国家",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1603",
-        "index.html->id_computerSelector->dialog->21->1608",
-        "index.html->id_computerSelector->dialog->21->667",
-        "index.html->id_computerSelector->dialog->21->704"
+        "index.html->id_computerSelector->dialog->21->1627",
+        "index.html->id_computerSelector->dialog->21->1632",
+        "index.html->id_computerSelector->dialog->21->670",
+        "index.html->id_computerSelector->dialog->21->707"
       ]
     },
     {
@@ -5533,7 +5567,7 @@
       "ru": "Создать корневой сертификат",
       "zh-chs": "创建根证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1604"
+        "index.html->id_computerSelector->dialog->21->1628"
       ]
     },
     {
@@ -5565,7 +5599,7 @@
       "ru": "Создать новый файл Setup.bin",
       "zh-chs": "创建新的Setup.bin文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1629"
+        "index.html->id_computerSelector->dialog->21->1653"
       ]
     },
     {
@@ -5686,7 +5720,7 @@
       "ru": "Текущее состояние",
       "zh-chs": "当前状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->775"
+        "index.html->id_computerSelector->dialog->21->778"
       ]
     },
     {
@@ -5708,7 +5742,7 @@
       "ru": "Custom Power Action",
       "zh-chs": "自定义电源动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1418"
+        "index.html->id_computerSelector->dialog->21->1442"
       ]
     },
     {
@@ -5724,7 +5758,7 @@
       "ru": "Пользовательское действие ...",
       "zh-chs": "自定义动作...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1382"
+        "index.html->id_computerSelector->dialog->21->1403"
       ]
     },
     {
@@ -5756,7 +5790,7 @@
       "ru": "Папа в процессе",
       "zh-chs": "DAD正在进行中",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1330"
+        "index.html->id_computerSelector->dialog->21->1351"
       ]
     },
     {
@@ -5772,7 +5806,7 @@
       "ru": "DDR",
       "zh-chs": "DDR",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->972"
+        "index.html->id_computerSelector->dialog->21->993"
       ]
     },
     {
@@ -5788,7 +5822,7 @@
       "ru": "DDR-2",
       "zh-chs": "DDR-2",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->973"
+        "index.html->id_computerSelector->dialog->21->994"
       ]
     },
     {
@@ -5804,7 +5838,7 @@
       "ru": "DDR3",
       "zh-chs": "DDR3",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->976"
+        "index.html->id_computerSelector->dialog->21->997"
       ]
     },
     {
@@ -5820,7 +5854,7 @@
       "ru": "DDR4",
       "zh-chs": "DDR4",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->978"
+        "index.html->id_computerSelector->dialog->21->999"
       ]
     },
     {
@@ -5849,7 +5883,7 @@
       "ru": "DIMM",
       "zh-chs": "内存条",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->991"
+        "index.html->id_computerSelector->dialog->21->1012"
       ]
     },
     {
@@ -5865,7 +5899,7 @@
       "ru": "DIP",
       "zh-chs": "蘸",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->988"
+        "index.html->id_computerSelector->dialog->21->1009"
       ]
     },
     {
@@ -5881,7 +5915,7 @@
       "ru": "DNS suffex",
       "zh-chs": "DNS后缀",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1269"
+        "index.html->id_computerSelector->dialog->21->1290"
       ]
     },
     {
@@ -5897,7 +5931,7 @@
       "ru": "DNS-суффикс",
       "zh-chs": "DNS后缀",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1279"
+        "index.html->id_computerSelector->dialog->21->1300"
       ]
     },
     {
@@ -5913,7 +5947,7 @@
       "ru": "динамическое ОЗУ",
       "zh-chs": "记忆体",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->954"
+        "index.html->id_computerSelector->dialog->21->975"
       ]
     },
     {
@@ -5929,7 +5963,7 @@
       "ru": "Данные",
       "zh-chs": "数据",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->563"
+        "index.html->id_computerSelector->dialog->21->566"
       ]
     },
     {
@@ -5945,7 +5979,7 @@
       "ru": "Строка данных",
       "zh-chs": "资料字串",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->642"
+        "index.html->id_computerSelector->dialog->21->645"
       ]
     },
     {
@@ -5961,7 +5995,7 @@
       "ru": "Значения данных",
       "zh-chs": "数据值",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->641"
+        "index.html->id_computerSelector->dialog->21->644"
       ]
     },
     {
@@ -5977,7 +6011,7 @@
       "ru": "DataChannel",
       "zh-chs": "数据通道",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1126"
+        "index.html->id_computerSelector->dialog->21->1147"
       ]
     },
     {
@@ -6034,7 +6068,7 @@
       "ru": "Выделенный, отличается от ОС",
       "zh-chs": "专用，不同于OS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1306"
+        "index.html->id_computerSelector->dialog->21->1327"
       ]
     },
     {
@@ -6066,7 +6100,7 @@
       "ru": "Политика по умолчанию",
       "zh-chs": "默认策略",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->831"
+        "index.html->id_computerSelector->dialog->21->834"
       ]
     },
     {
@@ -6082,7 +6116,7 @@
       "ru": "Действие RX по умолчанию",
       "zh-chs": "默认接收动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->902"
+        "index.html->id_computerSelector->dialog->21->905"
       ]
     },
     {
@@ -6098,8 +6132,8 @@
       "ru": "Политика защиты системы по умолчанию",
       "zh-chs": "默认系统防御策略",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->832",
-        "index.html->id_computerSelector->dialog->21->834"
+        "index.html->id_computerSelector->dialog->21->835",
+        "index.html->id_computerSelector->dialog->21->837"
       ]
     },
     {
@@ -6115,7 +6149,7 @@
       "ru": "TX / RX по умолчанию",
       "zh-chs": "默认发送/接收",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->888"
+        "index.html->id_computerSelector->dialog->21->891"
       ]
     },
     {
@@ -6131,7 +6165,7 @@
       "ru": "Действие TX по умолчанию",
       "zh-chs": "默认发送动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->901"
+        "index.html->id_computerSelector->dialog->21->904"
       ]
     },
     {
@@ -6147,7 +6181,7 @@
       "ru": "Проводная политика по умолчанию",
       "zh-chs": "默认有线策略",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->811"
+        "index.html->id_computerSelector->dialog->21->814"
       ]
     },
     {
@@ -6163,7 +6197,7 @@
       "ru": "Действие по умолчанию для входящего трафика",
       "zh-chs": "对入站流量采取的默认操作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->881"
+        "index.html->id_computerSelector->dialog->21->884"
       ]
     },
     {
@@ -6179,7 +6213,7 @@
       "ru": "Действие по умолчанию для исходящего трафика",
       "zh-chs": "对出站流量采取的默认操作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->875"
+        "index.html->id_computerSelector->dialog->21->878"
       ]
     },
     {
@@ -6195,7 +6229,7 @@
       "ru": "Дисплей по умолчанию",
       "zh-chs": "默认显示",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->528"
+        "index.html->id_computerSelector->dialog->21->531"
       ]
     },
     {
@@ -6228,8 +6262,8 @@
       "zh-chs": "递延",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->429",
-        "index.html->id_computerSelector->dialog->21->602",
-        "index.html->id_computerSelector->dialog->21->750"
+        "index.html->id_computerSelector->dialog->21->605",
+        "index.html->id_computerSelector->dialog->21->753"
       ]
     },
     {
@@ -6245,8 +6279,8 @@
       "ru": "удалять",
       "zh-chs": "删除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1170",
-        "index.html->id_computerSelector->dialog->21->1543",
+        "index.html->id_computerSelector->dialog->21->1191",
+        "index.html->id_computerSelector->dialog->21->1567",
         "index.html->id_computerSelector->dialog->dialog->7->5",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3"
       ]
@@ -6264,7 +6298,7 @@
       "ru": "Удалить 1 сертификат?",
       "zh-chs": "删除1个证书？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1597"
+        "index.html->id_computerSelector->dialog->21->1621"
       ]
     },
     {
@@ -6280,7 +6314,7 @@
       "ru": "Удалить действия ...",
       "zh-chs": "删除动作...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->769"
+        "index.html->id_computerSelector->dialog->21->772"
       ]
     },
     {
@@ -6296,7 +6330,7 @@
       "ru": "Удалить будильник",
       "zh-chs": "删除警报",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1531"
+        "index.html->id_computerSelector->dialog->21->1555"
       ]
     },
     {
@@ -6312,8 +6346,8 @@
       "ru": "Удалить сертификаты",
       "zh-chs": "删除证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1596",
-        "index.html->id_computerSelector->dialog->21->1598"
+        "index.html->id_computerSelector->dialog->21->1620",
+        "index.html->id_computerSelector->dialog->21->1622"
       ]
     },
     {
@@ -6346,7 +6380,7 @@
       "ru": "Удалить сторожевые действия",
       "zh-chs": "删除看门狗动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->797"
+        "index.html->id_computerSelector->dialog->21->800"
       ]
     },
     {
@@ -6362,7 +6396,7 @@
       "ru": "Удалить все действия для этого сторожевого таймера?",
       "zh-chs": "删除此看门狗的所有操作？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->798"
+        "index.html->id_computerSelector->dialog->21->801"
       ]
     },
     {
@@ -6410,7 +6444,7 @@
       "ru": "Удалить {0} сертификатов?",
       "zh-chs": "删除{0}个证书？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1599"
+        "index.html->id_computerSelector->dialog->21->1623"
       ]
     },
     {
@@ -6442,7 +6476,7 @@
       "ru": "Режим доставки",
       "zh-chs": "投放方式",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->580"
+        "index.html->id_computerSelector->dialog->21->583"
       ]
     },
     {
@@ -6506,21 +6540,21 @@
       "ru": "Описание",
       "zh-chs": "描述",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->552",
-        "index.html->id_computerSelector->dialog->21->559",
-        "index.html->id_computerSelector->dialog->21->773"
+        "index.html->id_computerSelector->dialog->21->555",
+        "index.html->id_computerSelector->dialog->21->562",
+        "index.html->id_computerSelector->dialog->21->776"
       ]
     },
     {
       "en": "Design capacity",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1063"
+        "index.html->id_computerSelector->dialog->21->1084"
       ]
     },
     {
       "en": "Design voltage",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1065"
+        "index.html->id_computerSelector->dialog->21->1086"
       ]
     },
     {
@@ -6569,7 +6603,7 @@
       "ru": "Пункт назначения",
       "zh-chs": "目的地",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->578"
+        "index.html->id_computerSelector->dialog->21->581"
       ]
     },
     {
@@ -6585,7 +6619,7 @@
       "ru": "Адрес устройства",
       "zh-chs": "设备地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->560"
+        "index.html->id_computerSelector->dialog->21->563"
       ]
     },
     {
@@ -6607,7 +6641,7 @@
     {
       "en": "Device name",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1058"
+        "index.html->id_computerSelector->dialog->21->1079"
       ]
     },
     {
@@ -6623,7 +6657,7 @@
       "ru": "Идентификатор устройства",
       "zh-chs": "设备ID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->784"
+        "index.html->id_computerSelector->dialog->21->787"
       ]
     },
     {
@@ -6671,7 +6705,7 @@
       "ru": "дайджест",
       "zh-chs": "消化",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->588"
+        "index.html->id_computerSelector->dialog->21->591"
       ]
     },
     {
@@ -6808,8 +6842,8 @@
       "ru": "направление",
       "zh-chs": "方向",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->846",
-        "index.html->id_computerSelector->dialog->21->868"
+        "index.html->id_computerSelector->dialog->21->849",
+        "index.html->id_computerSelector->dialog->21->871"
       ]
     },
     {
@@ -6825,26 +6859,30 @@
       "ru": "Отключено",
       "zh-chs": "残障人士",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1094",
-        "index.html->id_computerSelector->dialog->21->1205",
-        "index.html->id_computerSelector->dialog->21->1209",
+        "index.html->id_computerSelector->dialog->21->1115",
+        "index.html->id_computerSelector->dialog->21->1226",
+        "index.html->id_computerSelector->dialog->21->1230",
         "index.html->id_computerSelector->dialog->21->424",
         "index.html->id_computerSelector->dialog->21->452",
         "index.html->id_computerSelector->dialog->21->477",
         "index.html->id_computerSelector->dialog->21->480",
         "index.html->id_computerSelector->dialog->21->484",
-        "index.html->id_computerSelector->dialog->21->496",
-        "index.html->id_computerSelector->dialog->21->535",
-        "index.html->id_computerSelector->dialog->21->597",
-        "index.html->id_computerSelector->dialog->21->605",
-        "index.html->id_computerSelector->dialog->21->645",
-        "index.html->id_computerSelector->dialog->21->745",
-        "index.html->id_computerSelector->dialog->21->907",
-        "index.html->id_computerSelector->dialog->21->932",
+        "index.html->id_computerSelector->dialog->21->488",
+        "index.html->id_computerSelector->dialog->21->499",
+        "index.html->id_computerSelector->dialog->21->538",
+        "index.html->id_computerSelector->dialog->21->600",
+        "index.html->id_computerSelector->dialog->21->608",
+        "index.html->id_computerSelector->dialog->21->648",
+        "index.html->id_computerSelector->dialog->21->748",
+        "index.html->id_computerSelector->dialog->21->910",
+        "index.html->id_computerSelector->dialog->21->936",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12activeins0div->idx_d12activeins0->3",
         "index.html->id_computerSelector->dialog->dialog->5->dialog20",
         "index.html->id_computerSelector->dialog->dialog->5->dialog23->3->idx_d23ddns->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog26->7",
         "index.html->id_computerSelector->dialog->dialog->5->dialog26->d26rpediv->5",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->3->idx_d27enabled->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27activeins0div->idx_d27activeins0->3",
         "index.html->id_computerSelector->dialog->dialog->5->dialog7->d7decimationspan->d7decimation->1"
       ]
     },
@@ -6861,7 +6899,7 @@
       "ru": "Отключено BIOS (ошибка POST)",
       "zh-chs": "被BIOS禁用（POST错误）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->949"
+        "index.html->id_computerSelector->dialog->21->970"
       ]
     },
     {
@@ -6877,7 +6915,7 @@
       "ru": "Отключено пользователем",
       "zh-chs": "被用户禁用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->948"
+        "index.html->id_computerSelector->dialog->21->969"
       ]
     },
     {
@@ -6893,7 +6931,7 @@
       "ru": "Отключено,",
       "zh-chs": "残疾人",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1071"
+        "index.html->id_computerSelector->dialog->21->1092"
       ]
     },
     {
@@ -6925,7 +6963,7 @@
       "ru": "Отключено, рекомендуется",
       "zh-chs": "禁用，推荐",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->531"
+        "index.html->id_computerSelector->dialog->21->534"
       ]
     },
     {
@@ -6942,8 +6980,8 @@
       "zh-chs": "断开",
       "xloc": [
         "index.html->id_computerSelector->9->1->0->idx_disconnectMeshCentralButton",
-        "index.html->id_computerSelector->dialog->21->1108",
-        "index.html->id_computerSelector->dialog->21->1128",
+        "index.html->id_computerSelector->dialog->21->1129",
+        "index.html->id_computerSelector->dialog->21->1149",
         "index.html->id_computerSelector->dialog->21->151",
         "index.html->id_computerSelector->dialog->21->60",
         "index.html->id_computerSelector->dialog->21->64",
@@ -7032,7 +7070,15 @@
       "ru": "Ничего не делать",
       "zh-chs": "没做什么",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->854"
+        "index.html->id_computerSelector->dialog->21->857"
+      ]
+    },
+    {
+      "en": "Domain",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->947",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12domaindiv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27domaindiv->1"
       ]
     },
     {
@@ -7061,6 +7107,13 @@
       "ru": "Набор доменных имен",
       "zh-chs": "域名集"
     },
+    {
+      "en": "Domain Suffix",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamecomparediv->idx_d12servernamecompare->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamecomparediv->idx_d27servernamecompare->3"
+      ]
+    },
     {
       "de": "Maus nicht drehen",
       "en": "Don't Rotate Mouse",
@@ -7113,11 +7166,11 @@
       "ru": "Скачать",
       "zh-chs": "下载",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1473",
+        "index.html->id_computerSelector->dialog->21->1497",
         "index.html->id_computerSelector->dialog->21->295",
-        "index.html->id_computerSelector->dialog->21->515",
         "index.html->id_computerSelector->dialog->21->518",
-        "index.html->id_computerSelector->dialog->21->672"
+        "index.html->id_computerSelector->dialog->21->521",
+        "index.html->id_computerSelector->dialog->21->675"
       ]
     },
     {
@@ -7133,7 +7186,7 @@
       "ru": "Загрузить файл",
       "zh-chs": "下载文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1178"
+        "index.html->id_computerSelector->dialog->21->1199"
       ]
     },
     {
@@ -7155,7 +7208,7 @@
       "ru": "Перетащите файл .mcrec или нажмите \\\"Открыть файл ... \\\"",
       "zh-chs": "拖放.mcrec文件或单击\\“打开文件... \\”",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1687"
+        "index.html->id_computerSelector->dialog->21->1711"
       ]
     },
     {
@@ -7171,11 +7224,11 @@
       "ru": "Капля",
       "zh-chs": "下降",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->809",
-        "index.html->id_computerSelector->dialog->21->851",
-        "index.html->id_computerSelector->dialog->21->876",
-        "index.html->id_computerSelector->dialog->21->883",
-        "index.html->id_computerSelector->dialog->21->897"
+        "index.html->id_computerSelector->dialog->21->812",
+        "index.html->id_computerSelector->dialog->21->854",
+        "index.html->id_computerSelector->dialog->21->879",
+        "index.html->id_computerSelector->dialog->21->886",
+        "index.html->id_computerSelector->dialog->21->900"
       ]
     },
     {
@@ -7191,8 +7244,8 @@
       "ru": "Брось, посчитай",
       "zh-chs": "掉落，计数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->806",
-        "index.html->id_computerSelector->dialog->21->848"
+        "index.html->id_computerSelector->dialog->21->809",
+        "index.html->id_computerSelector->dialog->21->851"
       ]
     },
     {
@@ -7208,8 +7261,8 @@
       "ru": "Drop, граф",
       "zh-chs": "落数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->878",
-        "index.html->id_computerSelector->dialog->21->885"
+        "index.html->id_computerSelector->dialog->21->881",
+        "index.html->id_computerSelector->dialog->21->888"
       ]
     },
     {
@@ -7225,8 +7278,8 @@
       "ru": "Drop, граф, событие",
       "zh-chs": "掉落，计数，事件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->880",
-        "index.html->id_computerSelector->dialog->21->887"
+        "index.html->id_computerSelector->dialog->21->883",
+        "index.html->id_computerSelector->dialog->21->890"
       ]
     },
     {
@@ -7242,7 +7295,7 @@
       "ru": "Двухъядерный процессор Intel&reg; Celeron&reg;",
       "zh-chs": "双核Intel&reg;Celeron&reg;处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1006"
+        "index.html->id_computerSelector->dialog->21->1027"
       ]
     },
     {
@@ -7258,8 +7311,8 @@
       "ru": "продолжительность",
       "zh-chs": "持续时间",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1666",
-        "index.html->id_computerSelector->dialog->21->1668"
+        "index.html->id_computerSelector->dialog->21->1690",
+        "index.html->id_computerSelector->dialog->21->1692"
       ]
     },
     {
@@ -7320,7 +7373,7 @@
       "ru": "Динамический DNS-клиент",
       "zh-chs": "动态DNS客户端",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1309",
+        "index.html->id_computerSelector->dialog->21->1330",
         "index.html->id_computerSelector->dialog->dialog->5->dialog23->3->3"
       ]
     },
@@ -7415,6 +7468,41 @@
       "ru": "Ошибка EAC: попытка получить положение, когда NAC в Intel® AMT отключен.",
       "zh-chs": "EAC错误：禁用Intel AMT中的NAC时尝试姿势。"
     },
+    {
+      "en": "EAP-FAST/GTC",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->11",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->11"
+      ]
+    },
+    {
+      "en": "EAP-FAST/MSCHAPv2",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->9",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->9"
+      ]
+    },
+    {
+      "en": "EAP-FAST/TLS",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->13",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->13"
+      ]
+    },
+    {
+      "en": "EAP-TLS",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->1"
+      ]
+    },
+    {
+      "en": "EAP-TTLS/MSCHAPv2",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->3"
+      ]
+    },
     {
       "de": "EDO",
       "en": "EDO",
@@ -7428,7 +7516,7 @@
       "ru": "EDO",
       "zh-chs": "埃多",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->957"
+        "index.html->id_computerSelector->dialog->21->978"
       ]
     },
     {
@@ -7444,7 +7532,7 @@
       "ru": "EDRAM",
       "zh-chs": "内存",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->958"
+        "index.html->id_computerSelector->dialog->21->979"
       ]
     },
     {
@@ -7460,7 +7548,7 @@
       "ru": "EEPROM",
       "zh-chs": "EEPROM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->964"
+        "index.html->id_computerSelector->dialog->21->985"
       ]
     },
     {
@@ -7476,7 +7564,7 @@
       "ru": "Электронное письмо",
       "zh-chs": "电子邮件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1581",
+        "index.html->id_computerSelector->dialog->21->1605",
         "index.html->id_computerSelector->dialog->21->300"
       ]
     },
@@ -7493,7 +7581,7 @@
       "ru": "EPROM",
       "zh-chs": "只读存储器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->966"
+        "index.html->id_computerSelector->dialog->21->987"
       ]
     },
     {
@@ -7526,7 +7614,7 @@
       "ru": "Редактировать аккаунт",
       "zh-chs": "编辑账户",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1081"
+        "index.html->id_computerSelector->dialog->21->1102"
       ]
     },
     {
@@ -7559,7 +7647,7 @@
       "ru": "Редактировать заголовок",
       "zh-chs": "编辑标题",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1647"
+        "index.html->id_computerSelector->dialog->21->1671"
       ]
     },
     {
@@ -7575,7 +7663,7 @@
       "ru": "Редактировать запись № {0}",
       "zh-chs": "编辑记录＃{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1648"
+        "index.html->id_computerSelector->dialog->21->1672"
       ]
     },
     {
@@ -7591,7 +7679,7 @@
       "ru": "Изменить запись # {0}, переменная # {1}",
       "zh-chs": "编辑记录＃{0}，变量＃{1}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1657"
+        "index.html->id_computerSelector->dialog->21->1681"
       ]
     },
     {
@@ -7607,7 +7695,7 @@
       "ru": "Изменить будильник",
       "zh-chs": "编辑闹钟",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1526"
+        "index.html->id_computerSelector->dialog->21->1550"
       ]
     },
     {
@@ -7639,7 +7727,7 @@
       "ru": "Редактировать {0}",
       "zh-chs": "编辑{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1540"
+        "index.html->id_computerSelector->dialog->21->1564"
       ]
     },
     {
@@ -7655,10 +7743,10 @@
       "ru": "Редактировать...",
       "zh-chs": "编辑...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1078",
-        "index.html->id_computerSelector->dialog->21->1515",
+        "index.html->id_computerSelector->dialog->21->1099",
         "index.html->id_computerSelector->dialog->21->1539",
-        "index.html->id_computerSelector->dialog->21->1542",
+        "index.html->id_computerSelector->dialog->21->1563",
+        "index.html->id_computerSelector->dialog->21->1566",
         "index.html->id_computerSelector->dialog->21->210",
         "index.html->id_computerSelector->dialog->21->216",
         "index.html->id_computerSelector->dialog->21->218"
@@ -7677,8 +7765,8 @@
       "ru": "Защита электронной почты",
       "zh-chs": "邮件保护",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1614",
-        "index.html->id_computerSelector->dialog->21->708"
+        "index.html->id_computerSelector->dialog->21->1638",
+        "index.html->id_computerSelector->dialog->21->711"
       ]
     },
     {
@@ -7694,19 +7782,23 @@
       "ru": "Включено",
       "zh-chs": "已启用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1093",
+        "index.html->id_computerSelector->dialog->21->1114",
         "index.html->id_computerSelector->dialog->21->423",
         "index.html->id_computerSelector->dialog->21->476",
         "index.html->id_computerSelector->dialog->21->479",
-        "index.html->id_computerSelector->dialog->21->536",
-        "index.html->id_computerSelector->dialog->21->596",
-        "index.html->id_computerSelector->dialog->21->606",
-        "index.html->id_computerSelector->dialog->21->744",
-        "index.html->id_computerSelector->dialog->21->933",
-        "index.html->id_computerSelector->dialog->21->947",
+        "index.html->id_computerSelector->dialog->21->539",
+        "index.html->id_computerSelector->dialog->21->599",
+        "index.html->id_computerSelector->dialog->21->609",
+        "index.html->id_computerSelector->dialog->21->747",
+        "index.html->id_computerSelector->dialog->21->937",
+        "index.html->id_computerSelector->dialog->21->968",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12activeins0div->idx_d12activeins0->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog23->3->idx_d23ddns->5",
         "index.html->id_computerSelector->dialog->dialog->5->dialog26->5",
         "index.html->id_computerSelector->dialog->dialog->5->dialog26->d26rpediv->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->3->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->3->idx_d27enabled->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27activeins0div->idx_d27activeins0->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog7->d7decimationspan->d7decimation->3"
       ]
     },
@@ -7723,7 +7815,7 @@
       "ru": "Включенное состояние",
       "zh-chs": "启用状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->776"
+        "index.html->id_computerSelector->dialog->21->779"
       ]
     },
     {
@@ -7740,8 +7832,8 @@
       "zh-chs": "已启用但离线",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->427",
-        "index.html->id_computerSelector->dialog->21->600",
-        "index.html->id_computerSelector->dialog->21->748"
+        "index.html->id_computerSelector->dialog->21->603",
+        "index.html->id_computerSelector->dialog->21->751"
       ]
     },
     {
@@ -7773,7 +7865,7 @@
       "ru": "Включено в S0",
       "zh-chs": "在S0中启用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->908"
+        "index.html->id_computerSelector->dialog->21->911"
       ]
     },
     {
@@ -7789,7 +7881,7 @@
       "ru": "Включено в S0, Sx / AC",
       "zh-chs": "在S0，Sx / AC中启用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->909"
+        "index.html->id_computerSelector->dialog->21->912"
       ]
     },
     {
@@ -7805,7 +7897,8 @@
       "ru": "Включено,",
       "zh-chs": "已启用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1210"
+        "index.html->id_computerSelector->dialog->21->1231",
+        "index.html->id_computerSelector->dialog->21->489"
       ]
     },
     {
@@ -7821,7 +7914,7 @@
       "ru": "Включенные, автоматические и ручные адреса",
       "zh-chs": "启用的自动和手动地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->497"
+        "index.html->id_computerSelector->dialog->21->500"
       ]
     },
     {
@@ -7837,7 +7930,7 @@
       "ru": "Включено, Автоматические адреса",
       "zh-chs": "启用的自动地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->498"
+        "index.html->id_computerSelector->dialog->21->501"
       ]
     },
     {
@@ -7853,7 +7946,7 @@
       "ru": "Включено, Legacy KVM зрителей",
       "zh-chs": "已启用的旧版KVM查看器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->532"
+        "index.html->id_computerSelector->dialog->21->535"
       ]
     },
     {
@@ -7869,7 +7962,7 @@
       "ru": "шифрование",
       "zh-chs": "加密",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->940",
+        "index.html->id_computerSelector->dialog->21->944",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->11->3"
       ]
     },
@@ -7918,6 +8011,12 @@
       "ru": "Код доступа",
       "zh-chs": "入学密码"
     },
+    {
+      "en": "Enter",
+      "xloc": [
+        "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->4->1->25->deskkeysspan->deskkeys->49"
+      ]
+    },
     {
       "de": "Geben Sie bei Bedarf das Kennwort zum sicheren Löschen ein.",
       "en": "Enter Secure Erase password if required.",
@@ -7931,7 +8030,7 @@
       "ru": "Введите пароль безопасного стирания, если требуется.",
       "zh-chs": "如果需要，输入安全擦除密码。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1395"
+        "index.html->id_computerSelector->dialog->21->1414"
       ]
     },
     {
@@ -7947,7 +8046,7 @@
       "ru": "Введите сертификат, закрытый пароль, пароль.",
       "zh-chs": "输入证书私钥密码。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1592"
+        "index.html->id_computerSelector->dialog->21->1616"
       ]
     },
     {
@@ -7979,7 +8078,7 @@
       "ru": "Введите текст и нажмите OK, чтобы удаленно набрать его с помощью английской клавиатуры США. Перед продолжением убедитесь, что дистанционный курсор установлен в правильное положение.",
       "zh-chs": "输入文本，然后单击“确定”以使用美式英语键盘远程输入文本。在继续操作之前，请确保将远程光标放置在正确的位置。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1157"
+        "index.html->id_computerSelector->dialog->21->1178"
       ]
     },
     {
@@ -7995,7 +8094,7 @@
       "ru": "Введите текст для отправки в буфер обмена Intel&reg; AMT.",
       "zh-chs": "输入文本以发送到英特尔&reg;AMT剪贴板。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1159"
+        "index.html->id_computerSelector->dialog->21->1180"
       ]
     },
     {
@@ -8011,7 +8110,7 @@
       "ru": "Введите до 5 суффиксов домена интрасети. Если компьютер находится за пределами этих доменов, локальные порты Intel&reg; AMT будут закрыты и подключения к удаленному серверу будут активны.",
       "zh-chs": "输入最多5个Intranet域后缀。如果计算机不在这些域中，则英特尔&reg;AMT本地端口将关闭，并且远程服务器连接将处于活动状态。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1248"
+        "index.html->id_computerSelector->dialog->21->1269"
       ]
     },
     {
@@ -8046,7 +8145,7 @@
       "ru": "сущность",
       "zh-chs": "实体",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->561"
+        "index.html->id_computerSelector->dialog->21->564"
       ]
     },
     {
@@ -8062,7 +8161,7 @@
       "ru": "Экземпляр сущности",
       "zh-chs": "实体实例",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->562"
+        "index.html->id_computerSelector->dialog->21->565"
       ]
     },
     {
@@ -8078,9 +8177,9 @@
       "ru": "Обнаружение окружающей среды",
       "zh-chs": "环境检测",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1251",
-        "index.html->id_computerSelector->dialog->21->1252",
-        "index.html->id_computerSelector->dialog->21->1254"
+        "index.html->id_computerSelector->dialog->21->1272",
+        "index.html->id_computerSelector->dialog->21->1273",
+        "index.html->id_computerSelector->dialog->21->1275"
       ]
     },
     {
@@ -8096,7 +8195,7 @@
       "ru": "Обнаружение окружающей среды",
       "zh-chs": "环境检测",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1211"
+        "index.html->id_computerSelector->dialog->21->1232"
       ]
     },
     {
@@ -8112,10 +8211,10 @@
       "ru": "ошибка",
       "zh-chs": "错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1311",
-        "index.html->id_computerSelector->dialog->21->1313",
-        "index.html->id_computerSelector->dialog->21->1315",
-        "index.html->id_computerSelector->dialog->21->542"
+        "index.html->id_computerSelector->dialog->21->1332",
+        "index.html->id_computerSelector->dialog->21->1334",
+        "index.html->id_computerSelector->dialog->21->1336",
+        "index.html->id_computerSelector->dialog->21->545"
       ]
     },
     {
@@ -8131,8 +8230,8 @@
       "ru": "Ошибка #",
       "zh-chs": "错误编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1106",
-        "index.html->id_computerSelector->dialog->21->1436"
+        "index.html->id_computerSelector->dialog->21->1127",
+        "index.html->id_computerSelector->dialog->21->1460"
       ]
     },
     {
@@ -8148,10 +8247,10 @@
       "ru": "Ошибка № {0}",
       "zh-chs": "错误＃{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1427",
-        "index.html->id_computerSelector->dialog->21->1442",
-        "index.html->id_computerSelector->dialog->21->1448",
-        "index.html->id_computerSelector->dialog->21->1698"
+        "index.html->id_computerSelector->dialog->21->1451",
+        "index.html->id_computerSelector->dialog->21->1466",
+        "index.html->id_computerSelector->dialog->21->1472",
+        "index.html->id_computerSelector->dialog->21->1722"
       ]
     },
     {
@@ -8167,13 +8266,14 @@
       "ru": "Ошибка {0}, невозможно установить значения.",
       "zh-chs": "错误{0}，无法设置值。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->541"
+        "index.html->id_computerSelector->dialog->21->544"
       ]
     },
     {
       "en": "Error, Status = ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1321"
+        "index.html->id_computerSelector->dialog->21->1342",
+        "index.html->id_computerSelector->dialog->21->966"
       ]
     },
     {
@@ -8189,7 +8289,7 @@
       "ru": "Ошибка: ",
       "zh-chs": "错误：",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->634"
+        "index.html->id_computerSelector->dialog->21->637"
       ]
     },
     {
@@ -8205,7 +8305,7 @@
       "ru": "Пакетный фильтр Ethernet ARP",
       "zh-chs": "以太网ARP数据包过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->838"
+        "index.html->id_computerSelector->dialog->21->841"
       ]
     },
     {
@@ -8221,7 +8321,7 @@
       "ru": "Фильтр Ethernet №",
       "zh-chs": "以太网过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->871"
+        "index.html->id_computerSelector->dialog->21->874"
       ]
     },
     {
@@ -8237,7 +8337,7 @@
       "ru": "Ethernet IP Packet Filter",
       "zh-chs": "以太网IP数据包过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->837"
+        "index.html->id_computerSelector->dialog->21->840"
       ]
     },
     {
@@ -8253,7 +8353,7 @@
       "ru": "Ethernet Traffic",
       "zh-chs": "以太网流量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->861"
+        "index.html->id_computerSelector->dialog->21->864"
       ]
     },
     {
@@ -8269,7 +8369,7 @@
       "ru": "Событие",
       "zh-chs": "事件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->639"
+        "index.html->id_computerSelector->dialog->21->642"
       ]
     },
     {
@@ -8285,7 +8385,7 @@
       "ru": "Событие № {0} Подробности",
       "zh-chs": "事件＃{0}详细信息",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->570"
+        "index.html->id_computerSelector->dialog->21->573"
       ]
     },
     {
@@ -8301,9 +8401,9 @@
       "ru": "Журнал событий",
       "zh-chs": "事件簿",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->554",
-        "index.html->id_computerSelector->dialog->21->555",
-        "index.html->id_computerSelector->dialog->21->856",
+        "index.html->id_computerSelector->dialog->21->557",
+        "index.html->id_computerSelector->dialog->21->558",
+        "index.html->id_computerSelector->dialog->21->859",
         "index.html->id_computerSelector->id_mainview->id_leftbar->go6->0",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p6->1"
       ]
@@ -8376,8 +8476,8 @@
       "ru": "Событие на матче",
       "zh-chs": "比赛中的赛事",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->855",
-        "index.html->id_computerSelector->dialog->21->870"
+        "index.html->id_computerSelector->dialog->21->858",
+        "index.html->id_computerSelector->dialog->21->873"
       ]
     },
     {
@@ -8393,7 +8493,7 @@
       "ru": "Мероприятия",
       "zh-chs": "大事记",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->576"
+        "index.html->id_computerSelector->dialog->21->579"
       ]
     },
     {
@@ -8479,7 +8579,7 @@
       "ru": "Экспортировать как .cer ...",
       "zh-chs": "导出为.cer ...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1569"
+        "index.html->id_computerSelector->dialog->21->1593"
       ]
     },
     {
@@ -8495,7 +8595,7 @@
       "ru": "Экспортировать как .p12 ...",
       "zh-chs": "导出为.p12 ...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1570"
+        "index.html->id_computerSelector->dialog->21->1594"
       ]
     },
     {
@@ -8511,7 +8611,7 @@
       "ru": "Расширенный ASCII",
       "zh-chs": "扩展ASCII",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1114"
+        "index.html->id_computerSelector->dialog->21->1135"
       ]
     },
     {
@@ -8543,7 +8643,7 @@
       "ru": "Расширенные данные",
       "zh-chs": "扩展数据",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->640"
+        "index.html->id_computerSelector->dialog->21->643"
       ]
     },
     {
@@ -8763,7 +8863,7 @@
       "ru": "FB-DIM",
       "zh-chs": "FB-DIM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->997"
+        "index.html->id_computerSelector->dialog->21->1018"
       ]
     },
     {
@@ -8779,7 +8879,7 @@
       "ru": "FB-DIMM",
       "zh-chs": "FB-DIMM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->975"
+        "index.html->id_computerSelector->dialog->21->996"
       ]
     },
     {
@@ -8795,7 +8895,7 @@
       "ru": "FBD2",
       "zh-chs": "FBD2",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->977"
+        "index.html->id_computerSelector->dialog->21->998"
       ]
     },
     {
@@ -8811,13 +8911,13 @@
       "ru": "FEPROM",
       "zh-chs": "前面板",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->965"
+        "index.html->id_computerSelector->dialog->21->986"
       ]
     },
     {
       "en": "FQDN",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->511"
+        "index.html->id_computerSelector->dialog->21->514"
       ]
     },
     {
@@ -8833,13 +8933,13 @@
       "ru": "FQDN / имя хоста",
       "zh-chs": "FQDN /主机名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1281"
+        "index.html->id_computerSelector->dialog->21->1302"
       ]
     },
     {
       "en": "FW Version",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->510"
+        "index.html->id_computerSelector->dialog->21->513"
       ]
     },
     {
@@ -8880,7 +8980,7 @@
       "ru": "Не удалось добавить сигнал тревоги {0}. <br/> Убедитесь, что сигнал тревоги относится к будущему времени.",
       "zh-chs": "添加警报{0}失败。<br/>验证警报是否将来。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1525"
+        "index.html->id_computerSelector->dialog->21->1549"
       ]
     },
     {
@@ -8896,7 +8996,7 @@
       "ru": "Не удалось добавить будильник. Статус: {0}. <br/> Убедитесь, что будильник на будущее.",
       "zh-chs": "添加告警失败。状态：{0}。<br/>验证警报是否将来。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1523"
+        "index.html->id_computerSelector->dialog->21->1547"
       ]
     },
     {
@@ -8912,7 +9012,7 @@
       "ru": "Не удалось добавить прокси, статус",
       "zh-chs": "无法添加代理，状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1285"
+        "index.html->id_computerSelector->dialog->21->1306"
       ]
     },
     {
@@ -8928,8 +9028,8 @@
       "ru": "Не удалось добавить сервер, статус {0}",
       "zh-chs": "无法添加服务器，状态为{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1253",
-        "index.html->id_computerSelector->dialog->21->1300"
+        "index.html->id_computerSelector->dialog->21->1274",
+        "index.html->id_computerSelector->dialog->21->1321"
       ]
     },
     {
@@ -8952,7 +9052,7 @@
       "zh-chs": "无法生成密钥对，",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->322",
-        "index.html->id_computerSelector->dialog->21->717"
+        "index.html->id_computerSelector->dialog->21->720"
       ]
     },
     {
@@ -8971,9 +9071,9 @@
         "index.html->id_computerSelector->dialog->21->320",
         "index.html->id_computerSelector->dialog->21->326",
         "index.html->id_computerSelector->dialog->21->338",
-        "index.html->id_computerSelector->dialog->21->715",
-        "index.html->id_computerSelector->dialog->21->719",
-        "index.html->id_computerSelector->dialog->21->724"
+        "index.html->id_computerSelector->dialog->21->718",
+        "index.html->id_computerSelector->dialog->21->722",
+        "index.html->id_computerSelector->dialog->21->727"
       ]
     },
     {
@@ -9028,7 +9128,7 @@
       "zh-chs": "无法设置TLS安全性，错误：",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->345",
-        "index.html->id_computerSelector->dialog->21->741"
+        "index.html->id_computerSelector->dialog->21->744"
       ]
     },
     {
@@ -9045,8 +9145,8 @@
       "zh-chs": "无法设置TLS安全性，状态=",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->344",
-        "index.html->id_computerSelector->dialog->21->739",
-        "index.html->id_computerSelector->dialog->21->740"
+        "index.html->id_computerSelector->dialog->21->742",
+        "index.html->id_computerSelector->dialog->21->743"
       ]
     },
     {
@@ -9063,7 +9163,7 @@
       "zh-chs": "设置时间失败，错误：",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->351",
-        "index.html->id_computerSelector->dialog->21->736"
+        "index.html->id_computerSelector->dialog->21->739"
       ]
     },
     {
@@ -9080,7 +9180,7 @@
       "zh-chs": "设置时间失败，状态=",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->350",
-        "index.html->id_computerSelector->dialog->21->735"
+        "index.html->id_computerSelector->dialog->21->738"
       ]
     },
     {
@@ -9096,7 +9196,7 @@
       "ru": "семья",
       "zh-chs": "家庭",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1029"
+        "index.html->id_computerSelector->dialog->21->1050"
       ]
     },
     {
@@ -9172,8 +9272,8 @@
       "ru": "Имя файла",
       "zh-chs": "文件名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1495",
-        "index.html->id_computerSelector->dialog->21->1496"
+        "index.html->id_computerSelector->dialog->21->1519",
+        "index.html->id_computerSelector->dialog->21->1520"
       ]
     },
     {
@@ -9207,12 +9307,12 @@
       "zh-chs": "过滤",
       "xloc": [
         "index.html->id_computerSelector->9->1->0->15",
-        "index.html->id_computerSelector->dialog->21->546",
-        "index.html->id_computerSelector->dialog->21->548",
-        "index.html->id_computerSelector->dialog->21->579",
-        "index.html->id_computerSelector->dialog->21->585",
-        "index.html->id_computerSelector->dialog->21->619",
-        "index.html->id_computerSelector->dialog->21->621",
+        "index.html->id_computerSelector->dialog->21->549",
+        "index.html->id_computerSelector->dialog->21->551",
+        "index.html->id_computerSelector->dialog->21->582",
+        "index.html->id_computerSelector->dialog->21->588",
+        "index.html->id_computerSelector->dialog->21->622",
+        "index.html->id_computerSelector->dialog->21->624",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p12->3->1->1->2->1"
       ]
     },
@@ -9229,7 +9329,7 @@
       "ru": "Фильтр",
       "zh-chs": "过滤",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->869"
+        "index.html->id_computerSelector->dialog->21->872"
       ]
     },
     {
@@ -9245,7 +9345,7 @@
       "ru": "Фильтр №",
       "zh-chs": "过滤器编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->903"
+        "index.html->id_computerSelector->dialog->21->906"
       ]
     },
     {
@@ -9277,7 +9377,7 @@
       "ru": "отпечаток пальца",
       "zh-chs": "指纹",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1589",
+        "index.html->id_computerSelector->dialog->21->1613",
         "index.html->id_computerSelector->dialog->21->256",
         "index.html->id_computerSelector->dialog->21->308"
       ]
@@ -9295,7 +9395,7 @@
       "ru": "Процесс загрузки прошивки",
       "zh-chs": "固件启动过程",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->758"
+        "index.html->id_computerSelector->dialog->21->761"
       ]
     },
     {
@@ -9376,7 +9476,7 @@
       "ru": "вспышка",
       "zh-chs": "闪",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->963"
+        "index.html->id_computerSelector->dialog->21->984"
       ]
     },
     {
@@ -9405,7 +9505,7 @@
       "ru": "Дискета (.img)",
       "zh-chs": "软盘（.img）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1182"
+        "index.html->id_computerSelector->dialog->21->1203"
       ]
     },
     {
@@ -9451,10 +9551,7 @@
       "nl": "Forceer CD / DVD Boot",
       "pt": "Forçar inicialização de CD / DVD",
       "ru": "Force CD / DVD Boot",
-      "zh-chs": "强制启动CD / DVD",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceDVDBootOption"
-      ]
+      "zh-chs": "强制启动CD / DVD"
     },
     {
       "de": "Diagnosestart erzwingen",
@@ -9467,10 +9564,7 @@
       "nl": "Forceer diagnostisch opstarten",
       "pt": "Forçar inicialização de diagnóstico",
       "ru": "Принудительный диагностический ботинок",
-      "zh-chs": "强制诊断启动",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceDiagBootOption"
-      ]
+      "zh-chs": "强制诊断启动"
     },
     {
       "de": "Festplattenstart erzwingen",
@@ -9483,31 +9577,19 @@
       "nl": "Forceer harde schijf opstarten",
       "pt": "Forçar inicialização do disco rígido",
       "ru": "Принудительная загрузка жесткого диска",
-      "zh-chs": "强制硬盘启动",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceHDBootOption"
-      ]
+      "zh-chs": "强制硬盘启动"
     },
     {
-      "en": "Force OCR UEFI Boot Option",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceUEFIBootOption"
-      ]
+      "en": "Force OCR UEFI Boot Option"
     },
     {
       "en": "Force OCR UEFI HTTPS Boot"
     },
     {
-      "en": "Force OCR UEFI HTTPS Boot (.iso)",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceHttpBootOption"
-      ]
+      "en": "Force OCR UEFI HTTPS Boot (.iso)"
     },
     {
-      "en": "Force OCR UEFI HTTPS Boot (url)",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForceHttpUrlBootOption"
-      ]
+      "en": "Force OCR UEFI HTTPS Boot (url)"
     },
     {
       "de": "PXE-Start erzwingen",
@@ -9520,10 +9602,7 @@
       "nl": "Forceer PXE Boot",
       "pt": "Forçar inicialização PXE",
       "ru": "Force PXE Boot",
-      "zh-chs": "强制PXE引导",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->ForcePXEBootOption"
-      ]
+      "zh-chs": "强制PXE引导"
     },
     {
       "de": "Fortschrittsereignisse erzwingen",
@@ -9554,7 +9633,7 @@
       "ru": "Фактор формы",
       "zh-chs": "构成因素",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1040"
+        "index.html->id_computerSelector->dialog->21->1061"
       ]
     },
     {
@@ -9570,7 +9649,7 @@
       "ru": "Freeze Log",
       "zh-chs": "冻结日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->545"
+        "index.html->id_computerSelector->dialog->21->548"
       ]
     },
     {
@@ -9620,7 +9699,7 @@
       "ru": "От",
       "zh-chs": "从",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->790"
+        "index.html->id_computerSelector->dialog->21->793"
       ]
     },
     {
@@ -9652,10 +9731,17 @@
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->0->1->1"
       ]
     },
+    {
+      "en": "Full Name",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamecomparediv->idx_d12servernamecompare->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamecomparediv->idx_d27servernamecompare->1"
+      ]
+    },
     {
       "en": "GET CIM_BootSourceSetting, Error #{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1415"
+        "index.html->id_computerSelector->dialog->21->1439"
       ]
     },
     {
@@ -9703,7 +9789,7 @@
       "ru": "Генерация случайного DeviceID",
       "zh-chs": "产生随机的DeviceID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->783"
+        "index.html->id_computerSelector->dialog->21->786"
       ]
     },
     {
@@ -9770,7 +9856,7 @@
       "ru": "Получение настроек загрузки ...",
       "zh-chs": "获取启动设置...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1434"
+        "index.html->id_computerSelector->dialog->21->1458"
       ]
     },
     {
@@ -9786,7 +9872,7 @@
       "ru": "Собственное имя",
       "zh-chs": "给定的名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->669"
+        "index.html->id_computerSelector->dialog->21->672"
       ]
     },
     {
@@ -9815,7 +9901,7 @@
       "ru": "Глобальный адрес",
       "zh-chs": "全球地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1327"
+        "index.html->id_computerSelector->dialog->21->1348"
       ]
     },
     {
@@ -9831,7 +9917,7 @@
       "ru": "грациозный",
       "zh-chs": "优美",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1185"
+        "index.html->id_computerSelector->dialog->21->1206"
       ]
     },
     {
@@ -9893,7 +9979,7 @@
       "ru": "HTTP прокси #",
       "zh-chs": "HTTP代理",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1271"
+        "index.html->id_computerSelector->dialog->21->1292"
       ]
     },
     {
@@ -9909,7 +9995,7 @@
       "ru": "Удаление HTTP прокси",
       "zh-chs": "HTTP代理删除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1272"
+        "index.html->id_computerSelector->dialog->21->1293"
       ]
     },
     {
@@ -9918,7 +10004,7 @@
     {
       "en": "HTTPS Boot",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1390"
+        "index.html->id_computerSelector->dialog->21->1409"
       ]
     },
     {
@@ -9982,8 +10068,8 @@
       "ru": "Хеш (HEX)",
       "zh-chs": "哈希（HEX）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1652",
-        "index.html->id_computerSelector->dialog->21->1663"
+        "index.html->id_computerSelector->dialog->21->1676",
+        "index.html->id_computerSelector->dialog->21->1687"
       ]
     },
     {
@@ -9999,8 +10085,8 @@
       "ru": "Имя хеша",
       "zh-chs": "哈希名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1653",
-        "index.html->id_computerSelector->dialog->21->1664"
+        "index.html->id_computerSelector->dialog->21->1677",
+        "index.html->id_computerSelector->dialog->21->1688"
       ]
     },
     {
@@ -10016,8 +10102,8 @@
       "ru": "Тип хэша",
       "zh-chs": "哈希类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1651",
-        "index.html->id_computerSelector->dialog->21->1662"
+        "index.html->id_computerSelector->dialog->21->1675",
+        "index.html->id_computerSelector->dialog->21->1686"
       ]
     },
     {
@@ -10033,7 +10119,7 @@
       "ru": "Hdr",
       "zh-chs": "人类发展报告",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->858"
+        "index.html->id_computerSelector->dialog->21->861"
       ]
     },
     {
@@ -10055,7 +10141,7 @@
     {
       "en": "Hex Encoding",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1161"
+        "index.html->id_computerSelector->dialog->21->1182"
       ]
     },
     {
@@ -10071,7 +10157,7 @@
       "ru": "Hibernate",
       "zh-chs": "冬眠",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1367"
+        "index.html->id_computerSelector->dialog->21->1388"
       ]
     },
     {
@@ -10132,7 +10218,7 @@
       "ru": "Hostname",
       "zh-chs": "主机名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1302",
+        "index.html->id_computerSelector->dialog->21->1323",
         "index.html->id_computerSelector->dialog->dialog->5->dialog4->7->1"
       ]
     },
@@ -10149,8 +10235,8 @@
       "ru": "Имя хоста FQDN",
       "zh-chs": "主机名FQDN",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1274",
-        "index.html->id_computerSelector->dialog->21->1287"
+        "index.html->id_computerSelector->dialog->21->1295",
+        "index.html->id_computerSelector->dialog->21->1308"
       ]
     },
     {
@@ -10216,7 +10302,7 @@
       "ru": "Сессия IDE-R </ b>, подключено,",
       "zh-chs": "IDE-R会话</ b>，已连接，",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1196"
+        "index.html->id_computerSelector->dialog->21->1217"
       ]
     },
     {
@@ -10375,7 +10461,7 @@
       "ru": "IP-трафик",
       "zh-chs": "IP流量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->863"
+        "index.html->id_computerSelector->dialog->21->866"
       ]
     },
     {
@@ -10407,7 +10493,7 @@
       "ru": "IPv4",
       "zh-chs": "IPv4",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->803"
+        "index.html->id_computerSelector->dialog->21->806"
       ]
     },
     {
@@ -10423,7 +10509,7 @@
       "ru": "IPv4-адрес",
       "zh-chs": "IPv4地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1303"
+        "index.html->id_computerSelector->dialog->21->1324"
       ]
     },
     {
@@ -10439,7 +10525,7 @@
       "ru": "Пакетный фильтр IPv4",
       "zh-chs": "IPv4数据包过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->839"
+        "index.html->id_computerSelector->dialog->21->842"
       ]
     },
     {
@@ -10455,8 +10541,8 @@
       "ru": "Настройки IPv4",
       "zh-chs": "IPv4设置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1350",
-        "index.html->id_computerSelector->dialog->21->1352"
+        "index.html->id_computerSelector->dialog->21->1371",
+        "index.html->id_computerSelector->dialog->21->1373"
       ]
     },
     {
@@ -10472,10 +10558,10 @@
       "ru": "Адрес IPv4",
       "zh-chs": "IPv4地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1275",
-        "index.html->id_computerSelector->dialog->21->1282",
-        "index.html->id_computerSelector->dialog->21->1288",
-        "index.html->id_computerSelector->dialog->21->491"
+        "index.html->id_computerSelector->dialog->21->1296",
+        "index.html->id_computerSelector->dialog->21->1303",
+        "index.html->id_computerSelector->dialog->21->1309",
+        "index.html->id_computerSelector->dialog->21->494"
       ]
     },
     {
@@ -10491,7 +10577,7 @@
       "ru": "Сервер доменных имен IPv4",
       "zh-chs": "IPv4域名服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->495"
+        "index.html->id_computerSelector->dialog->21->498"
       ]
     },
     {
@@ -10507,7 +10593,7 @@
       "ru": "Шлюз / маска IPv4",
       "zh-chs": "IPv4网关/掩码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->493"
+        "index.html->id_computerSelector->dialog->21->496"
       ]
     },
     {
@@ -10523,7 +10609,7 @@
       "ru": "Состояние IPv4",
       "zh-chs": "IPv4状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->490"
+        "index.html->id_computerSelector->dialog->21->493"
       ]
     },
     {
@@ -10539,7 +10625,7 @@
       "ru": "IPv6",
       "zh-chs": "IPv6",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->804"
+        "index.html->id_computerSelector->dialog->21->807"
       ]
     },
     {
@@ -10555,7 +10641,7 @@
       "ru": "Пакетный фильтр IPv6",
       "zh-chs": "IPv6数据包过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->840"
+        "index.html->id_computerSelector->dialog->21->843"
       ]
     },
     {
@@ -10584,10 +10670,10 @@
       "ru": "Адрес IPv6",
       "zh-chs": "IPv6地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1276",
-        "index.html->id_computerSelector->dialog->21->1283",
-        "index.html->id_computerSelector->dialog->21->501",
-        "index.html->id_computerSelector->dialog->21->502"
+        "index.html->id_computerSelector->dialog->21->1297",
+        "index.html->id_computerSelector->dialog->21->1304",
+        "index.html->id_computerSelector->dialog->21->504",
+        "index.html->id_computerSelector->dialog->21->505"
       ]
     },
     {
@@ -10603,7 +10689,7 @@
       "ru": "IPv6-адреса для проводного интерфейса",
       "zh-chs": "有线接口的IPv6地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1338"
+        "index.html->id_computerSelector->dialog->21->1359"
       ]
     },
     {
@@ -10619,7 +10705,7 @@
       "ru": "IPv6-адреса для беспроводного интерфейса",
       "zh-chs": "无线接口的IPv6地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1339"
+        "index.html->id_computerSelector->dialog->21->1360"
       ]
     },
     {
@@ -10635,7 +10721,7 @@
       "ru": "Маршрутизатор по умолчанию IPv6",
       "zh-chs": "IPv6默认路由器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->504"
+        "index.html->id_computerSelector->dialog->21->507"
       ]
     },
     {
@@ -10651,7 +10737,7 @@
       "ru": "IPv6 отключен",
       "zh-chs": "禁用IPv6",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1340"
+        "index.html->id_computerSelector->dialog->21->1361"
       ]
     },
     {
@@ -10667,7 +10753,7 @@
       "ru": "Сервер доменных имен IPv6",
       "zh-chs": "IPv6域名服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->505"
+        "index.html->id_computerSelector->dialog->21->508"
       ]
     },
     {
@@ -10683,7 +10769,7 @@
       "ru": "IPv6 включен, автоматический",
       "zh-chs": "启用IPv6，自动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1341"
+        "index.html->id_computerSelector->dialog->21->1362"
       ]
     },
     {
@@ -10699,8 +10785,8 @@
       "ru": "IPv6 включен, автоматический + ручной адрес",
       "zh-chs": "已启用IPv6，自动+手动地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1342",
-        "index.html->id_computerSelector->dialog->21->1351"
+        "index.html->id_computerSelector->dialog->21->1363",
+        "index.html->id_computerSelector->dialog->21->1372"
       ]
     },
     {
@@ -10716,7 +10802,7 @@
       "ru": "Состояние IPv6",
       "zh-chs": "IPv6状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->499"
+        "index.html->id_computerSelector->dialog->21->502"
       ]
     },
     {
@@ -10732,7 +10818,7 @@
       "ru": "Поддержка IPv6",
       "zh-chs": "IPv6支持",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1345"
+        "index.html->id_computerSelector->dialog->21->1366"
       ]
     },
     {
@@ -10748,7 +10834,7 @@
       "ru": "Поддержка IPv6 для проводного интерфейса",
       "zh-chs": "有线接口的IPv6支持",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1343"
+        "index.html->id_computerSelector->dialog->21->1364"
       ]
     },
     {
@@ -10764,7 +10850,7 @@
       "ru": "Поддержка IPv6 для беспроводного интерфейса",
       "zh-chs": "无线接口的IPv6支持",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1344"
+        "index.html->id_computerSelector->dialog->21->1365"
       ]
     },
     {
@@ -10861,7 +10947,7 @@
       "ru": "вхолостую",
       "zh-chs": "闲",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->950"
+        "index.html->id_computerSelector->dialog->21->971"
       ]
     },
     {
@@ -10877,7 +10963,7 @@
       "ru": "Если установлено, создает ссылку на этот контент с главной веб-страницы.",
       "zh-chs": "如果设置，则从主页创建指向该内容的链接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1498"
+        "index.html->id_computerSelector->dialog->21->1522"
       ]
     },
     {
@@ -10941,7 +11027,7 @@
       "ru": "немедленный",
       "zh-chs": "即时",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1186"
+        "index.html->id_computerSelector->dialog->21->1207"
       ]
     },
     {
@@ -10987,8 +11073,8 @@
       "zh-chs": "测试中",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->428",
-        "index.html->id_computerSelector->dialog->21->601",
-        "index.html->id_computerSelector->dialog->21->749"
+        "index.html->id_computerSelector->dialog->21->604",
+        "index.html->id_computerSelector->dialog->21->752"
       ]
     },
     {
@@ -11010,7 +11096,7 @@
       "ru": "Входящий / Получать",
       "zh-chs": "入站/接收",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->845"
+        "index.html->id_computerSelector->dialog->21->848"
       ]
     },
     {
@@ -11090,8 +11176,8 @@
       "ru": "инициатор",
       "zh-chs": "发起人",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->626",
-        "index.html->id_computerSelector->dialog->21->636"
+        "index.html->id_computerSelector->dialog->21->629",
+        "index.html->id_computerSelector->dialog->21->639"
       ]
     },
     {
@@ -11129,7 +11215,7 @@
       "ru": "Intel (F10 = ESC + [OM)",
       "zh-chs": "英特尔（F10 = ESC + [OM）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1116",
+        "index.html->id_computerSelector->dialog->21->1137",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p13->13->1->4->1->1"
       ]
     },
@@ -11159,7 +11245,7 @@
       "ru": "Журнал аудита Intel AMT",
       "zh-chs": "英特尔AMT审核日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->630"
+        "index.html->id_computerSelector->dialog->21->633"
       ]
     },
     {
@@ -11175,7 +11261,7 @@
       "ru": "Информация об оборудовании Intel AMT",
       "zh-chs": "英特尔AMT硬件信息",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1068"
+        "index.html->id_computerSelector->dialog->21->1089"
       ]
     },
     {
@@ -11191,7 +11277,7 @@
       "ru": "Intel ASCII",
       "zh-chs": "英特尔ASCII",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1115"
+        "index.html->id_computerSelector->dialog->21->1136"
       ]
     },
     {
@@ -11231,8 +11317,8 @@
         "index.html->id_computerSelector->dialog->21->128",
         "index.html->id_computerSelector->dialog->21->138",
         "index.html->id_computerSelector->dialog->21->139",
-        "index.html->id_computerSelector->dialog->21->1585",
-        "index.html->id_computerSelector->dialog->21->1611",
+        "index.html->id_computerSelector->dialog->21->1609",
+        "index.html->id_computerSelector->dialog->21->1635",
         "index.html->id_computerSelector->dialog->21->304"
       ]
     },
@@ -11249,8 +11335,8 @@
       "ru": "Агент Intel&reg; AMT",
       "zh-chs": "英特尔&reg;AMT代理",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1584",
-        "index.html->id_computerSelector->dialog->21->1610",
+        "index.html->id_computerSelector->dialog->21->1608",
+        "index.html->id_computerSelector->dialog->21->1634",
         "index.html->id_computerSelector->dialog->21->303"
       ]
     },
@@ -11267,7 +11353,7 @@
       "ru": "Сертификат Intel&reg; AMT",
       "zh-chs": "英特尔&reg;AMT证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->700"
+        "index.html->id_computerSelector->dialog->21->703"
       ]
     },
     {
@@ -11283,8 +11369,8 @@
       "ru": "Консоль Intel&reg; AMT",
       "zh-chs": "英特尔&reg;AMT控制台",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1583",
-        "index.html->id_computerSelector->dialog->21->1609",
+        "index.html->id_computerSelector->dialog->21->1607",
+        "index.html->id_computerSelector->dialog->21->1633",
         "index.html->id_computerSelector->dialog->21->302"
       ]
     },
@@ -11309,7 +11395,7 @@
       "ru": "Intel&reg; AMT Особенности",
       "zh-chs": "英特尔&reg;AMT功能",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1310"
+        "index.html->id_computerSelector->dialog->21->1331"
       ]
     },
     {
@@ -11325,7 +11411,7 @@
       "ru": "Intel&reg; AMT KVM",
       "zh-chs": "英特尔&reg;AMT KVM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1680"
+        "index.html->id_computerSelector->dialog->21->1704"
       ]
     },
     {
@@ -11347,7 +11433,7 @@
       "ru": "Intel&reg; AMT Ping Response",
       "zh-chs": "英特尔&reg;AMT Ping响应",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1347"
+        "index.html->id_computerSelector->dialog->21->1368"
       ]
     },
     {
@@ -11363,7 +11449,7 @@
       "ru": "Политика энергопотребления Intel&reg; AMT",
       "zh-chs": "英特尔&reg;AMT电源策略",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1069"
+        "index.html->id_computerSelector->dialog->21->1090"
       ]
     },
     {
@@ -11395,7 +11481,7 @@
       "ru": "Intel&reg; AMT Redirection",
       "zh-chs": "英特尔&reg;AMT重定向",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1679"
+        "index.html->id_computerSelector->dialog->21->1703"
       ]
     },
     {
@@ -11411,7 +11497,7 @@
       "ru": "Версия файла Intel&reg; AMT Setup.bin {0}. {1}",
       "zh-chs": "英特尔&reg;AMT Setup.bin文件版本{0}。{1}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1637"
+        "index.html->id_computerSelector->dialog->21->1661"
       ]
     },
     {
@@ -11439,7 +11525,7 @@
       "ru": "Intel&reg; AMT WSMAN",
       "zh-chs": "英特尔&reg;AMT WSMAN",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1678"
+        "index.html->id_computerSelector->dialog->21->1702"
       ]
     },
     {
@@ -11455,7 +11541,7 @@
       "ru": "Intel&reg; AMT связан со следующим сертификатом. Нажмите «Отмена» для отключения, если это не ожидаемый сертификат.",
       "zh-chs": "英特尔&reg;AMT连接了以下证书。如果这不是预期的证书，请按取消以断开连接。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1701"
+        "index.html->id_computerSelector->dialog->21->1725"
       ]
     },
     {
@@ -11467,7 +11553,7 @@
     {
       "en": "Intel&reg; AMT supports authentic CSME feature, however MeshCommander cannot verify the authenticity yet.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->509"
+        "index.html->id_computerSelector->dialog->21->512"
       ]
     },
     {
@@ -11489,7 +11575,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Duo",
       "zh-chs": "英特尔&reg;酷睿&trade;2双核处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->998"
+        "index.html->id_computerSelector->dialog->21->1019"
       ]
     },
     {
@@ -11505,7 +11591,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Duo для мобильных ПК",
       "zh-chs": "英特尔&reg;酷睿&trade;2双核移动处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1003"
+        "index.html->id_computerSelector->dialog->21->1024"
       ]
     },
     {
@@ -11521,7 +11607,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Extreme для мобильных ПК",
       "zh-chs": "英特尔&reg;酷睿&trade;2至尊移动处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1002"
+        "index.html->id_computerSelector->dialog->21->1023"
       ]
     },
     {
@@ -11537,7 +11623,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Extreme",
       "zh-chs": "英特尔&reg;酷睿&trade;2至尊处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1000"
+        "index.html->id_computerSelector->dialog->21->1021"
       ]
     },
     {
@@ -11553,7 +11639,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Quad",
       "zh-chs": "英特尔&reg;酷睿&trade;2四核处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1001"
+        "index.html->id_computerSelector->dialog->21->1022"
       ]
     },
     {
@@ -11569,7 +11655,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Solo для мобильных ПК",
       "zh-chs": "英特尔&reg;酷睿&trade;2 Solo移动处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1004"
+        "index.html->id_computerSelector->dialog->21->1025"
       ]
     },
     {
@@ -11585,7 +11671,7 @@
       "ru": "Процессор Intel&reg; Core &trade; 2 Solo",
       "zh-chs": "英特尔&reg;酷睿&trade;2 Solo处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->999"
+        "index.html->id_computerSelector->dialog->21->1020"
       ]
     },
     {
@@ -11601,7 +11687,7 @@
       "ru": "Процессор Intel&reg; Core &trade; i7",
       "zh-chs": "英特尔&reg;酷睿&trade;i7处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1005"
+        "index.html->id_computerSelector->dialog->21->1026"
       ]
     },
     {
@@ -11680,7 +11766,7 @@
       "ru": "Порт Ethernet Intel (r) AMT",
       "zh-chs": "英特尔（R）AMT以太网端口",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->833"
+        "index.html->id_computerSelector->dialog->21->836"
       ]
     },
     {
@@ -11750,7 +11836,7 @@
       "ru": "внутренний",
       "zh-chs": "内部",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1529"
+        "index.html->id_computerSelector->dialog->21->1553"
       ]
     },
     {
@@ -11799,7 +11885,7 @@
       "ru": "Неверный файл .img.",
       "zh-chs": "无效的.img文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1192"
+        "index.html->id_computerSelector->dialog->21->1213"
       ]
     },
     {
@@ -11815,7 +11901,7 @@
       "ru": "Неверный файл .iso.",
       "zh-chs": "无效的.iso文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1194"
+        "index.html->id_computerSelector->dialog->21->1215"
       ]
     },
     {
@@ -11844,7 +11930,7 @@
       "ru": "Неверное Царство Дайджеста",
       "zh-chs": "无效的摘要领域",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1697"
+        "index.html->id_computerSelector->dialog->21->1721"
       ]
     },
     {
@@ -11886,7 +11972,7 @@
       "ru": "Неверные параметры",
       "zh-chs": "无效的参数",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1084"
+        "index.html->id_computerSelector->dialog->21->1105"
       ]
     },
     {
@@ -11902,7 +11988,7 @@
       "ru": "Неверный сертификат TLS",
       "zh-chs": "无效的TLS证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1696"
+        "index.html->id_computerSelector->dialog->21->1720"
       ]
     },
     {
@@ -11918,7 +12004,7 @@
       "ru": "Неверный пароль сертификата или невозможно декодировать файл.",
       "zh-chs": "无效的证书密码或无法解码文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1622"
+        "index.html->id_computerSelector->dialog->21->1646"
       ]
     },
     {
@@ -11966,8 +12052,8 @@
       "ru": "Неверный или поврежденный файл setup.bin. Невозможно открыть.",
       "zh-chs": "无效或损坏的setup.bin文件。打不开。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1631",
-        "index.html->id_computerSelector->dialog->21->1634"
+        "index.html->id_computerSelector->dialog->21->1655",
+        "index.html->id_computerSelector->dialog->21->1658"
       ]
     },
     {
@@ -11984,7 +12070,7 @@
       "zh-chs": "无效的脚本文件。",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->13",
-        "index.html->id_computerSelector->dialog->21->1537",
+        "index.html->id_computerSelector->dialog->21->1561",
         "index.html->id_computerSelector->dialog->21->272",
         "index.html->id_computerSelector->dialog->21->292"
       ]
@@ -12023,13 +12109,13 @@
         "index.html->id_computerSelector->dialog->21->325",
         "index.html->id_computerSelector->dialog->21->333",
         "index.html->id_computerSelector->dialog->21->337",
-        "index.html->id_computerSelector->dialog->21->711",
-        "index.html->id_computerSelector->dialog->21->712",
         "index.html->id_computerSelector->dialog->21->714",
-        "index.html->id_computerSelector->dialog->21->716",
-        "index.html->id_computerSelector->dialog->21->718",
+        "index.html->id_computerSelector->dialog->21->715",
+        "index.html->id_computerSelector->dialog->21->717",
+        "index.html->id_computerSelector->dialog->21->719",
         "index.html->id_computerSelector->dialog->21->721",
-        "index.html->id_computerSelector->dialog->21->723"
+        "index.html->id_computerSelector->dialog->21->724",
+        "index.html->id_computerSelector->dialog->21->726"
       ]
     },
     {
@@ -12045,7 +12131,7 @@
       "ru": "Сертификат выдачи подписан {0}",
       "zh-chs": "由{0}签名的签发证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1617"
+        "index.html->id_computerSelector->dialog->21->1641"
       ]
     },
     {
@@ -12061,7 +12147,7 @@
       "ru": "Выдать сертификат ...",
       "zh-chs": "签发证书...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->658",
+        "index.html->id_computerSelector->dialog->21->661",
         "index.html->id_computerSelector->id_certManagerPanel->3->1->0->7"
       ]
     },
@@ -12078,7 +12164,7 @@
       "ru": "Проблема из файла сертификата",
       "zh-chs": "证书文件发出",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->695"
+        "index.html->id_computerSelector->dialog->21->698"
       ]
     },
     {
@@ -12094,7 +12180,7 @@
       "ru": "Проблема от менеджера сертификатов",
       "zh-chs": "来自证书管理器的问题",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->694"
+        "index.html->id_computerSelector->dialog->21->697"
       ]
     },
     {
@@ -12110,7 +12196,7 @@
       "ru": "Выпустить новый сертификат ...",
       "zh-chs": "颁发新证书...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1568"
+        "index.html->id_computerSelector->dialog->21->1592"
       ]
     },
     {
@@ -12126,10 +12212,10 @@
       "ru": "Эмитент Сертификат",
       "zh-chs": "发行人证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1590",
+        "index.html->id_computerSelector->dialog->21->1614",
         "index.html->id_computerSelector->dialog->21->257",
         "index.html->id_computerSelector->dialog->21->309",
-        "index.html->id_computerSelector->dialog->21->681"
+        "index.html->id_computerSelector->dialog->21->684"
       ]
     },
     {
@@ -12339,7 +12425,7 @@
     {
       "en": "KVM disconnection that may be due to the display size and resolution being too large for the Intel AMT KVM buffer. Try RLE8 encoding or reducing the display resolution.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1136"
+        "index.html->id_computerSelector->dialog->21->1157"
       ]
     },
     {
@@ -12348,7 +12434,7 @@
     {
       "en": "KVM disconnection, this may indicate that Intel AMT is unable to capture the display (Try RLE8 encoding), or unsupported GPU.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1134"
+        "index.html->id_computerSelector->dialog->21->1155"
       ]
     },
     {
@@ -12364,7 +12450,7 @@
       "ru": "KVMRedirectionSAP, Ошибка RequestStateChange",
       "zh-chs": "KVMRedirectionSAP，RequestStateChange错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1314"
+        "index.html->id_computerSelector->dialog->21->1335"
       ]
     },
     {
@@ -12380,7 +12466,7 @@
       "ru": "Держать тревогу",
       "zh-chs": "保持警惕",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1532"
+        "index.html->id_computerSelector->dialog->21->1556"
       ]
     },
     {
@@ -12520,7 +12606,7 @@
       "ru": "Пара ключей",
       "zh-chs": "密钥对＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->660"
+        "index.html->id_computerSelector->dialog->21->663"
       ]
     },
     {
@@ -12536,7 +12622,7 @@
       "ru": "LF",
       "zh-chs": "如果",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1119",
+        "index.html->id_computerSelector->dialog->21->1140",
         "index.html->id_computerSelector->dialog->21->8"
       ]
     },
@@ -12559,7 +12645,7 @@
       "ru": "LPDDR",
       "zh-chs": "低功耗DDR",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->979"
+        "index.html->id_computerSelector->dialog->21->1000"
       ]
     },
     {
@@ -12575,7 +12661,7 @@
       "ru": "LPDDR2",
       "zh-chs": "LPDDR2",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->980"
+        "index.html->id_computerSelector->dialog->21->1001"
       ]
     },
     {
@@ -12591,7 +12677,7 @@
       "ru": "LPDDR3",
       "zh-chs": "LPDDR3",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->981"
+        "index.html->id_computerSelector->dialog->21->1002"
       ]
     },
     {
@@ -12607,7 +12693,7 @@
       "ru": "LPDDR4",
       "zh-chs": "LPDDR4",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->982"
+        "index.html->id_computerSelector->dialog->21->1003"
       ]
     },
     {
@@ -12652,7 +12738,7 @@
       "ru": "Большой Фокус",
       "zh-chs": "大焦点",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1156"
+        "index.html->id_computerSelector->dialog->21->1177"
       ]
     },
     {
@@ -12674,7 +12760,7 @@
     {
       "en": "Lead Acid",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1052"
+        "index.html->id_computerSelector->dialog->21->1073"
       ]
     },
     {
@@ -12690,10 +12776,16 @@
       "ru": "Длина от 8 до 63 символов",
       "zh-chs": "长度介于8到63个字符之间",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->13",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->13",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->15",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->15"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->3"
+      ]
+    },
+    {
+      "en": "Less",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1729"
       ]
     },
     {
@@ -12741,8 +12833,8 @@
       "ru": "Ссылка на сайт",
       "zh-chs": "链接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1483",
-        "index.html->id_computerSelector->dialog->21->1499"
+        "index.html->id_computerSelector->dialog->21->1507",
+        "index.html->id_computerSelector->dialog->21->1523"
       ]
     },
     {
@@ -12758,8 +12850,8 @@
       "ru": "Политика ссылок",
       "zh-chs": "连结政策",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->506",
-        "index.html->id_computerSelector->dialog->21->507"
+        "index.html->id_computerSelector->dialog->21->509",
+        "index.html->id_computerSelector->dialog->21->510"
       ]
     },
     {
@@ -12820,7 +12912,7 @@
       "ru": "Ссылка локальный адрес",
       "zh-chs": "链接本地地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1325"
+        "index.html->id_computerSelector->dialog->21->1346"
       ]
     },
     {
@@ -12864,13 +12956,13 @@
     {
       "en": "Lithium Polymer",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1057"
+        "index.html->id_computerSelector->dialog->21->1078"
       ]
     },
     {
       "en": "Lithium-ion",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1055"
+        "index.html->id_computerSelector->dialog->21->1076"
       ]
     },
     {
@@ -12990,7 +13082,7 @@
     {
       "en": "Local Profile Sync",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->934"
+        "index.html->id_computerSelector->dialog->21->938"
       ]
     },
     {
@@ -13006,7 +13098,7 @@
       "ru": "Локальная безопасность TLS",
       "zh-chs": "本地TLS安全",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->650"
+        "index.html->id_computerSelector->dialog->21->653"
       ]
     },
     {
@@ -13041,7 +13133,7 @@
       "ru": "Только местный",
       "zh-chs": "仅本地",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1088"
+        "index.html->id_computerSelector->dialog->21->1109"
       ]
     },
     {
@@ -13057,7 +13149,7 @@
       "ru": "Местонахождение",
       "zh-chs": "地区性",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->666"
+        "index.html->id_computerSelector->dialog->21->669"
       ]
     },
     {
@@ -13223,7 +13315,7 @@
       "ru": "MIME Тип",
       "zh-chs": "MIME类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1497"
+        "index.html->id_computerSelector->dialog->21->1521"
       ]
     },
     {
@@ -13255,7 +13347,7 @@
       "ru": "Управление HTTP прокси, используемыми для управления соединениями.",
       "zh-chs": "管理用于管理连接的HTTP代理。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1225"
+        "index.html->id_computerSelector->dialog->21->1246"
       ]
     },
     {
@@ -13271,7 +13363,7 @@
       "ru": "Управление наблюдателями присутствия агента Intel&reg; AMT.",
       "zh-chs": "管理英特尔&reg;AMT代理状态监视程序。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->766"
+        "index.html->id_computerSelector->dialog->21->769"
       ]
     },
     {
@@ -13287,7 +13379,7 @@
       "ru": "Управление сертификатами Intel&reg; AMT для этого компьютера.",
       "zh-chs": "管理此计算机的英特尔&reg;AMT证书。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->651"
+        "index.html->id_computerSelector->dialog->21->654"
       ]
     },
     {
@@ -13303,7 +13395,7 @@
       "ru": "Управление серверами удаленного управления Intel&reg; AMT.",
       "zh-chs": "管理英特尔&reg;AMT远程管理服务器。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1223"
+        "index.html->id_computerSelector->dialog->21->1244"
       ]
     },
     {
@@ -13319,7 +13411,7 @@
       "ru": "Управление хранилищем Intel&reg; AMT для этого компьютера.",
       "zh-chs": "管理此计算机的英特尔&reg;AMT存储。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1469"
+        "index.html->id_computerSelector->dialog->21->1493"
       ]
     },
     {
@@ -13335,7 +13427,7 @@
       "ru": "Управление фильтрами защиты системы Intel&reg; AMT.",
       "zh-chs": "管理英特尔&reg;AMT系统防御过滤器。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->818"
+        "index.html->id_computerSelector->dialog->21->821"
       ]
     },
     {
@@ -13351,7 +13443,7 @@
       "ru": "Управление политиками защиты Intel&reg; AMT.",
       "zh-chs": "管理英特尔&reg;AMT系统防御策略。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->816"
+        "index.html->id_computerSelector->dialog->21->819"
       ]
     },
     {
@@ -13367,7 +13459,7 @@
       "ru": "Управление подписчиками событий.",
       "zh-chs": "管理事件订阅者。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->571"
+        "index.html->id_computerSelector->dialog->21->574"
       ]
     },
     {
@@ -13383,7 +13475,7 @@
       "ru": "Управление учетными записями Intel&reg; AMT для этого компьютера.",
       "zh-chs": "管理此计算机的英特尔&reg;AMT用户帐户。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1070"
+        "index.html->id_computerSelector->dialog->21->1091"
       ]
     },
     {
@@ -13399,7 +13491,7 @@
       "ru": "Управление будильником.",
       "zh-chs": "管理唤醒警报。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1510"
+        "index.html->id_computerSelector->dialog->21->1534"
       ]
     },
     {
@@ -13456,7 +13548,7 @@
     {
       "en": "Manufacture date",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1060"
+        "index.html->id_computerSelector->dialog->21->1081"
       ]
     },
     {
@@ -13472,11 +13564,11 @@
       "ru": "производитель",
       "zh-chs": "制造商",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1012",
-        "index.html->id_computerSelector->dialog->21->1017",
-        "index.html->id_computerSelector->dialog->21->1028",
-        "index.html->id_computerSelector->dialog->21->1036",
-        "index.html->id_computerSelector->dialog->21->1059"
+        "index.html->id_computerSelector->dialog->21->1033",
+        "index.html->id_computerSelector->dialog->21->1038",
+        "index.html->id_computerSelector->dialog->21->1049",
+        "index.html->id_computerSelector->dialog->21->1057",
+        "index.html->id_computerSelector->dialog->21->1080"
       ]
     },
     {
@@ -13521,7 +13613,7 @@
       "ru": "Соответствующие правила",
       "zh-chs": "匹配规则",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->843"
+        "index.html->id_computerSelector->dialog->21->846"
       ]
     },
     {
@@ -13537,7 +13629,29 @@
       "ru": "Соответствие трафика",
       "zh-chs": "匹配流量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->867"
+        "index.html->id_computerSelector->dialog->21->870"
+      ]
+    },
+    {
+      "en": "Maximum 128 characters",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12domaindiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12domaindiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12usernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12usernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27domaindiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27domaindiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27usernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27usernamediv"
+      ]
+    },
+    {
+      "en": "Maximum 256 characters",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacdiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacdiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacdiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacdiv"
       ]
     },
     {
@@ -13556,7 +13670,20 @@
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->3",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->3",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->5",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->5"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->5",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamediv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamediv"
+      ]
+    },
+    {
+      "en": "Maximum 80 characters",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12roamingidentitydiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12roamingidentitydiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27roamingidentitydiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27roamingidentitydiv"
       ]
     },
     {
@@ -13572,7 +13699,7 @@
       "ru": "Максимальное общее количество действий",
       "zh-chs": "最大总动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->764"
+        "index.html->id_computerSelector->dialog->21->767"
       ]
     },
     {
@@ -13588,7 +13715,25 @@
       "ru": "Максимальные сторожевые псы",
       "zh-chs": "最大看门狗",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->762"
+        "index.html->id_computerSelector->dialog->21->765"
+      ]
+    },
+    {
+      "en": "Maximum length is 256 characters",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacpassworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacpassworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacpassworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacpassworddiv"
+      ]
+    },
+    {
+      "en": "Maximum length is 32 characters",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12passworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12passworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27passworddiv",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27passworddiv"
       ]
     },
     {
@@ -13604,7 +13749,7 @@
       "ru": "Максимальная скорость розетки",
       "zh-chs": "最大插座速度",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1031"
+        "index.html->id_computerSelector->dialog->21->1052"
       ]
     },
     {
@@ -13620,7 +13765,7 @@
       "ru": "Модуль памяти",
       "zh-chs": "记忆体模组",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1034"
+        "index.html->id_computerSelector->dialog->21->1055"
       ]
     },
     {
@@ -13668,7 +13813,7 @@
       "ru": "MeshCentral Desktop",
       "zh-chs": "MeshCentral桌面",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1677"
+        "index.html->id_computerSelector->dialog->21->1701"
       ]
     },
     {
@@ -13684,7 +13829,7 @@
       "ru": "MeshCentral Terminal",
       "zh-chs": "网状中央终端",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1676"
+        "index.html->id_computerSelector->dialog->21->1700"
       ]
     },
     {
@@ -13706,7 +13851,7 @@
     {
       "en": "MeshCommander Web Server Root",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->683"
+        "index.html->id_computerSelector->dialog->21->686"
       ]
     },
     {
@@ -13744,7 +13889,7 @@
       "ru": "модель",
       "zh-chs": "模型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1045"
+        "index.html->id_computerSelector->dialog->21->1066"
       ]
     },
     {
@@ -13760,7 +13905,13 @@
       "ru": "Контролируемый субъект",
       "zh-chs": "受监控实体",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->774"
+        "index.html->id_computerSelector->dialog->21->777"
+      ]
+    },
+    {
+      "en": "More",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1728"
       ]
     },
     {
@@ -13776,7 +13927,7 @@
       "ru": "Смонтируйте образы дисков на компьютере Intel&reg; AMT - экспериментально.",
       "zh-chs": "在英特尔&reg;AMT计算机上安装磁盘映像-实验。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1181"
+        "index.html->id_computerSelector->dialog->21->1202"
       ]
     },
     {
@@ -13792,7 +13943,7 @@
       "ru": "Mutual-auth TLS",
       "zh-chs": "相互认证TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->646"
+        "index.html->id_computerSelector->dialog->21->649"
       ]
     },
     {
@@ -13837,14 +13988,14 @@
       "ru": "имя",
       "zh-chs": "名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1091",
-        "index.html->id_computerSelector->dialog->21->1481",
-        "index.html->id_computerSelector->dialog->21->1527",
-        "index.html->id_computerSelector->dialog->21->782",
-        "index.html->id_computerSelector->dialog->21->836",
-        "index.html->id_computerSelector->dialog->21->865",
-        "index.html->id_computerSelector->dialog->21->874",
-        "index.html->id_computerSelector->dialog->21->895"
+        "index.html->id_computerSelector->dialog->21->1112",
+        "index.html->id_computerSelector->dialog->21->1505",
+        "index.html->id_computerSelector->dialog->21->1551",
+        "index.html->id_computerSelector->dialog->21->785",
+        "index.html->id_computerSelector->dialog->21->839",
+        "index.html->id_computerSelector->dialog->21->868",
+        "index.html->id_computerSelector->dialog->21->877",
+        "index.html->id_computerSelector->dialog->21->898"
       ]
     },
     {
@@ -13860,7 +14011,7 @@
       "ru": "Имя и домен",
       "zh-chs": "名称和域名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1304",
+        "index.html->id_computerSelector->dialog->21->1325",
         "index.html->id_computerSelector->dialog->21->375",
         "index.html->id_computerSelector->dialog->21->451"
       ]
@@ -13878,7 +14029,7 @@
       "ru": "Разделение имени",
       "zh-chs": "姓名分享",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1307"
+        "index.html->id_computerSelector->dialog->21->1328"
       ]
     },
     {
@@ -13956,7 +14107,7 @@
       "ru": "Сетевой локальный адрес",
       "zh-chs": "网络本地地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1326"
+        "index.html->id_computerSelector->dialog->21->1347"
       ]
     },
     {
@@ -13972,7 +14123,7 @@
       "ru": "Только сеть",
       "zh-chs": "仅网络",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1089"
+        "index.html->id_computerSelector->dialog->21->1110"
       ]
     },
     {
@@ -14001,7 +14152,7 @@
       "ru": "Никогда не перезаписывает",
       "zh-chs": "永不覆盖",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->618"
+        "index.html->id_computerSelector->dialog->21->621"
       ]
     },
     {
@@ -14017,8 +14168,8 @@
       "ru": "Новый аккаунт",
       "zh-chs": "新账户",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1080",
-        "index.html->id_computerSelector->dialog->21->1082"
+        "index.html->id_computerSelector->dialog->21->1101",
+        "index.html->id_computerSelector->dialog->21->1103"
       ]
     },
     {
@@ -14050,7 +14201,7 @@
       "ru": "Новая папка",
       "zh-chs": "新建文件夹",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1169",
+        "index.html->id_computerSelector->dialog->21->1190",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3"
       ]
     },
@@ -14080,7 +14231,7 @@
       "ru": "Новый профиль",
       "zh-chs": "新的配置文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->930"
+        "index.html->id_computerSelector->dialog->21->934"
       ]
     },
     {
@@ -14096,7 +14247,7 @@
       "ru": "Новая запись #",
       "zh-chs": "新纪录 ＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1646"
+        "index.html->id_computerSelector->dialog->21->1670"
       ]
     },
     {
@@ -14112,7 +14263,7 @@
       "ru": "Новый скрипт",
       "zh-chs": "新剧本",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1548"
+        "index.html->id_computerSelector->dialog->21->1572"
       ]
     },
     {
@@ -14128,7 +14279,7 @@
       "ru": "Новая подписка",
       "zh-chs": "新订阅",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->573"
+        "index.html->id_computerSelector->dialog->21->576"
       ]
     },
     {
@@ -14163,19 +14314,19 @@
       "ru": "Следующее действие загрузки установлено.",
       "zh-chs": "下一个启动操作集。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1466"
+        "index.html->id_computerSelector->dialog->21->1490"
       ]
     },
     {
       "en": "Nickel Cadmium",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1053"
+        "index.html->id_computerSelector->dialog->21->1074"
       ]
     },
     {
       "en": "Nickel Metal Hydride",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1054"
+        "index.html->id_computerSelector->dialog->21->1075"
       ]
     },
     {
@@ -14191,7 +14342,7 @@
       "ru": "нет",
       "zh-chs": "没有",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->677"
+        "index.html->id_computerSelector->dialog->21->680"
       ]
     },
     {
@@ -14207,7 +14358,7 @@
       "ru": "Нет сертификата, TLS отключен",
       "zh-chs": "无证书，禁用TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->729"
+        "index.html->id_computerSelector->dialog->21->732"
       ]
     },
     {
@@ -14257,7 +14408,7 @@
       "ru": "Профили беспроводных сетей отсутствуют",
       "zh-chs": "没有无线配置文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->929"
+        "index.html->id_computerSelector->dialog->21->933"
       ]
     },
     {
@@ -14273,7 +14424,7 @@
       "ru": "Агент по наблюдению за присутствием не найден.",
       "zh-chs": "找不到代理人状态监视程序。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->767"
+        "index.html->id_computerSelector->dialog->21->770"
       ]
     },
     {
@@ -14289,7 +14440,7 @@
       "ru": "События журнала аудита не найдены.",
       "zh-chs": "找不到审核日志事件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->624"
+        "index.html->id_computerSelector->dialog->21->627"
       ]
     },
     {
@@ -14318,7 +14469,7 @@
       "ru": "Сертификаты не найдены.",
       "zh-chs": "找不到证书。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->652"
+        "index.html->id_computerSelector->dialog->21->655"
       ]
     },
     {
@@ -14334,7 +14485,7 @@
       "ru": "Файлы не найдены.",
       "zh-chs": "找不到文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1475"
+        "index.html->id_computerSelector->dialog->21->1499"
       ]
     },
     {
@@ -14350,7 +14501,7 @@
       "ru": "Домены интрасети отсутствуют, обнаружение окружения отключено.",
       "zh-chs": "没有Intranet域，禁用环境检测。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1249"
+        "index.html->id_computerSelector->dialog->21->1270"
       ]
     },
     {
@@ -14392,7 +14543,7 @@
       "ru": "Не настроены прокси.",
       "zh-chs": "未配置代理。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1226"
+        "index.html->id_computerSelector->dialog->21->1247"
       ]
     },
     {
@@ -14408,7 +14559,7 @@
       "ru": "Удаленные серверы не найдены.",
       "zh-chs": "找不到远程服务器。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1224"
+        "index.html->id_computerSelector->dialog->21->1245"
       ]
     },
     {
@@ -14424,7 +14575,7 @@
       "ru": "Подписки не найдены.",
       "zh-chs": "找不到订阅。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->572"
+        "index.html->id_computerSelector->dialog->21->575"
       ]
     },
     {
@@ -14440,7 +14591,7 @@
       "ru": "Фильтры защиты системы не найдены.",
       "zh-chs": "找不到系统防御过滤器。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->819"
+        "index.html->id_computerSelector->dialog->21->822"
       ]
     },
     {
@@ -14456,7 +14607,7 @@
       "ru": "Политики защиты системы не найдены.",
       "zh-chs": "找不到系统防御策略。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->817"
+        "index.html->id_computerSelector->dialog->21->820"
       ]
     },
     {
@@ -14472,7 +14623,7 @@
       "ru": "Нет будильника зарегистрировано.",
       "zh-chs": "没有注册唤醒警报。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1516"
+        "index.html->id_computerSelector->dialog->21->1540"
       ]
     },
     {
@@ -14501,7 +14652,7 @@
       "ru": "NodeID",
       "zh-chs": "节点ID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1675"
+        "index.html->id_computerSelector->dialog->21->1699"
       ]
     },
     {
@@ -14517,10 +14668,10 @@
       "ru": "Никто",
       "zh-chs": "没有",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1101",
-        "index.html->id_computerSelector->dialog->21->1213",
-        "index.html->id_computerSelector->dialog->21->1215",
-        "index.html->id_computerSelector->dialog->21->1217",
+        "index.html->id_computerSelector->dialog->21->1122",
+        "index.html->id_computerSelector->dialog->21->1234",
+        "index.html->id_computerSelector->dialog->21->1236",
+        "index.html->id_computerSelector->dialog->21->1238",
         "index.html->id_computerSelector->dialog->21->231",
         "index.html->id_computerSelector->dialog->21->329",
         "index.html->id_computerSelector->dialog->21->330",
@@ -14532,17 +14683,19 @@
         "index.html->id_computerSelector->dialog->21->399",
         "index.html->id_computerSelector->dialog->21->448",
         "index.html->id_computerSelector->dialog->21->474",
-        "index.html->id_computerSelector->dialog->21->492",
-        "index.html->id_computerSelector->dialog->21->494",
-        "index.html->id_computerSelector->dialog->21->503",
-        "index.html->id_computerSelector->dialog->21->512",
-        "index.html->id_computerSelector->dialog->21->587",
-        "index.html->id_computerSelector->dialog->21->810",
-        "index.html->id_computerSelector->dialog->21->830",
-        "index.html->id_computerSelector->dialog->21->925",
+        "index.html->id_computerSelector->dialog->21->495",
+        "index.html->id_computerSelector->dialog->21->497",
+        "index.html->id_computerSelector->dialog->21->506",
+        "index.html->id_computerSelector->dialog->21->515",
+        "index.html->id_computerSelector->dialog->21->590",
+        "index.html->id_computerSelector->dialog->21->813",
+        "index.html->id_computerSelector->dialog->21->833",
+        "index.html->id_computerSelector->dialog->21->929",
+        "index.html->id_computerSelector->dialog->21->952",
+        "index.html->id_computerSelector->dialog->21->953",
+        "index.html->id_computerSelector->dialog->21->961",
+        "index.html->id_computerSelector->dialog->21->962",
         "index.html->id_computerSelector->dialog->21->97",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->11->idx_d12enc->id_d12e5",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->7->idx_d24ForceBootDevice->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->idx_d24bootSource->idx_d24BootMediaIndex->1"
       ]
     },
@@ -14589,8 +14742,8 @@
       "zh-chs": "不适用",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->426",
-        "index.html->id_computerSelector->dialog->21->599",
-        "index.html->id_computerSelector->dialog->21->747"
+        "index.html->id_computerSelector->dialog->21->602",
+        "index.html->id_computerSelector->dialog->21->750"
       ]
     },
     {
@@ -14642,7 +14795,7 @@
       "ru": "Не положено",
       "zh-chs": "不允许",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1329"
+        "index.html->id_computerSelector->dialog->21->1350"
       ]
     },
     {
@@ -14690,7 +14843,7 @@
       "ru": "Не задано",
       "zh-chs": "没有设置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1546"
+        "index.html->id_computerSelector->dialog->21->1570"
       ]
     },
     {
@@ -14729,6 +14882,18 @@
         "index.html->id_computerSelector->dialog->21->437"
       ]
     },
+    {
+      "en": "OEM Custom Action",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1427"
+      ]
+    },
+    {
+      "en": "OEM Data (HEX)",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1434"
+      ]
+    },
     {
       "en": "OEM Specific Firmware Error event"
     },
@@ -14751,7 +14916,7 @@
       "ru": "Хорошо",
       "zh-chs": "好",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1689",
+        "index.html->id_computerSelector->dialog->21->1713",
         "index.html->id_computerSelector->dialog->dialog->7"
       ]
     },
@@ -14768,7 +14933,7 @@
       "ru": "ОС энергосбережения",
       "zh-chs": "操作系统省电",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1363",
+        "index.html->id_computerSelector->dialog->21->1384",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->d24p501"
       ]
     },
@@ -14785,7 +14950,7 @@
       "ru": "OS Wake из режима ожидания",
       "zh-chs": "操作系统从待机状态唤醒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1362",
+        "index.html->id_computerSelector->dialog->21->1383",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->d24p500"
       ]
     },
@@ -14802,7 +14967,7 @@
       "ru": "ОС включить",
       "zh-chs": "操作系统启用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1207"
+        "index.html->id_computerSelector->dialog->21->1228"
       ]
     },
     {
@@ -14818,7 +14983,7 @@
       "ru": "от",
       "zh-chs": "关",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->911"
+        "index.html->id_computerSelector->dialog->21->914"
       ]
     },
     {
@@ -14882,7 +15047,7 @@
       "ru": "офсет",
       "zh-chs": "偏移量",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->564"
+        "index.html->id_computerSelector->dialog->21->567"
       ]
     },
     {
@@ -14924,7 +15089,7 @@
       "ru": "При следующей загрузке",
       "zh-chs": "下次启动时",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1184"
+        "index.html->id_computerSelector->dialog->21->1205"
       ]
     },
     {
@@ -14940,7 +15105,7 @@
       "ru": "На подключен",
       "zh-chs": "开启，已连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->910"
+        "index.html->id_computerSelector->dialog->21->913"
       ]
     },
     {
@@ -14956,7 +15121,7 @@
       "ru": "Отключен",
       "zh-chs": "开启，已断开",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->912"
+        "index.html->id_computerSelector->dialog->21->915"
       ]
     },
     {
@@ -15026,9 +15191,9 @@
       "ru": "открыто",
       "zh-chs": "打开",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1471",
-        "index.html->id_computerSelector->dialog->21->1472",
-        "index.html->id_computerSelector->dialog->21->914"
+        "index.html->id_computerSelector->dialog->21->1495",
+        "index.html->id_computerSelector->dialog->21->1496",
+        "index.html->id_computerSelector->dialog->21->917"
       ]
     },
     {
@@ -15050,8 +15215,8 @@
       "ru": "Открыть файл",
       "zh-chs": "打开文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1630",
-        "index.html->id_computerSelector->dialog->21->1633",
+        "index.html->id_computerSelector->dialog->21->1654",
+        "index.html->id_computerSelector->dialog->21->1657",
         "index.html->id_computerSelector->dialog->21->176"
       ]
     },
@@ -15068,14 +15233,14 @@
       "ru": "Открыть файл...",
       "zh-chs": "打开文件...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1688",
+        "index.html->id_computerSelector->dialog->21->1712",
         "index.html->id_computerSelector->id_sessionPlayerPanel->1->1->0->7"
       ]
     },
     {
       "en": "Open Setup.bin file",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1632"
+        "index.html->id_computerSelector->dialog->21->1656"
       ]
     },
     {
@@ -15091,7 +15256,7 @@
       "ru": "Захват открытого терминала",
       "zh-chs": "打开终端捕获",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1124"
+        "index.html->id_computerSelector->dialog->21->1145"
       ]
     },
     {
@@ -15124,7 +15289,7 @@
       "ru": "Операционная система",
       "zh-chs": "操作系统",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->755"
+        "index.html->id_computerSelector->dialog->21->758"
       ]
     },
     {
@@ -15140,7 +15305,7 @@
       "ru": "Процесс загрузки операционной системы",
       "zh-chs": "操作系统启动过程",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->756"
+        "index.html->id_computerSelector->dialog->21->759"
       ]
     },
     {
@@ -15156,7 +15321,7 @@
       "ru": "Процесс завершения работы операционной системы",
       "zh-chs": "操作系统关闭过程",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->757"
+        "index.html->id_computerSelector->dialog->21->760"
       ]
     },
     {
@@ -15201,7 +15366,7 @@
       "ru": "операция",
       "zh-chs": "运作方式",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->686"
+        "index.html->id_computerSelector->dialog->21->689"
       ]
     },
     {
@@ -15256,7 +15421,7 @@
       "ru": "Тайм-аут (в секундах)",
       "zh-chs": "选择加入超时（秒）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->530"
+        "index.html->id_computerSelector->dialog->21->533"
       ]
     },
     {
@@ -15272,7 +15437,7 @@
       "ru": "Факультативные правила",
       "zh-chs": "可选规则",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->842"
+        "index.html->id_computerSelector->dialog->21->845"
       ]
     },
     {
@@ -15304,7 +15469,7 @@
       "ru": "Подразделение Орг",
       "zh-chs": "组织单位",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->663"
+        "index.html->id_computerSelector->dialog->21->666"
       ]
     },
     {
@@ -15320,10 +15485,10 @@
       "ru": "организация",
       "zh-chs": "组织",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1601",
-        "index.html->id_computerSelector->dialog->21->1606",
-        "index.html->id_computerSelector->dialog->21->662",
-        "index.html->id_computerSelector->dialog->21->702"
+        "index.html->id_computerSelector->dialog->21->1625",
+        "index.html->id_computerSelector->dialog->21->1630",
+        "index.html->id_computerSelector->dialog->21->665",
+        "index.html->id_computerSelector->dialog->21->705"
       ]
     },
     {
@@ -15339,22 +15504,22 @@
       "ru": "Другой",
       "zh-chs": "其他",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1050",
+        "index.html->id_computerSelector->dialog->21->1004",
+        "index.html->id_computerSelector->dialog->21->1071",
         "index.html->id_computerSelector->dialog->21->422",
-        "index.html->id_computerSelector->dialog->21->595",
-        "index.html->id_computerSelector->dialog->21->743",
-        "index.html->id_computerSelector->dialog->21->754",
-        "index.html->id_computerSelector->dialog->21->913",
-        "index.html->id_computerSelector->dialog->21->921",
-        "index.html->id_computerSelector->dialog->21->951",
-        "index.html->id_computerSelector->dialog->21->953",
-        "index.html->id_computerSelector->dialog->21->983"
+        "index.html->id_computerSelector->dialog->21->598",
+        "index.html->id_computerSelector->dialog->21->746",
+        "index.html->id_computerSelector->dialog->21->757",
+        "index.html->id_computerSelector->dialog->21->916",
+        "index.html->id_computerSelector->dialog->21->925",
+        "index.html->id_computerSelector->dialog->21->972",
+        "index.html->id_computerSelector->dialog->21->974"
       ]
     },
     {
       "en": "Other Info",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1067"
+        "index.html->id_computerSelector->dialog->21->1088"
       ]
     },
     {
@@ -15386,7 +15551,7 @@
       "ru": "Исходящий / Передать",
       "zh-chs": "出站/发送",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->844"
+        "index.html->id_computerSelector->dialog->21->847"
       ]
     },
     {
@@ -15402,7 +15567,14 @@
       "ru": "Политика перезаписи",
       "zh-chs": "覆写政策",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->616"
+        "index.html->id_computerSelector->dialog->21->619"
+      ]
+    },
+    {
+      "en": "PAC Password",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacpassworddiv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacpassworddiv->1"
       ]
     },
     {
@@ -15418,6 +15590,20 @@
       "ru": "Флаг пропуска",
       "zh-chs": "通过政策标志"
     },
+    {
+      "en": "PEAPv0/EAP-MSCHAPv2",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->5",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->5"
+      ]
+    },
+    {
+      "en": "PEAPv1/EAP-GTC",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->idx_d12protocol->7",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->idx_d27protocol->7"
+      ]
+    },
     {
       "de": "PKI-DNS-Suffix",
       "en": "PKI DNS Suffix",
@@ -15444,13 +15630,19 @@
       "ru": "PUT AMT_BootSettingData, Ошибка № {0}",
       "zh-chs": "PUT AMT_BootSettingData，错误＃{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1458"
+        "index.html->id_computerSelector->dialog->21->1482"
       ]
     },
     {
       "en": "PUT CIM_BootConfigSetting_ChangeBootOrder, Error #{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1454"
+        "index.html->id_computerSelector->dialog->21->1478"
+      ]
+    },
+    {
+      "en": "PXE Timeout",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pxetimeoutdiv->1"
       ]
     },
     {
@@ -15466,7 +15658,7 @@
       "ru": "Пакетов / секунду",
       "zh-chs": "包/秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->853"
+        "index.html->id_computerSelector->dialog->21->856"
       ]
     },
     {
@@ -15482,7 +15674,7 @@
       "ru": "Номер части",
       "zh-chs": "零件号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1043"
+        "index.html->id_computerSelector->dialog->21->1064"
       ]
     },
     {
@@ -15498,14 +15690,16 @@
       "ru": "пароль",
       "zh-chs": "密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1396",
-        "index.html->id_computerSelector->dialog->21->1593",
-        "index.html->id_computerSelector->dialog->21->1594",
-        "index.html->id_computerSelector->dialog->21->1619",
+        "index.html->id_computerSelector->dialog->21->1415",
+        "index.html->id_computerSelector->dialog->21->1617",
+        "index.html->id_computerSelector->dialog->21->1618",
+        "index.html->id_computerSelector->dialog->21->1643",
         "index.html->id_computerSelector->dialog->21->174",
         "index.html->id_computerSelector->dialog->21->264",
         "index.html->id_computerSelector->dialog->21->277",
-        "index.html->id_computerSelector->dialog->21->591",
+        "index.html->id_computerSelector->dialog->21->594",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12passworddiv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27passworddiv->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog8->3->3"
       ]
     },
@@ -15535,7 +15729,7 @@
       "ru": "Пароль*",
       "zh-chs": "密码*",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->13->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12pass->1->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog18->d18showpassword->1->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog2->5->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog4->5->1",
@@ -15555,8 +15749,8 @@
       "ru": "Вставить",
       "zh-chs": "糊",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1125",
-        "index.html->id_computerSelector->dialog->21->1174",
+        "index.html->id_computerSelector->dialog->21->1146",
+        "index.html->id_computerSelector->dialog->21->1195",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p13->13->1->4->1->3",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3"
       ]
@@ -15606,7 +15800,7 @@
       "ru": "Приостановлено",
       "zh-chs": "已暂停",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1554"
+        "index.html->id_computerSelector->dialog->21->1578"
       ]
     },
     {
@@ -15622,7 +15816,7 @@
       "ru": "Выполнить действие",
       "zh-chs": "执行动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->792"
+        "index.html->id_computerSelector->dialog->21->795"
       ]
     },
     {
@@ -15722,7 +15916,7 @@
       "ru": "Выполнение силового действия ...",
       "zh-chs": "正在执行电源操作...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1464"
+        "index.html->id_computerSelector->dialog->21->1488"
       ]
     },
     {
@@ -15738,7 +15932,7 @@
       "ru": "периодический",
       "zh-chs": "定期的",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1219"
+        "index.html->id_computerSelector->dialog->21->1240"
       ]
     },
     {
@@ -15754,7 +15948,7 @@
       "ru": "Периодическая связь",
       "zh-chs": "定期连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1222"
+        "index.html->id_computerSelector->dialog->21->1243"
       ]
     },
     {
@@ -15770,7 +15964,7 @@
       "ru": "Периодический, временной интервал",
       "zh-chs": "定期，时间间隔",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1242"
+        "index.html->id_computerSelector->dialog->21->1263"
       ]
     },
     {
@@ -15786,8 +15980,8 @@
       "ru": "разрешение",
       "zh-chs": "允许",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1095",
-        "index.html->id_computerSelector->dialog->21->1097",
+        "index.html->id_computerSelector->dialog->21->1116",
+        "index.html->id_computerSelector->dialog->21->1118",
         "index.html->id_computerSelector->dialog->dialog->5->dialog2->id_d2permissions->1->1"
       ]
     },
@@ -15821,7 +16015,7 @@
       "ru": "Платформа",
       "zh-chs": "平台",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1010"
+        "index.html->id_computerSelector->dialog->21->1031"
       ]
     },
     {
@@ -15872,7 +16066,7 @@
       "ru": "Политика №",
       "zh-chs": "政策编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->904"
+        "index.html->id_computerSelector->dialog->21->907"
       ]
     },
     {
@@ -15888,8 +16082,8 @@
       "ru": "PolicyRuleName",
       "zh-chs": "PolicyRuleName",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1218",
-        "index.html->id_computerSelector->dialog->21->1230"
+        "index.html->id_computerSelector->dialog->21->1239",
+        "index.html->id_computerSelector->dialog->21->1251"
       ]
     },
     {
@@ -15905,8 +16099,8 @@
       "ru": "порт",
       "zh-chs": "港口",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1257",
-        "index.html->id_computerSelector->dialog->21->1278"
+        "index.html->id_computerSelector->dialog->21->1278",
+        "index.html->id_computerSelector->dialog->21->1299"
       ]
     },
     {
@@ -15922,7 +16116,7 @@
       "ru": "Порт 5900",
       "zh-chs": "5900端口",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->533"
+        "index.html->id_computerSelector->dialog->21->536"
       ]
     },
     {
@@ -15976,30 +16170,29 @@
       "ru": "Действие силы",
       "zh-chs": "权力行动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1385",
-        "index.html->id_computerSelector->dialog->21->1387",
-        "index.html->id_computerSelector->dialog->21->1393",
+        "index.html->id_computerSelector->dialog->21->1406",
         "index.html->id_computerSelector->dialog->21->1412",
-        "index.html->id_computerSelector->dialog->21->1414",
-        "index.html->id_computerSelector->dialog->21->1416",
-        "index.html->id_computerSelector->dialog->21->1419",
-        "index.html->id_computerSelector->dialog->21->1423",
-        "index.html->id_computerSelector->dialog->21->1424",
-        "index.html->id_computerSelector->dialog->21->1426",
-        "index.html->id_computerSelector->dialog->21->1429",
-        "index.html->id_computerSelector->dialog->21->1433",
-        "index.html->id_computerSelector->dialog->21->1435",
-        "index.html->id_computerSelector->dialog->21->1439",
-        "index.html->id_computerSelector->dialog->21->1441",
-        "index.html->id_computerSelector->dialog->21->1445",
+        "index.html->id_computerSelector->dialog->21->1436",
+        "index.html->id_computerSelector->dialog->21->1438",
+        "index.html->id_computerSelector->dialog->21->1440",
+        "index.html->id_computerSelector->dialog->21->1443",
         "index.html->id_computerSelector->dialog->21->1447",
-        "index.html->id_computerSelector->dialog->21->1451",
+        "index.html->id_computerSelector->dialog->21->1448",
+        "index.html->id_computerSelector->dialog->21->1450",
         "index.html->id_computerSelector->dialog->21->1453",
         "index.html->id_computerSelector->dialog->21->1457",
         "index.html->id_computerSelector->dialog->21->1459",
         "index.html->id_computerSelector->dialog->21->1463",
         "index.html->id_computerSelector->dialog->21->1465",
-        "index.html->id_computerSelector->dialog->21->1468",
+        "index.html->id_computerSelector->dialog->21->1469",
+        "index.html->id_computerSelector->dialog->21->1471",
+        "index.html->id_computerSelector->dialog->21->1475",
+        "index.html->id_computerSelector->dialog->21->1477",
+        "index.html->id_computerSelector->dialog->21->1481",
+        "index.html->id_computerSelector->dialog->21->1483",
+        "index.html->id_computerSelector->dialog->21->1487",
+        "index.html->id_computerSelector->dialog->21->1489",
+        "index.html->id_computerSelector->dialog->21->1492",
         "index.html->id_computerSelector->dialog->dialog->5->dialog5->3->3"
       ]
     },
@@ -16016,11 +16209,11 @@
       "ru": "Силовые Действия",
       "zh-chs": "权力行动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1354",
-        "index.html->id_computerSelector->dialog->21->1384",
-        "index.html->id_computerSelector->dialog->21->1399",
-        "index.html->id_computerSelector->dialog->21->1400",
-        "index.html->id_computerSelector->dialog->21->1411"
+        "index.html->id_computerSelector->dialog->21->1375",
+        "index.html->id_computerSelector->dialog->21->1405",
+        "index.html->id_computerSelector->dialog->21->1418",
+        "index.html->id_computerSelector->dialog->21->1419",
+        "index.html->id_computerSelector->dialog->21->1435"
       ]
     },
     {
@@ -16096,9 +16289,9 @@
       "ru": "Силовое действие завершено.",
       "zh-chs": "电源操作已完成。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1391",
-        "index.html->id_computerSelector->dialog->21->1421",
-        "index.html->id_computerSelector->dialog->21->1467"
+        "index.html->id_computerSelector->dialog->21->1410",
+        "index.html->id_computerSelector->dialog->21->1445",
+        "index.html->id_computerSelector->dialog->21->1491"
       ]
     },
     {
@@ -16114,8 +16307,8 @@
       "ru": "Ошибка действия питания # {0}.",
       "zh-chs": "电源操作错误＃{0}。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1392",
-        "index.html->id_computerSelector->dialog->21->1422"
+        "index.html->id_computerSelector->dialog->21->1411",
+        "index.html->id_computerSelector->dialog->21->1446"
       ]
     },
     {
@@ -16131,7 +16324,7 @@
       "ru": "Силовой цикл",
       "zh-chs": "电源周期",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1358",
+        "index.html->id_computerSelector->dialog->21->1379",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->5"
       ]
     },
@@ -16212,7 +16405,7 @@
       "ru": "Выключить",
       "zh-chs": "掉电",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1359",
+        "index.html->id_computerSelector->dialog->21->1380",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->7"
       ]
     },
@@ -16236,7 +16429,7 @@
     {
       "en": "Power on to HTTPS Boot",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1381"
+        "index.html->id_computerSelector->dialog->21->1402"
       ]
     },
     {
@@ -16252,7 +16445,7 @@
       "ru": "Включите IDR-R CDROM",
       "zh-chs": "开启IDE-R CDROM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1377"
+        "index.html->id_computerSelector->dialog->21->1398"
       ]
     },
     {
@@ -16268,7 +16461,7 @@
       "ru": "Включите IDE-R Floppy",
       "zh-chs": "打开IDE-R软盘",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1375"
+        "index.html->id_computerSelector->dialog->21->1396"
       ]
     },
     {
@@ -16284,7 +16477,7 @@
       "ru": "Включите PXE",
       "zh-chs": "开启PXE",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1379"
+        "index.html->id_computerSelector->dialog->21->1400"
       ]
     },
     {
@@ -16300,7 +16493,7 @@
       "ru": "Включите диагностику",
       "zh-chs": "开机进行诊断",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1360"
+        "index.html->id_computerSelector->dialog->21->1381"
       ]
     },
     {
@@ -16316,7 +16509,7 @@
       "ru": "Включите",
       "zh-chs": "充电",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1356",
+        "index.html->id_computerSelector->dialog->21->1377",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->1"
       ]
     },
@@ -16333,13 +16526,13 @@
       "ru": "Включите BIOS",
       "zh-chs": "启动BIOS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1368"
+        "index.html->id_computerSelector->dialog->21->1389"
       ]
     },
     {
       "en": "Power up to Platform Erase",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1372"
+        "index.html->id_computerSelector->dialog->21->1393"
       ]
     },
     {
@@ -16355,7 +16548,7 @@
       "ru": "Включите безопасное стирание",
       "zh-chs": "上电以安全擦除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1370"
+        "index.html->id_computerSelector->dialog->21->1391"
       ]
     },
     {
@@ -16390,7 +16583,7 @@
       "ru": "старшинство",
       "zh-chs": "优先顺序",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->896"
+        "index.html->id_computerSelector->dialog->21->899"
       ]
     },
     {
@@ -16409,7 +16602,7 @@
       "ru": "настоящее время",
       "zh-chs": "当下",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->679"
+        "index.html->id_computerSelector->dialog->21->682"
       ]
     },
     {
@@ -16425,10 +16618,10 @@
       "ru": "Нажмите [пробел] для воспроизведения / паузы.",
       "zh-chs": "按[空格]播放/暂停。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1682",
-        "index.html->id_computerSelector->dialog->21->1683",
-        "index.html->id_computerSelector->dialog->21->1684",
-        "index.html->id_computerSelector->dialog->21->1685"
+        "index.html->id_computerSelector->dialog->21->1706",
+        "index.html->id_computerSelector->dialog->21->1707",
+        "index.html->id_computerSelector->dialog->21->1708",
+        "index.html->id_computerSelector->dialog->21->1709"
       ]
     },
     {
@@ -16460,7 +16653,7 @@
       "ru": "Основной тип MPS",
       "zh-chs": "主要MPS类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1235"
+        "index.html->id_computerSelector->dialog->21->1256"
       ]
     },
     {
@@ -16478,7 +16671,7 @@
       "xloc": [
         "index.html->id_computerSelector->dialog->21->401",
         "index.html->id_computerSelector->dialog->21->402",
-        "index.html->id_computerSelector->dialog->21->525",
+        "index.html->id_computerSelector->dialog->21->528",
         "index.html->id_computerSelector->dialog->dialog->5->dialog6->5->d6Display->0"
       ]
     },
@@ -16495,7 +16688,7 @@
       "ru": "Основной сервер",
       "zh-chs": "主服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1232"
+        "index.html->id_computerSelector->dialog->21->1253"
       ]
     },
     {
@@ -16511,7 +16704,7 @@
       "ru": "приоритет",
       "zh-chs": "优先",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->941",
+        "index.html->id_computerSelector->dialog->21->945",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->7->3"
       ]
     },
@@ -16528,7 +16721,7 @@
       "ru": "Закрытый ключ",
       "zh-chs": "私钥",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1566"
+        "index.html->id_computerSelector->dialog->21->1590"
       ]
     },
     {
@@ -16544,7 +16737,7 @@
       "ru": "Закрытый ключ",
       "zh-chs": "私钥",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->678"
+        "index.html->id_computerSelector->dialog->21->681"
       ]
     },
     {
@@ -16560,7 +16753,7 @@
       "ru": "процессор",
       "zh-chs": "处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1027"
+        "index.html->id_computerSelector->dialog->21->1048"
       ]
     },
     {
@@ -16576,7 +16769,7 @@
       "ru": "Наименование товара",
       "zh-chs": "产品名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1018"
+        "index.html->id_computerSelector->dialog->21->1039"
       ]
     },
     {
@@ -16592,7 +16785,7 @@
       "ru": "Имя профиля",
       "zh-chs": "个人资料名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->937",
+        "index.html->id_computerSelector->dialog->21->941",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->3->1"
       ]
     },
@@ -16609,7 +16802,14 @@
       "ru": "Проприетарная карта",
       "zh-chs": "专有卡",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->990"
+        "index.html->id_computerSelector->dialog->21->1011"
+      ]
+    },
+    {
+      "en": "Protected Access Credentials",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12pacdiv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27pacdiv->1"
       ]
     },
     {
@@ -16625,7 +16825,9 @@
       "ru": "протокол",
       "zh-chs": "协议",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1681"
+        "index.html->id_computerSelector->dialog->21->1705",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12protocoldiv->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27protocoldiv->3"
       ]
     },
     {
@@ -16732,7 +16934,7 @@
       "ru": "Тип прокси",
       "zh-chs": "代理类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1270"
+        "index.html->id_computerSelector->dialog->21->1291"
       ]
     },
     {
@@ -16748,7 +16950,7 @@
       "ru": "Тянуть",
       "zh-chs": "拉",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->577"
+        "index.html->id_computerSelector->dialog->21->580"
       ]
     },
     {
@@ -16764,8 +16966,8 @@
       "ru": "От себя",
       "zh-chs": "推",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->574",
-        "index.html->id_computerSelector->dialog->21->582"
+        "index.html->id_computerSelector->dialog->21->577",
+        "index.html->id_computerSelector->dialog->21->585"
       ]
     },
     {
@@ -16781,15 +16983,21 @@
       "ru": "Нажмите с ACK",
       "zh-chs": "推送确认",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->575",
-        "index.html->id_computerSelector->dialog->21->583"
+        "index.html->id_computerSelector->dialog->21->578",
+        "index.html->id_computerSelector->dialog->21->586"
       ]
     },
     {
-      "en": "Pyrite PSID"
+      "en": "Pyrite PSID",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1432"
+      ]
     },
     {
-      "en": "Pyrite Revert"
+      "en": "Pyrite Revert",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1423"
+      ]
     },
     {
       "de": "Qualität",
@@ -16837,8 +17045,8 @@
       "zh-chs": "停顿",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->430",
-        "index.html->id_computerSelector->dialog->21->603",
-        "index.html->id_computerSelector->dialog->21->751"
+        "index.html->id_computerSelector->dialog->21->606",
+        "index.html->id_computerSelector->dialog->21->754"
       ]
     },
     {
@@ -16854,7 +17062,7 @@
       "ru": "Тихо",
       "zh-chs": "安静",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->23->idx_d24Verbocity->idx_d24Verbocity1"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->25->idx_d24Verbocity->idx_d24Verbocity1"
       ]
     },
     {
@@ -16870,13 +17078,13 @@
       "ru": "баран",
       "zh-chs": "内存",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->961"
+        "index.html->id_computerSelector->dialog->21->982"
       ]
     },
     {
       "en": "RAW16, 16k Colors",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1153"
+        "index.html->id_computerSelector->dialog->21->1174"
       ]
     },
     {
@@ -16898,7 +17106,7 @@
     {
       "en": "RAW8, 256 Colors",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1152"
+        "index.html->id_computerSelector->dialog->21->1173"
       ]
     },
     {
@@ -16943,7 +17151,7 @@
       "ru": "RDRAM",
       "zh-chs": "内存",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->971"
+        "index.html->id_computerSelector->dialog->21->992"
       ]
     },
     {
@@ -16959,14 +17167,14 @@
       "ru": "RIMM",
       "zh-chs": "RIMM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->994"
+        "index.html->id_computerSelector->dialog->21->1015"
       ]
     },
     {
       "en": "RLE16, 64k Colors",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1145",
-        "index.html->id_computerSelector->dialog->21->1151"
+        "index.html->id_computerSelector->dialog->21->1166",
+        "index.html->id_computerSelector->dialog->21->1172"
       ]
     },
     {
@@ -16988,7 +17196,7 @@
     {
       "en": "RLE4G, 16 Grays",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1142"
+        "index.html->id_computerSelector->dialog->21->1163"
       ]
     },
     {
@@ -17010,8 +17218,8 @@
     {
       "en": "RLE8, 256 Colors",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1144",
-        "index.html->id_computerSelector->dialog->21->1150"
+        "index.html->id_computerSelector->dialog->21->1165",
+        "index.html->id_computerSelector->dialog->21->1171"
       ]
     },
     {
@@ -17033,7 +17241,7 @@
     {
       "en": "RLE8G, 256 Grays",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1143"
+        "index.html->id_computerSelector->dialog->21->1164"
       ]
     },
     {
@@ -17085,7 +17293,7 @@
       "ru": "ПЗУ",
       "zh-chs": "只读存储器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->962"
+        "index.html->id_computerSelector->dialog->21->983"
       ]
     },
     {
@@ -17139,7 +17347,7 @@
       "ru": "Ограничение скорости",
       "zh-chs": "速率限制",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->849"
+        "index.html->id_computerSelector->dialog->21->852"
       ]
     },
     {
@@ -17155,7 +17363,7 @@
       "ru": "Ограничение скорости",
       "zh-chs": "速率限制",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->807"
+        "index.html->id_computerSelector->dialog->21->810"
       ]
     },
     {
@@ -17171,8 +17379,8 @@
       "ru": "Realms",
       "zh-chs": "境界",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1072",
-        "index.html->id_computerSelector->dialog->21->1102"
+        "index.html->id_computerSelector->dialog->21->1093",
+        "index.html->id_computerSelector->dialog->21->1123"
       ]
     },
     {
@@ -17188,7 +17396,7 @@
       "ru": "Запись №",
       "zh-chs": "记录号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1641"
+        "index.html->id_computerSelector->dialog->21->1665"
       ]
     },
     {
@@ -17236,7 +17444,7 @@
       "ru": "Записанный игрок сеанса",
       "zh-chs": "录音会话播放器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1686"
+        "index.html->id_computerSelector->dialog->21->1710"
       ]
     },
     {
@@ -17284,7 +17492,7 @@
       "ru": "Записи: {0}, потреблено: {1}",
       "zh-chs": "记录：{0}，已消耗：{1}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1638"
+        "index.html->id_computerSelector->dialog->21->1662"
       ]
     },
     {
@@ -17329,7 +17537,7 @@
       "ru": "Ошибка PUT RedirectionService",
       "zh-chs": "RedirectionService PUT错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1316"
+        "index.html->id_computerSelector->dialog->21->1337"
       ]
     },
     {
@@ -17345,7 +17553,7 @@
       "ru": "RedirectionService, Ошибка RequestStateChange",
       "zh-chs": "RedirectionService，RequestStateChange错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1312"
+        "index.html->id_computerSelector->dialog->21->1333"
       ]
     },
     {
@@ -17378,8 +17586,8 @@
       "zh-chs": "刷新",
       "xloc": [
         "index.html->id_computerSelector->9->1->0->13->id_noScriptButtons",
-        "index.html->id_computerSelector->dialog->21->1478",
-        "index.html->id_computerSelector->dialog->21->1703",
+        "index.html->id_computerSelector->dialog->21->1502",
+        "index.html->id_computerSelector->dialog->21->1727",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3",
         "index.html->id_lmsMainPanel->1->id_lmsToolBarContent->7"
       ]
@@ -17413,7 +17621,7 @@
       "ru": "Дата выпуска",
       "zh-chs": "发布日期",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1026"
+        "index.html->id_computerSelector->dialog->21->1047"
       ]
     },
     {
@@ -17448,7 +17656,7 @@
       "ru": "Удаленный CN\\'s",
       "zh-chs": "远程CN",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->733"
+        "index.html->id_computerSelector->dialog->21->736"
       ]
     },
     {
@@ -17493,10 +17701,10 @@
       "ru": "Удаленный рабочий стол",
       "zh-chs": "远程桌面",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1129",
-        "index.html->id_computerSelector->dialog->21->1131",
-        "index.html->id_computerSelector->dialog->21->1133",
-        "index.html->id_computerSelector->dialog->21->1135",
+        "index.html->id_computerSelector->dialog->21->1150",
+        "index.html->id_computerSelector->dialog->21->1152",
+        "index.html->id_computerSelector->dialog->21->1154",
+        "index.html->id_computerSelector->dialog->21->1156",
         "index.html->id_computerSelector->dialog->21->414",
         "index.html->id_computerSelector->dialog->21->415",
         "index.html->id_computerSelector->id_mainview->id_leftbar->go14->0",
@@ -17529,9 +17737,9 @@
       "ru": "Настройки удаленного рабочего стола",
       "zh-chs": "远程桌面设置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1140",
-        "index.html->id_computerSelector->dialog->21->539",
-        "index.html->id_computerSelector->dialog->21->540"
+        "index.html->id_computerSelector->dialog->21->1161",
+        "index.html->id_computerSelector->dialog->21->542",
+        "index.html->id_computerSelector->dialog->21->543"
       ]
     },
     {
@@ -17547,7 +17755,7 @@
       "ru": "Удаленный идентификатор",
       "zh-chs": "远端ID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1261"
+        "index.html->id_computerSelector->dialog->21->1282"
       ]
     },
     {
@@ -17576,7 +17784,7 @@
       "ru": "Удаленный ввод с клавиатуры",
       "zh-chs": "远程键盘输入",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1158"
+        "index.html->id_computerSelector->dialog->21->1179"
       ]
     },
     {
@@ -17652,7 +17860,7 @@
       "ru": "Удаленный сервер #",
       "zh-chs": "远程服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1265"
+        "index.html->id_computerSelector->dialog->21->1286"
       ]
     },
     {
@@ -17668,7 +17876,7 @@
       "ru": "Удаленное удаление сервера",
       "zh-chs": "远程服务器删除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1266"
+        "index.html->id_computerSelector->dialog->21->1287"
       ]
     },
     {
@@ -17684,14 +17892,14 @@
       "ru": "Удаленная безопасность TLS",
       "zh-chs": "远程TLS安全",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->649"
+        "index.html->id_computerSelector->dialog->21->652"
       ]
     },
     {
       "en": "Remote Terminal",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1109",
-        "index.html->id_computerSelector->dialog->21->1111"
+        "index.html->id_computerSelector->dialog->21->1130",
+        "index.html->id_computerSelector->dialog->21->1132"
       ]
     },
     {
@@ -17737,9 +17945,9 @@
       "ru": "Удалить",
       "zh-chs": "去掉",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1250",
-        "index.html->id_computerSelector->dialog->21->892",
-        "index.html->id_computerSelector->dialog->21->928"
+        "index.html->id_computerSelector->dialog->21->1271",
+        "index.html->id_computerSelector->dialog->21->895",
+        "index.html->id_computerSelector->dialog->21->932"
       ]
     },
     {
@@ -17755,7 +17963,7 @@
       "ru": "Удалить сертификат",
       "zh-chs": "删除证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->727"
+        "index.html->id_computerSelector->dialog->21->730"
       ]
     },
     {
@@ -17787,7 +17995,7 @@
       "ru": "Удалить фильтр",
       "zh-chs": "删除过滤器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->872"
+        "index.html->id_computerSelector->dialog->21->875"
       ]
     },
     {
@@ -17837,7 +18045,7 @@
       "ru": "Удалить политику",
       "zh-chs": "删除政策",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->905"
+        "index.html->id_computerSelector->dialog->21->908"
       ]
     },
     {
@@ -17885,7 +18093,7 @@
       "ru": "Удалить все тревоги",
       "zh-chs": "删除所有警报",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1517"
+        "index.html->id_computerSelector->dialog->21->1541"
       ]
     },
     {
@@ -17901,7 +18109,7 @@
       "ru": "Удалить все будильники",
       "zh-chs": "删除所有唤醒警报",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1519"
+        "index.html->id_computerSelector->dialog->21->1543"
       ]
     },
     {
@@ -17933,7 +18141,7 @@
       "ru": "Удалить профиль беспроводной сети \\\"{0}\\\"?",
       "zh-chs": "删除无线配置文件\\“ {0} \\”？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->943"
+        "index.html->id_computerSelector->dialog->21->950"
       ]
     },
     {
@@ -17949,7 +18157,7 @@
       "ru": "Rename",
       "zh-chs": "改名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1171",
+        "index.html->id_computerSelector->dialog->21->1192",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3"
       ]
     },
@@ -17966,7 +18174,7 @@
       "ru": "Сменная?",
       "zh-chs": "可更换？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1022"
+        "index.html->id_computerSelector->dialog->21->1043"
       ]
     },
     {
@@ -18015,7 +18223,7 @@
       "ru": "Сброс",
       "zh-chs": "重启",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1357",
+        "index.html->id_computerSelector->dialog->21->1378",
         "index.html->id_computerSelector->dialog->21->89",
         "index.html->id_computerSelector->dialog->dialog->5->dialog24->3->idx_d24Command->3"
       ]
@@ -18033,7 +18241,7 @@
       "ru": "Сбросить и очистить редактор скриптов?",
       "zh-chs": "重置并清除脚本编辑器？",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1549"
+        "index.html->id_computerSelector->dialog->21->1573"
       ]
     },
     {
@@ -18049,13 +18257,13 @@
       "ru": "Сбросить в BIOS",
       "zh-chs": "重置为BIOS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1369"
+        "index.html->id_computerSelector->dialog->21->1390"
       ]
     },
     {
       "en": "Reset to HTTPS Boot",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1380"
+        "index.html->id_computerSelector->dialog->21->1401"
       ]
     },
     {
@@ -18071,7 +18279,7 @@
       "ru": "Сбросить на IDE-R CDROM",
       "zh-chs": "重置为IDE-R CDROM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1376"
+        "index.html->id_computerSelector->dialog->21->1397"
       ]
     },
     {
@@ -18087,7 +18295,7 @@
       "ru": "Сбросить на IDE-R дискету",
       "zh-chs": "重置为IDE-R软盘",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1374"
+        "index.html->id_computerSelector->dialog->21->1395"
       ]
     },
     {
@@ -18103,13 +18311,13 @@
       "ru": "Сброс к PXE",
       "zh-chs": "重置为PXE",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1378"
+        "index.html->id_computerSelector->dialog->21->1399"
       ]
     },
     {
       "en": "Reset to Platform Erase",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1373"
+        "index.html->id_computerSelector->dialog->21->1394"
       ]
     },
     {
@@ -18125,7 +18333,7 @@
       "ru": "Сброс для безопасного стирания",
       "zh-chs": "重置为安全擦除",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1371"
+        "index.html->id_computerSelector->dialog->21->1392"
       ]
     },
     {
@@ -18141,7 +18349,7 @@
       "ru": "Сброс к диагностике",
       "zh-chs": "重置为诊断",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1361"
+        "index.html->id_computerSelector->dialog->21->1382"
       ]
     },
     {
@@ -18190,6 +18398,19 @@
       "ru": "Ограниченный",
       "zh-chs": "受限制的"
     },
+    {
+      "en": "Reverse Mouse Wheel",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog7->7->1->20"
+      ]
+    },
+    {
+      "en": "Roaming Identity",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12roamingidentitydiv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27roamingidentitydiv->1"
+      ]
+    },
     {
       "de": "Wurzel",
       "en": "Root",
@@ -18203,8 +18424,8 @@
       "ru": "корень",
       "zh-chs": "根",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1163",
-        "index.html->id_computerSelector->dialog->21->1470"
+        "index.html->id_computerSelector->dialog->21->1184",
+        "index.html->id_computerSelector->dialog->21->1494"
       ]
     },
     {
@@ -18252,7 +18473,7 @@
       "ru": "Ряд чипсов",
       "zh-chs": "排薯条",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->993"
+        "index.html->id_computerSelector->dialog->21->1014"
       ]
     },
     {
@@ -18269,8 +18490,8 @@
       "zh-chs": "运行脚本",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->12",
-        "index.html->id_computerSelector->dialog->21->1535",
-        "index.html->id_computerSelector->dialog->21->1536",
+        "index.html->id_computerSelector->dialog->21->1559",
+        "index.html->id_computerSelector->dialog->21->1560",
         "index.html->id_computerSelector->dialog->21->267",
         "index.html->id_computerSelector->dialog->21->269",
         "index.html->id_computerSelector->dialog->21->271",
@@ -18374,7 +18595,7 @@
       "ru": "Бег",
       "zh-chs": "跑步",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1553"
+        "index.html->id_computerSelector->dialog->21->1577"
       ]
     },
     {
@@ -18454,7 +18675,7 @@
       "ru": "SDRAM",
       "zh-chs": "内存",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->969"
+        "index.html->id_computerSelector->dialog->21->990"
       ]
     },
     {
@@ -18470,7 +18691,7 @@
       "ru": "SGRAM",
       "zh-chs": "SGRAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->970"
+        "index.html->id_computerSelector->dialog->21->991"
       ]
     },
     {
@@ -18487,9 +18708,9 @@
       "zh-chs": "SHA1",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->142",
-        "index.html->id_computerSelector->dialog->21->1649",
-        "index.html->id_computerSelector->dialog->21->1654",
-        "index.html->id_computerSelector->dialog->21->1659"
+        "index.html->id_computerSelector->dialog->21->1673",
+        "index.html->id_computerSelector->dialog->21->1678",
+        "index.html->id_computerSelector->dialog->21->1683"
       ]
     },
     {
@@ -18506,8 +18727,8 @@
       "zh-chs": "SHA256",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->143",
-        "index.html->id_computerSelector->dialog->21->1655",
-        "index.html->id_computerSelector->dialog->21->1660"
+        "index.html->id_computerSelector->dialog->21->1679",
+        "index.html->id_computerSelector->dialog->21->1684"
       ]
     },
     {
@@ -18523,9 +18744,9 @@
       "ru": "SHA384",
       "zh-chs": "SHA3​​84",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1650",
-        "index.html->id_computerSelector->dialog->21->1656",
-        "index.html->id_computerSelector->dialog->21->1661"
+        "index.html->id_computerSelector->dialog->21->1674",
+        "index.html->id_computerSelector->dialog->21->1680",
+        "index.html->id_computerSelector->dialog->21->1685"
       ]
     },
     {
@@ -18554,7 +18775,7 @@
       "ru": "SIMM",
       "zh-chs": "SIMM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->985"
+        "index.html->id_computerSelector->dialog->21->1006"
       ]
     },
     {
@@ -18570,7 +18791,7 @@
       "ru": "ГЛОТОК",
       "zh-chs": "啜",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->986"
+        "index.html->id_computerSelector->dialog->21->1007"
       ]
     },
     {
@@ -18586,7 +18807,7 @@
       "ru": "SODIMM",
       "zh-chs": "SODIMM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->995"
+        "index.html->id_computerSelector->dialog->21->1016"
       ]
     },
     {
@@ -18667,7 +18888,7 @@
       "ru": "SRAM",
       "zh-chs": "SRAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->960"
+        "index.html->id_computerSelector->dialog->21->981"
       ]
     },
     {
@@ -18683,13 +18904,13 @@
       "ru": "SRIMM",
       "zh-chs": "斯里姆",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->996"
+        "index.html->id_computerSelector->dialog->21->1017"
       ]
     },
     {
       "en": "SSD Master Password",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1410"
+        "index.html->id_computerSelector->dialog->21->1433"
       ]
     },
     {
@@ -18705,7 +18926,7 @@
       "ru": "SSID",
       "zh-chs": "SSID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->938",
+        "index.html->id_computerSelector->dialog->21->942",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->5->1"
       ]
     },
@@ -18755,7 +18976,7 @@
       "ru": "Сохранить .cer",
       "zh-chs": "保存.cer",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1575"
+        "index.html->id_computerSelector->dialog->21->1599"
       ]
     },
     {
@@ -18771,7 +18992,7 @@
       "ru": "Сохранить .p12",
       "zh-chs": "保存.p12",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1576"
+        "index.html->id_computerSelector->dialog->21->1600"
       ]
     },
     {
@@ -18787,7 +19008,7 @@
       "ru": "Сохранить .pem",
       "zh-chs": "保存.pem",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1577"
+        "index.html->id_computerSelector->dialog->21->1601"
       ]
     },
     {
@@ -18835,14 +19056,14 @@
       "ru": "Сохранить все состояние Intel&reg; AMT",
       "zh-chs": "保存整个英特尔&reg;AMT状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->523",
-        "index.html->id_computerSelector->dialog->21->524"
+        "index.html->id_computerSelector->dialog->21->526",
+        "index.html->id_computerSelector->dialog->21->527"
       ]
     },
     {
       "en": "Save Script",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1558"
+        "index.html->id_computerSelector->dialog->21->1582"
       ]
     },
     {
@@ -18924,9 +19145,9 @@
       "zh-chs": "救...",
       "xloc": [
         "index.html->id_computerSelector->9->1->0->13->id_noScriptButtons",
-        "index.html->id_computerSelector->dialog->21->1008",
-        "index.html->id_computerSelector->dialog->21->550",
-        "index.html->id_computerSelector->dialog->21->622",
+        "index.html->id_computerSelector->dialog->21->1029",
+        "index.html->id_computerSelector->dialog->21->553",
+        "index.html->id_computerSelector->dialog->21->625",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->0->1->1",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p20->3->3",
         "index.html->id_computerSelector->id_usbSetupPanel->3->1->0->7"
@@ -19057,7 +19278,7 @@
       "ru": "Гашение экрана",
       "zh-chs": "屏幕消隐",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->538"
+        "index.html->id_computerSelector->dialog->21->541"
       ]
     },
     {
@@ -19073,7 +19294,7 @@
       "ru": "Не удалось установить гашение экрана, возможно, гашение экрана не поддерживается в этой системе ({0}).",
       "zh-chs": "无法设置屏幕消隐，该系统可能不支持消隐（{0}）。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->543"
+        "index.html->id_computerSelector->dialog->21->546"
       ]
     },
     {
@@ -19107,7 +19328,7 @@
       "ru": "Блок скриптов",
       "zh-chs": "脚本块",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1557"
+        "index.html->id_computerSelector->dialog->21->1581"
       ]
     },
     {
@@ -19139,7 +19360,7 @@
       "ru": "Ошибка компиляции скрипта",
       "zh-chs": "脚本编译错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1550"
+        "index.html->id_computerSelector->dialog->21->1574"
       ]
     },
     {
@@ -19210,7 +19431,7 @@
       "ru": "Вторичный тип MPS",
       "zh-chs": "次要MPS类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1240"
+        "index.html->id_computerSelector->dialog->21->1261"
       ]
     },
     {
@@ -19227,7 +19448,7 @@
       "zh-chs": "辅助显示",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->403",
-        "index.html->id_computerSelector->dialog->21->526",
+        "index.html->id_computerSelector->dialog->21->529",
         "index.html->id_computerSelector->dialog->dialog->5->dialog6->5->d6Display->1"
       ]
     },
@@ -19244,13 +19465,13 @@
       "ru": "Вторичный сервер",
       "zh-chs": "辅助服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1237"
+        "index.html->id_computerSelector->dialog->21->1258"
       ]
     },
     {
       "en": "Secure Erase All SSDs",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1404"
+        "index.html->id_computerSelector->dialog->21->1424"
       ]
     },
     {
@@ -19456,8 +19677,8 @@
       "ru": "Выбрать все",
       "zh-chs": "全选",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1165",
-        "index.html->id_computerSelector->dialog->21->1167",
+        "index.html->id_computerSelector->dialog->21->1186",
+        "index.html->id_computerSelector->dialog->21->1188",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p24->p24toolbar->1->0->1->3"
       ]
     },
@@ -19474,7 +19695,7 @@
       "ru": "Выберите Нет",
       "zh-chs": "选择无",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1166"
+        "index.html->id_computerSelector->dialog->21->1187"
       ]
     },
     {
@@ -19493,7 +19714,7 @@
     {
       "en": "Select a disk image for remote boot.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1389"
+        "index.html->id_computerSelector->dialog->21->1408"
       ]
     },
     {
@@ -19509,13 +19730,13 @@
       "ru": "Выберите небольшой файл для загрузки в хранилище и введите поставщика, приложение и имя файла.",
       "zh-chs": "选择一个小文件上传到存储，然后输入供应商，应用程序和文件名。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1489"
+        "index.html->id_computerSelector->dialog->21->1513"
       ]
     },
     {
       "en": "Select the actions to take:",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1409"
+        "index.html->id_computerSelector->dialog->21->1431"
       ]
     },
     {
@@ -19574,7 +19795,7 @@
       "ru": "Отправка согласия пользователя ...",
       "zh-chs": "正在传送使用者同意...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1440"
+        "index.html->id_computerSelector->dialog->21->1464"
       ]
     },
     {
@@ -19590,7 +19811,7 @@
       "ru": "Номер датчика",
       "zh-chs": "传感器编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->569"
+        "index.html->id_computerSelector->dialog->21->572"
       ]
     },
     {
@@ -19606,7 +19827,7 @@
       "ru": "Тип датчика",
       "zh-chs": "传感器类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->565"
+        "index.html->id_computerSelector->dialog->21->568"
       ]
     },
     {
@@ -19622,7 +19843,7 @@
       "ru": "Серийный номер",
       "zh-chs": "序列号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1037"
+        "index.html->id_computerSelector->dialog->21->1058"
       ]
     },
     {
@@ -19638,10 +19859,10 @@
       "ru": "Серийный номер",
       "zh-chs": "序列号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1014",
-        "index.html->id_computerSelector->dialog->21->1020",
-        "index.html->id_computerSelector->dialog->21->1046",
-        "index.html->id_computerSelector->dialog->21->1061"
+        "index.html->id_computerSelector->dialog->21->1035",
+        "index.html->id_computerSelector->dialog->21->1041",
+        "index.html->id_computerSelector->dialog->21->1067",
+        "index.html->id_computerSelector->dialog->21->1082"
       ]
     },
     {
@@ -19691,7 +19912,7 @@
       "ru": "сервер",
       "zh-chs": "服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1195"
+        "index.html->id_computerSelector->dialog->21->1216"
       ]
     },
     {
@@ -19707,7 +19928,28 @@
       "ru": "Общее имя сервера",
       "zh-chs": "服务器通用名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1291"
+        "index.html->id_computerSelector->dialog->21->1312"
+      ]
+    },
+    {
+      "en": "Server Issuer Cert",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servercertdiv->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servercertdiv->3"
+      ]
+    },
+    {
+      "en": "Server Name",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamediv->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamediv->1"
+      ]
+    },
+    {
+      "en": "Server Name Compare",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12servernamecomparediv->3",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27servernamecomparediv->3"
       ]
     },
     {
@@ -19746,7 +19988,7 @@
       "ru": "Порт сервера",
       "zh-chs": "服务器端口",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1290"
+        "index.html->id_computerSelector->dialog->21->1311"
       ]
     },
     {
@@ -19762,7 +20004,7 @@
       "ru": "Проверка подлинности сервера TLS",
       "zh-chs": "服务器身份验证TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->647"
+        "index.html->id_computerSelector->dialog->21->650"
       ]
     },
     {
@@ -19804,7 +20046,7 @@
       "ru": "Сервисный процессор",
       "zh-chs": "服务处理器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->761"
+        "index.html->id_computerSelector->dialog->21->764"
       ]
     },
     {
@@ -19864,7 +20106,7 @@
       "ru": "Начало сеанса",
       "zh-chs": "会话开始",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1187"
+        "index.html->id_computerSelector->dialog->21->1208"
       ]
     },
     {
@@ -19880,7 +20122,7 @@
       "ru": "Тайм-аут сеанса (минуты)",
       "zh-chs": "会话超时（分钟）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->529"
+        "index.html->id_computerSelector->dialog->21->532"
       ]
     },
     {
@@ -19896,7 +20138,7 @@
       "ru": "Идентификатор сессии",
       "zh-chs": "会话ID",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1672"
+        "index.html->id_computerSelector->dialog->21->1696"
       ]
     },
     {
@@ -19944,7 +20186,7 @@
     {
       "en": "Set new credentials",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1700"
+        "index.html->id_computerSelector->dialog->21->1724"
       ]
     },
     {
@@ -19960,7 +20202,7 @@
       "ru": "Настройка параметров загрузки: ",
       "zh-chs": "设置启动设置：",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1450"
+        "index.html->id_computerSelector->dialog->21->1474"
       ]
     },
     {
@@ -19992,7 +20234,7 @@
       "ru": "Настройка параметров загрузки ...",
       "zh-chs": "设置启动设置...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1452"
+        "index.html->id_computerSelector->dialog->21->1476"
       ]
     },
     {
@@ -20008,7 +20250,7 @@
       "ru": "Установка следующей загрузки ...",
       "zh-chs": "设置下一次启动...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1460"
+        "index.html->id_computerSelector->dialog->21->1484"
       ]
     },
     {
@@ -20024,7 +20266,7 @@
       "ru": "Настройка ...",
       "zh-chs": "配置...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1180"
+        "index.html->id_computerSelector->dialog->21->1201"
       ]
     },
     {
@@ -20121,7 +20363,7 @@
       "ru": "Строгость",
       "zh-chs": "严重程度",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->566"
+        "index.html->id_computerSelector->dialog->21->569"
       ]
     },
     {
@@ -20150,7 +20392,7 @@
       "ru": "Общий ключ",
       "zh-chs": "共用金钥",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->915"
+        "index.html->id_computerSelector->dialog->21->918"
       ]
     },
     {
@@ -20166,7 +20408,7 @@
       "ru": "Общий, такой же как ОС",
       "zh-chs": "共享，与操作系统相同",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1305"
+        "index.html->id_computerSelector->dialog->21->1326"
       ]
     },
     {
@@ -20309,8 +20551,8 @@
       "zh-chs": "关机",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->425",
-        "index.html->id_computerSelector->dialog->21->598",
-        "index.html->id_computerSelector->dialog->21->746"
+        "index.html->id_computerSelector->dialog->21->601",
+        "index.html->id_computerSelector->dialog->21->749"
       ]
     },
     {
@@ -20326,9 +20568,9 @@
       "ru": "Размер",
       "zh-chs": "尺寸",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1038",
-        "index.html->id_computerSelector->dialog->21->1047",
-        "index.html->id_computerSelector->dialog->21->1482"
+        "index.html->id_computerSelector->dialog->21->1059",
+        "index.html->id_computerSelector->dialog->21->1068",
+        "index.html->id_computerSelector->dialog->21->1506"
       ]
     },
     {
@@ -20360,7 +20602,7 @@
       "ru": "Спать",
       "zh-chs": "睡觉",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1366"
+        "index.html->id_computerSelector->dialog->21->1387"
       ]
     },
     {
@@ -20401,7 +20643,7 @@
       "ru": "Малый Фокус",
       "zh-chs": "小焦点",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1155"
+        "index.html->id_computerSelector->dialog->21->1176"
       ]
     },
     {
@@ -20485,7 +20727,7 @@
       "ru": "Soft-офф",
       "zh-chs": "软脱",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1364"
+        "index.html->id_computerSelector->dialog->21->1385"
       ]
     },
     {
@@ -20501,7 +20743,7 @@
       "ru": "Мягкий сброс",
       "zh-chs": "软复位",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1365"
+        "index.html->id_computerSelector->dialog->21->1386"
       ]
     },
     {
@@ -20597,8 +20839,8 @@
       "ru": "Источник",
       "zh-chs": "资源",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->551",
-        "index.html->id_computerSelector->dialog->21->558"
+        "index.html->id_computerSelector->dialog->21->554",
+        "index.html->id_computerSelector->dialog->21->561"
       ]
     },
     {
@@ -20614,7 +20856,7 @@
       "ru": "Тип источника",
       "zh-chs": "来源类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->567"
+        "index.html->id_computerSelector->dialog->21->570"
       ]
     },
     {
@@ -20678,8 +20920,8 @@
       "ru": "Начать захват",
       "zh-chs": "开始捕捉",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1122",
-        "index.html->id_computerSelector->dialog->21->1123",
+        "index.html->id_computerSelector->dialog->21->1143",
+        "index.html->id_computerSelector->dialog->21->1144",
         "index.html->id_computerSelector->dialog->21->152",
         "index.html->id_computerSelector->dialog->21->65",
         "index.html->id_computerSelector->dialog->21->66",
@@ -20753,7 +20995,7 @@
       "ru": "Запустите ваш скрипт, перетаскивая блоки с левой стороны в это поле для скриптов.",
       "zh-chs": "通过将块从左侧拖放到此脚本框中来启动脚本。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1547"
+        "index.html->id_computerSelector->dialog->21->1571"
       ]
     },
     {
@@ -20770,8 +21012,8 @@
       "zh-chs": "开始",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->431",
-        "index.html->id_computerSelector->dialog->21->604",
-        "index.html->id_computerSelector->dialog->21->752"
+        "index.html->id_computerSelector->dialog->21->607",
+        "index.html->id_computerSelector->dialog->21->755"
       ]
     },
     {
@@ -20787,7 +21029,7 @@
       "ru": "Начало подписки ...",
       "zh-chs": "开始选择加入...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1430"
+        "index.html->id_computerSelector->dialog->21->1454"
       ]
     },
     {
@@ -20803,7 +21045,7 @@
       "ru": "Запуск (секунд)",
       "zh-chs": "启动（秒）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->785"
+        "index.html->id_computerSelector->dialog->21->788"
       ]
     },
     {
@@ -20819,7 +21061,7 @@
       "ru": "Интервал запуска",
       "zh-chs": "启动间隔",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->777"
+        "index.html->id_computerSelector->dialog->21->780"
       ]
     },
     {
@@ -20835,9 +21077,9 @@
       "ru": "государственный",
       "zh-chs": "州",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1092",
+        "index.html->id_computerSelector->dialog->21->1113",
         "index.html->id_computerSelector->dialog->21->471",
-        "index.html->id_computerSelector->dialog->21->612"
+        "index.html->id_computerSelector->dialog->21->615"
       ]
     },
     {
@@ -20853,11 +21095,11 @@
       "ru": "Штат / провинция",
       "zh-chs": "州/省",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1602",
-        "index.html->id_computerSelector->dialog->21->1607",
-        "index.html->id_computerSelector->dialog->21->664",
-        "index.html->id_computerSelector->dialog->21->665",
-        "index.html->id_computerSelector->dialog->21->703"
+        "index.html->id_computerSelector->dialog->21->1626",
+        "index.html->id_computerSelector->dialog->21->1631",
+        "index.html->id_computerSelector->dialog->21->667",
+        "index.html->id_computerSelector->dialog->21->668",
+        "index.html->id_computerSelector->dialog->21->706"
       ]
     },
     {
@@ -20873,7 +21115,7 @@
       "ru": "Статический IP-адрес",
       "zh-chs": "静态IP地址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->489"
+        "index.html->id_computerSelector->dialog->21->492"
       ]
     },
     {
@@ -20902,7 +21144,7 @@
       "ru": "Статическая конфигурация с использованием настроек IPv4 ниже",
       "zh-chs": "使用下面的IPv4设置进行静态配置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1349"
+        "index.html->id_computerSelector->dialog->21->1370"
       ]
     },
     {
@@ -20918,7 +21160,7 @@
       "ru": "Положение дел",
       "zh-chs": "状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1033"
+        "index.html->id_computerSelector->dialog->21->1054"
       ]
     },
     {
@@ -20983,7 +21225,7 @@
       "ru": "Остановить захват",
       "zh-chs": "停止捕捉",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1121",
+        "index.html->id_computerSelector->dialog->21->1142",
         "index.html->id_computerSelector->dialog->21->69"
       ]
     },
@@ -21051,8 +21293,8 @@
       "ru": "Остановился",
       "zh-chs": "已停止",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1551",
-        "index.html->id_computerSelector->dialog->21->1552",
+        "index.html->id_computerSelector->dialog->21->1575",
+        "index.html->id_computerSelector->dialog->21->1576",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p20->3->EditScriptStatus"
       ]
     },
@@ -21069,7 +21311,7 @@
       "ru": "Остановлено, без сценария",
       "zh-chs": "已停止，无脚本",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1555"
+        "index.html->id_computerSelector->dialog->21->1579"
       ]
     },
     {
@@ -21085,9 +21327,9 @@
       "ru": "Место хранения",
       "zh-chs": "存储",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1485",
-        "index.html->id_computerSelector->dialog->21->1487",
-        "index.html->id_computerSelector->dialog->21->613",
+        "index.html->id_computerSelector->dialog->21->1509",
+        "index.html->id_computerSelector->dialog->21->1511",
+        "index.html->id_computerSelector->dialog->21->616",
         "index.html->id_computerSelector->id_mainview->id_leftbar->go21->0",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p21->1"
       ]
@@ -21157,7 +21399,7 @@
       "ru": "Элемент хранения",
       "zh-chs": "储存物品",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1484"
+        "index.html->id_computerSelector->dialog->21->1508"
       ]
     },
     {
@@ -21173,7 +21415,7 @@
       "ru": "Медиа хранилище",
       "zh-chs": "存储介质",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1044"
+        "index.html->id_computerSelector->dialog->21->1065"
       ]
     },
     {
@@ -21189,8 +21431,8 @@
       "ru": "Перенаправление хранилища",
       "zh-chs": "存储重定向",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1188",
-        "index.html->id_computerSelector->dialog->21->1201"
+        "index.html->id_computerSelector->dialog->21->1209",
+        "index.html->id_computerSelector->dialog->21->1222"
       ]
     },
     {
@@ -21206,9 +21448,9 @@
       "ru": "Ошибка перенаправления памяти",
       "zh-chs": "存储重定向错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1189",
-        "index.html->id_computerSelector->dialog->21->1191",
-        "index.html->id_computerSelector->dialog->21->1193"
+        "index.html->id_computerSelector->dialog->21->1210",
+        "index.html->id_computerSelector->dialog->21->1212",
+        "index.html->id_computerSelector->dialog->21->1214"
       ]
     },
     {
@@ -21224,7 +21466,7 @@
       "ru": "Загрузка хранилища",
       "zh-chs": "存储上传",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1500"
+        "index.html->id_computerSelector->dialog->21->1524"
       ]
     },
     {
@@ -21253,7 +21495,7 @@
       "ru": "Надежный пароль",
       "zh-chs": "强密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1296"
+        "index.html->id_computerSelector->dialog->21->1317"
       ]
     },
     {
@@ -21285,7 +21527,7 @@
       "ru": "Подписка",
       "zh-chs": "订阅",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->581"
+        "index.html->id_computerSelector->dialog->21->584"
       ]
     },
     {
@@ -21356,7 +21598,7 @@
       "ru": "Фамилия",
       "zh-chs": "姓",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->668"
+        "index.html->id_computerSelector->dialog->21->671"
       ]
     },
     {
@@ -21499,7 +21741,7 @@
       "ru": "Синхронный DRAM",
       "zh-chs": "同步DRAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->955"
+        "index.html->id_computerSelector->dialog->21->976"
       ]
     },
     {
@@ -21515,7 +21757,7 @@
       "ru": "Системные установки по умолчанию",
       "zh-chs": "系统默认",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->23->idx_d24Verbocity->1"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->25->idx_d24Verbocity->1"
       ]
     },
     {
@@ -21548,7 +21790,7 @@
       "ru": "Идентификатор системы",
       "zh-chs": "系统编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1015",
+        "index.html->id_computerSelector->dialog->21->1036",
         "index.html->id_computerSelector->dialog->21->376",
         "index.html->id_computerSelector->dialog->21->377"
       ]
@@ -21622,7 +21864,7 @@
       "ru": "TKIP-RC4",
       "zh-chs": "TKIP-RC4",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->923",
+        "index.html->id_computerSelector->dialog->21->927",
         "index.html->id_computerSelector->dialog->dialog->5->dialog12->11->idx_d12enc->id_d12e3"
       ]
     },
@@ -21674,7 +21916,7 @@
       "ru": "Аутентификация TLS",
       "zh-chs": "TLS认证",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1562"
+        "index.html->id_computerSelector->dialog->21->1586"
       ]
     },
     {
@@ -21724,7 +21966,7 @@
       "ru": "Клиент TLS",
       "zh-chs": "TLS客户端",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1579",
+        "index.html->id_computerSelector->dialog->21->1603",
         "index.html->id_computerSelector->dialog->21->298"
       ]
     },
@@ -21741,8 +21983,8 @@
       "ru": "Клиент TLS (HTTPS)",
       "zh-chs": "TLS客户端（HTTPS）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1613",
-        "index.html->id_computerSelector->dialog->21->707"
+        "index.html->id_computerSelector->dialog->21->1637",
+        "index.html->id_computerSelector->dialog->21->710"
       ]
     },
     {
@@ -21819,7 +22061,7 @@
       "ru": "TLS-сервер",
       "zh-chs": "TLS服务器",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1582",
+        "index.html->id_computerSelector->dialog->21->1606",
         "index.html->id_computerSelector->dialog->21->301"
       ]
     },
@@ -21836,8 +22078,8 @@
       "ru": "TLS-сервер (HTTPS)",
       "zh-chs": "TLS服务器（HTTPS）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1612",
-        "index.html->id_computerSelector->dialog->21->706"
+        "index.html->id_computerSelector->dialog->21->1636",
+        "index.html->id_computerSelector->dialog->21->709"
       ]
     },
     {
@@ -21879,8 +22121,8 @@
       "ru": "Настройки TLS",
       "zh-chs": "TLS设置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->734",
-        "index.html->id_computerSelector->dialog->21->737"
+        "index.html->id_computerSelector->dialog->21->737",
+        "index.html->id_computerSelector->dialog->21->740"
       ]
     },
     {
@@ -21979,7 +22221,7 @@
     {
       "en": "TPM Clear",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1405"
+        "index.html->id_computerSelector->dialog->21->1426"
       ]
     },
     {
@@ -21995,7 +22237,7 @@
       "ru": "TSOP",
       "zh-chs": "TSOP",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->992"
+        "index.html->id_computerSelector->dialog->21->1013"
       ]
     },
     {
@@ -22034,7 +22276,7 @@
     {
       "en": "Text Encoding",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1160"
+        "index.html->id_computerSelector->dialog->21->1181"
       ]
     },
     {
@@ -22088,15 +22330,15 @@
     {
       "en": "The device indicated that this type of connection of not supported.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1112",
-        "index.html->id_computerSelector->dialog->21->1132"
+        "index.html->id_computerSelector->dialog->21->1133",
+        "index.html->id_computerSelector->dialog->21->1153"
       ]
     },
     {
       "en": "The remote device is busy, a session may already be open.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1110",
-        "index.html->id_computerSelector->dialog->21->1130"
+        "index.html->id_computerSelector->dialog->21->1131",
+        "index.html->id_computerSelector->dialog->21->1151"
       ]
     },
     {
@@ -22112,7 +22354,7 @@
       "ru": "Для выбранного файла сертификата требуется пароль.",
       "zh-chs": "所选证书文件需要密码。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1618"
+        "index.html->id_computerSelector->dialog->21->1642"
       ]
     },
     {
@@ -22160,7 +22402,7 @@
       "ru": "Этот сертификат будет использоваться для аутентификации этой консоли в Intel AMT.",
       "zh-chs": "该证书将用于向英特尔AMT验证此控制台。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1561"
+        "index.html->id_computerSelector->dialog->21->1585"
       ]
     },
     {
@@ -22193,14 +22435,14 @@
       "ru": "Эта функция не часто поддерживается",
       "zh-chs": "经常不支持此功能",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->537"
+        "index.html->id_computerSelector->dialog->21->540"
       ]
     },
     {
       "en": "This feature requires a TLS connection to Intel AMT",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1388",
-        "index.html->id_computerSelector->dialog->21->1420"
+        "index.html->id_computerSelector->dialog->21->1407",
+        "index.html->id_computerSelector->dialog->21->1444"
       ]
     },
     {
@@ -22216,7 +22458,7 @@
       "ru": "Это пара ключей открытого / закрытого сертификата, которая не принадлежит ни к одному сертификату. Эта запись должна быть временной.",
       "zh-chs": "这是不属于任何证书的公用/专用证书密钥对。该条目应该是临时的。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->659"
+        "index.html->id_computerSelector->dialog->21->662"
       ]
     },
     {
@@ -22232,7 +22474,7 @@
       "ru": "Это доверенный сертификат",
       "zh-chs": "这是一个受信任的证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1572"
+        "index.html->id_computerSelector->dialog->21->1596"
       ]
     },
     {
@@ -22248,7 +22490,7 @@
       "ru": "Эта политика не содержит фильтров.",
       "zh-chs": "此策略不包含任何过滤器。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->891"
+        "index.html->id_computerSelector->dialog->21->894"
       ]
     },
     {
@@ -22264,7 +22506,7 @@
       "ru": "Эта запись: ",
       "zh-chs": "该记录是： ",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1642"
+        "index.html->id_computerSelector->dialog->21->1666"
       ]
     },
     {
@@ -22296,10 +22538,10 @@
       "ru": "Время",
       "zh-chs": "时间",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1665",
-        "index.html->id_computerSelector->dialog->21->557",
-        "index.html->id_computerSelector->dialog->21->625",
-        "index.html->id_computerSelector->dialog->21->635"
+        "index.html->id_computerSelector->dialog->21->1689",
+        "index.html->id_computerSelector->dialog->21->560",
+        "index.html->id_computerSelector->dialog->21->628",
+        "index.html->id_computerSelector->dialog->21->638"
       ]
     },
     {
@@ -22315,8 +22557,8 @@
       "ru": "Отметка времени",
       "zh-chs": "时标",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1616",
-        "index.html->id_computerSelector->dialog->21->710"
+        "index.html->id_computerSelector->dialog->21->1640",
+        "index.html->id_computerSelector->dialog->21->713"
       ]
     },
     {
@@ -22332,7 +22574,7 @@
       "ru": "Штамповка времени",
       "zh-chs": "时标",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1586",
+        "index.html->id_computerSelector->dialog->21->1610",
         "index.html->id_computerSelector->dialog->21->305"
       ]
     },
@@ -22349,7 +22591,7 @@
       "ru": "Время суток (ЧЧ: ММ)",
       "zh-chs": "时间（HH：MM）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1247"
+        "index.html->id_computerSelector->dialog->21->1268"
       ]
     },
     {
@@ -22365,7 +22607,13 @@
       "ru": "Время суток, один раз в день",
       "zh-chs": "一天中的时间，一天一次",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1243"
+        "index.html->id_computerSelector->dialog->21->1264"
+      ]
+    },
+    {
+      "en": "Timeout (Seconds)",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->idx_d24diskImageHttpTimeout->3"
       ]
     },
     {
@@ -22381,7 +22629,7 @@
       "ru": "Тайм-аут (секунды)",
       "zh-chs": "超时（秒）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->786"
+        "index.html->id_computerSelector->dialog->21->789"
       ]
     },
     {
@@ -22397,7 +22645,7 @@
       "ru": "Ошибка тайм-аута",
       "zh-chs": "超时错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1691"
+        "index.html->id_computerSelector->dialog->21->1715"
       ]
     },
     {
@@ -22413,7 +22661,7 @@
       "ru": "Интервал тайм-аута",
       "zh-chs": "超时间隔",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->779"
+        "index.html->id_computerSelector->dialog->21->782"
       ]
     },
     {
@@ -22429,7 +22677,7 @@
       "ru": "к",
       "zh-chs": "至",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->791"
+        "index.html->id_computerSelector->dialog->21->794"
       ]
     },
     {
@@ -22509,7 +22757,7 @@
       "ru": "Переключить скрытые учетные записи",
       "zh-chs": "切换隐藏的帐户",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1079"
+        "index.html->id_computerSelector->dialog->21->1100"
       ]
     },
     {
@@ -22595,7 +22843,7 @@
       "ru": "Интервал срабатывания (секунды)",
       "zh-chs": "触发间隔（秒）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1246"
+        "index.html->id_computerSelector->dialog->21->1267"
       ]
     },
     {
@@ -22611,7 +22859,7 @@
       "ru": "Тип триггера",
       "zh-chs": "触发类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1244"
+        "index.html->id_computerSelector->dialog->21->1265"
       ]
     },
     {
@@ -22627,8 +22875,8 @@
       "ru": "доверенный",
       "zh-chs": "值得信赖",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1564",
-        "index.html->id_computerSelector->dialog->21->513"
+        "index.html->id_computerSelector->dialog->21->1588",
+        "index.html->id_computerSelector->dialog->21->516"
       ]
     },
     {
@@ -22651,7 +22899,7 @@
       "ru": "Сертификат доверенного корня",
       "zh-chs": "受信任的根证书",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->690"
+        "index.html->id_computerSelector->dialog->21->693"
       ]
     },
     {
@@ -22674,7 +22922,7 @@
       "ru": "Доверенный корень",
       "zh-chs": "受信任的根",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->675"
+        "index.html->id_computerSelector->dialog->21->678"
       ]
     },
     {
@@ -22690,7 +22938,7 @@
       "ru": "Время жизни туннеля (секунды)",
       "zh-chs": "隧道寿命（秒）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1241"
+        "index.html->id_computerSelector->dialog->21->1262"
       ]
     },
     {
@@ -22706,12 +22954,12 @@
       "ru": "Тип",
       "zh-chs": "类型",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1041",
         "index.html->id_computerSelector->dialog->21->1062",
-        "index.html->id_computerSelector->dialog->21->568",
-        "index.html->id_computerSelector->dialog->21->584",
-        "index.html->id_computerSelector->dialog->21->841",
-        "index.html->id_computerSelector->dialog->21->866",
+        "index.html->id_computerSelector->dialog->21->1083",
+        "index.html->id_computerSelector->dialog->21->571",
+        "index.html->id_computerSelector->dialog->21->587",
+        "index.html->id_computerSelector->dialog->21->844",
+        "index.html->id_computerSelector->dialog->21->869",
         "index.html->id_computerSelector->id_mainview->id_mainarea->id_mainarea_pad->p14->11->1->4->1->25"
       ]
     },
@@ -22725,13 +22973,13 @@
     {
       "en": "UEFI Wifi CoEx Profile Sharing",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->935"
+        "index.html->id_computerSelector->dialog->21->939"
       ]
     },
     {
       "en": "UEFIWiFiProfileShareEnabled",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->936"
+        "index.html->id_computerSelector->dialog->21->940"
       ]
     },
     {
@@ -22747,7 +22995,7 @@
       "ru": "URL",
       "zh-chs": "网址",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->586"
+        "index.html->id_computerSelector->dialog->21->589"
       ]
     },
     {
@@ -22780,7 +23028,7 @@
       "ru": "UTF8 Терминал",
       "zh-chs": "UTF8终端",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1113"
+        "index.html->id_computerSelector->dialog->21->1134"
       ]
     },
     {
@@ -22796,7 +23044,7 @@
       "ru": "Разморозить журнал",
       "zh-chs": "取消冻结日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->544"
+        "index.html->id_computerSelector->dialog->21->547"
       ]
     },
     {
@@ -22812,7 +23060,7 @@
       "ru": "Невозможно добавить сертификат, ошибка",
       "zh-chs": "无法添加证书，错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->726"
+        "index.html->id_computerSelector->dialog->21->729"
       ]
     },
     {
@@ -22828,7 +23076,7 @@
       "ru": "Невозможно добавить фильтр, ошибка #",
       "zh-chs": "无法添加过滤器，错误＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->860"
+        "index.html->id_computerSelector->dialog->21->863"
       ]
     },
     {
@@ -22844,7 +23092,7 @@
       "ru": "Невозможно добавить политику, ошибка #",
       "zh-chs": "无法添加策略，错误编号",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->894"
+        "index.html->id_computerSelector->dialog->21->897"
       ]
     },
     {
@@ -22860,7 +23108,7 @@
       "ru": "Невозможно добавить сторожевое действие, ошибка #",
       "zh-chs": "无法添加看门狗操作，错误＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->796"
+        "index.html->id_computerSelector->dialog->21->799"
       ]
     },
     {
@@ -22876,7 +23124,7 @@
       "ru": "Невозможно добавить сторожевой таймер, ошибка #",
       "zh-chs": "无法添加看门狗，错误＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->789"
+        "index.html->id_computerSelector->dialog->21->792"
       ]
     },
     {
@@ -22892,7 +23140,7 @@
       "ru": "Невозможно очистить, ошибка: ",
       "zh-chs": "无法清除，错误：",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->556"
+        "index.html->id_computerSelector->dialog->21->559"
       ]
     },
     {
@@ -22908,7 +23156,7 @@
       "ru": "Невозможно декодировать файл PEM.",
       "zh-chs": "无法解码PEM文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1624"
+        "index.html->id_computerSelector->dialog->21->1648"
       ]
     },
     {
@@ -22924,7 +23172,7 @@
       "ru": "Невозможно декодировать закрытый ключ PEM.",
       "zh-chs": "无法解码PEM私钥。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1626"
+        "index.html->id_computerSelector->dialog->21->1650"
       ]
     },
     {
@@ -22940,7 +23188,7 @@
       "ru": "Невозможно декодировать файл сертификата.",
       "zh-chs": "无法解码证书文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1628"
+        "index.html->id_computerSelector->dialog->21->1652"
       ]
     },
     {
@@ -22956,7 +23204,7 @@
       "ru": "Невозможно расшифровать / расшифровать сертификат.",
       "zh-chs": "无法解密/解码证书。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->713"
+        "index.html->id_computerSelector->dialog->21->716"
       ]
     },
     {
@@ -22972,7 +23220,7 @@
       "ru": "Невозможно удалить файл (ERR {0}), убедитесь, что компьютер включен.",
       "zh-chs": "无法删除文件（ERR {0}），请检查计算机是否已打开电源。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1486"
+        "index.html->id_computerSelector->dialog->21->1510"
       ]
     },
     {
@@ -22986,10 +23234,7 @@
       "nl": "Kan systeemmogelijkheden niet krijgen, fout {0}",
       "pt": "Não foi possível obter os recursos do sistema, erro {0}",
       "ru": "Невозможно получить системные возможности, ошибка {0}",
-      "zh-chs": "无法获得系统功能，错误{0}",
-      "xloc": [
-        "index.html->id_computerSelector->dialog->21->1386"
-      ]
+      "zh-chs": "无法获得系统功能，错误{0}"
     },
     {
       "de": "Speicherdaten können nicht geladen werden ...",
@@ -23004,7 +23249,7 @@
       "ru": "Невозможно загрузить данные хранилища ...",
       "zh-chs": "无法加载存储数据...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1477"
+        "index.html->id_computerSelector->dialog->21->1501"
       ]
     },
     {
@@ -23020,7 +23265,7 @@
       "ru": "Невозможно проанализировать заголовок ответа HTTP",
       "zh-chs": "无法解析HTTP响应标头",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1693"
+        "index.html->id_computerSelector->dialog->21->1717"
       ]
     },
     {
@@ -23036,7 +23281,7 @@
       "ru": "Не удалось отправить файл (ERR {0}), убедитесь, что компьютер включен.",
       "zh-chs": "无法推送文件（ERR {0}），请检查计算机是否已打开电源。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1488"
+        "index.html->id_computerSelector->dialog->21->1512"
       ]
     },
     {
@@ -23052,7 +23297,7 @@
       "ru": "Невозможно удалить HTTP прокси, доступ запрещен.",
       "zh-chs": "无法删除HTTP代理，访问被拒绝。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1273"
+        "index.html->id_computerSelector->dialog->21->1294"
       ]
     },
     {
@@ -23068,7 +23313,7 @@
       "ru": "Невозможно удалить сертификат, ошибка",
       "zh-chs": "无法删除证书，错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->728"
+        "index.html->id_computerSelector->dialog->21->731"
       ]
     },
     {
@@ -23084,7 +23329,7 @@
       "ru": "Невозможно удалить фильтр, убедитесь, что он не используется.",
       "zh-chs": "无法删除过滤器，请确保未使用它。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->873"
+        "index.html->id_computerSelector->dialog->21->876"
       ]
     },
     {
@@ -23100,7 +23345,7 @@
       "ru": "Невозможно удалить политику, убедитесь, что она не используется.",
       "zh-chs": "无法删除政策，请确保该政策未被使用。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->906"
+        "index.html->id_computerSelector->dialog->21->909"
       ]
     },
     {
@@ -23116,7 +23361,7 @@
       "ru": "Невозможно удалить сервер, доступ запрещен.",
       "zh-chs": "无法删除服务器，访问被拒绝。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1267"
+        "index.html->id_computerSelector->dialog->21->1288"
       ]
     },
     {
@@ -23132,7 +23377,7 @@
       "ru": "Невозможно удалить сторожевые действия, ошибка #",
       "zh-chs": "无法删除看门狗操作，错误＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->800"
+        "index.html->id_computerSelector->dialog->21->803"
       ]
     },
     {
@@ -23164,13 +23409,13 @@
       "ru": "Невозможно установить состояние IPv6, ошибка {0}",
       "zh-chs": "无法设置IPv6状态，错误{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1346"
+        "index.html->id_computerSelector->dialog->21->1367"
       ]
     },
     {
       "en": "Unable to set OCR/RPE, check that these features are enabled in BIOS.",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1323"
+        "index.html->id_computerSelector->dialog->21->1344"
       ]
     },
     {
@@ -23186,7 +23431,7 @@
       "ru": "Невозможно установить параметры сети, ошибка {0}",
       "zh-chs": "无法设置网络参数，错误{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1353"
+        "index.html->id_computerSelector->dialog->21->1374"
       ]
     },
     {
@@ -23202,7 +23447,7 @@
       "ru": "Невозможно установить новую политику ссылок, ошибка {0}",
       "zh-chs": "无法设置新的链接策略，错误{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->508"
+        "index.html->id_computerSelector->dialog->21->511"
       ]
     },
     {
@@ -23218,7 +23463,7 @@
       "ru": "Невозможно установить политику, ошибка",
       "zh-chs": "无法设置政策，错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->835"
+        "index.html->id_computerSelector->dialog->21->838"
       ]
     },
     {
@@ -23251,7 +23496,7 @@
       "zh-chs": "无法签署证书。",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->334",
-        "index.html->id_computerSelector->dialog->21->722"
+        "index.html->id_computerSelector->dialog->21->725"
       ]
     },
     {
@@ -23293,7 +23538,7 @@
       "ru": "Нераспределенная пара секретных ключей #",
       "zh-chs": "未分配的私钥对＃",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->656"
+        "index.html->id_computerSelector->dialog->21->659"
       ]
     },
     {
@@ -23315,7 +23560,7 @@
       "ru": "Неожиданный HTTP-ответ enum",
       "zh-chs": "意外的HTTP枚举响应",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1694"
+        "index.html->id_computerSelector->dialog->21->1718"
       ]
     },
     {
@@ -23331,7 +23576,7 @@
       "ru": "Неожиданный HTTP-ответ",
       "zh-chs": "意外的HTTP拉取响应",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1695"
+        "index.html->id_computerSelector->dialog->21->1719"
       ]
     },
     {
@@ -23347,16 +23592,16 @@
       "ru": "неизвестный",
       "zh-chs": "未知",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1051",
+        "index.html->id_computerSelector->dialog->21->1005",
+        "index.html->id_computerSelector->dialog->21->1072",
         "index.html->id_computerSelector->dialog->21->369",
         "index.html->id_computerSelector->dialog->21->421",
         "index.html->id_computerSelector->dialog->21->438",
-        "index.html->id_computerSelector->dialog->21->594",
-        "index.html->id_computerSelector->dialog->21->742",
-        "index.html->id_computerSelector->dialog->21->753",
-        "index.html->id_computerSelector->dialog->21->946",
-        "index.html->id_computerSelector->dialog->21->952",
-        "index.html->id_computerSelector->dialog->21->984"
+        "index.html->id_computerSelector->dialog->21->597",
+        "index.html->id_computerSelector->dialog->21->745",
+        "index.html->id_computerSelector->dialog->21->756",
+        "index.html->id_computerSelector->dialog->21->967",
+        "index.html->id_computerSelector->dialog->21->973"
       ]
     },
     {
@@ -23454,7 +23699,7 @@
       "zh-chs": "不受信任的根证书",
       "xloc": [
         "index.html->id_computerSelector->dialog->21->332",
-        "index.html->id_computerSelector->dialog->21->720"
+        "index.html->id_computerSelector->dialog->21->723"
       ]
     },
     {
@@ -23560,8 +23805,8 @@
       "ru": "Загрузить файл",
       "zh-chs": "上传文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1172",
-        "index.html->id_computerSelector->dialog->21->1179"
+        "index.html->id_computerSelector->dialog->21->1193",
+        "index.html->id_computerSelector->dialog->21->1200"
       ]
     },
     {
@@ -23577,7 +23822,7 @@
       "ru": "Загрузить файл",
       "zh-chs": "上传文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1490"
+        "index.html->id_computerSelector->dialog->21->1514"
       ]
     },
     {
@@ -23593,7 +23838,7 @@
       "ru": "Загрузить ...",
       "zh-chs": "上载...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1476"
+        "index.html->id_computerSelector->dialog->21->1500"
       ]
     },
     {
@@ -23657,7 +23902,7 @@
       "ru": "Использовать для аутентификации консоли TLS",
       "zh-chs": "用于TLS控制台身份验证",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1573"
+        "index.html->id_computerSelector->dialog->21->1597"
       ]
     },
     {
@@ -23673,7 +23918,7 @@
       "ru": "Пользователь & Pass / Server-Auth TLS",
       "zh-chs": "用户和通过/服务器身份验证TLS",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1260"
+        "index.html->id_computerSelector->dialog->21->1281"
       ]
     },
     {
@@ -23706,12 +23951,12 @@
       "ru": "Согласие пользователя",
       "zh-chs": "用户同意",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1203",
-        "index.html->id_computerSelector->dialog->21->1324",
-        "index.html->id_computerSelector->dialog->21->1428",
-        "index.html->id_computerSelector->dialog->21->1431",
-        "index.html->id_computerSelector->dialog->21->1438",
-        "index.html->id_computerSelector->dialog->21->1443",
+        "index.html->id_computerSelector->dialog->21->1224",
+        "index.html->id_computerSelector->dialog->21->1345",
+        "index.html->id_computerSelector->dialog->21->1452",
+        "index.html->id_computerSelector->dialog->21->1455",
+        "index.html->id_computerSelector->dialog->21->1462",
+        "index.html->id_computerSelector->dialog->21->1467",
         "index.html->id_computerSelector->dialog->21->420"
       ]
     },
@@ -23728,9 +23973,9 @@
       "ru": "Ошибка согласия пользователя",
       "zh-chs": "用户同意错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1202",
-        "index.html->id_computerSelector->dialog->21->1204",
-        "index.html->id_computerSelector->dialog->21->1437"
+        "index.html->id_computerSelector->dialog->21->1223",
+        "index.html->id_computerSelector->dialog->21->1225",
+        "index.html->id_computerSelector->dialog->21->1461"
       ]
     },
     {
@@ -23772,7 +24017,7 @@
       "ru": "Пользователь инициирован",
       "zh-chs": "用户启动",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1229"
+        "index.html->id_computerSelector->dialog->21->1250"
       ]
     },
     {
@@ -23788,7 +24033,7 @@
       "ru": "Инициированный пользователем туннель",
       "zh-chs": "用户启动的隧道",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1255"
+        "index.html->id_computerSelector->dialog->21->1276"
       ]
     },
     {
@@ -23817,7 +24062,7 @@
       "ru": "Пользователь настроен",
       "zh-chs": "用户配置",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1328"
+        "index.html->id_computerSelector->dialog->21->1349"
       ]
     },
     {
@@ -23833,7 +24078,7 @@
       "ru": "Согласие пользователя не требуется.",
       "zh-chs": "无需用户同意。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1432"
+        "index.html->id_computerSelector->dialog->21->1456"
       ]
     },
     {
@@ -23849,7 +24094,7 @@
       "ru": "Согласие пользователя успешно.",
       "zh-chs": "用户同意成功。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1444"
+        "index.html->id_computerSelector->dialog->21->1468"
       ]
     },
     {
@@ -23865,7 +24110,7 @@
       "ru": "Согласие пользователя ...",
       "zh-chs": "用户同意...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1383"
+        "index.html->id_computerSelector->dialog->21->1404"
       ]
     },
     {
@@ -23881,7 +24126,7 @@
       "ru": "Пользователь инициировал соединение",
       "zh-chs": "用户发起的连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1214"
+        "index.html->id_computerSelector->dialog->21->1235"
       ]
     },
     {
@@ -23897,7 +24142,7 @@
       "ru": "Варианты инициации пользователя",
       "zh-chs": "用户启动选项",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1212"
+        "index.html->id_computerSelector->dialog->21->1233"
       ]
     },
     {
@@ -23926,7 +24171,7 @@
       "ru": "ID пользователя",
       "zh-chs": "用户身份",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1671"
+        "index.html->id_computerSelector->dialog->21->1695"
       ]
     },
     {
@@ -23942,12 +24187,15 @@
       "ru": "имя пользователя",
       "zh-chs": "用户名",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1295",
-        "index.html->id_computerSelector->dialog->21->1670",
+        "index.html->id_computerSelector->dialog->21->1316",
+        "index.html->id_computerSelector->dialog->21->1694",
         "index.html->id_computerSelector->dialog->21->263",
         "index.html->id_computerSelector->dialog->21->276",
-        "index.html->id_computerSelector->dialog->21->590",
+        "index.html->id_computerSelector->dialog->21->593",
+        "index.html->id_computerSelector->dialog->21->948",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog12->idx_d12netauth->idx_d12usernamediv->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog2->3->1",
+        "index.html->id_computerSelector->dialog->dialog->5->dialog27->idx_d27usernamediv->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog4->3->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog4->d4digest->1->1",
         "index.html->id_computerSelector->dialog->dialog->5->dialog8->1->3"
@@ -23966,7 +24214,7 @@
       "ru": "Имя пользователя Пароль",
       "zh-chs": "用户名密码",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1293"
+        "index.html->id_computerSelector->dialog->21->1314"
       ]
     },
     {
@@ -24021,7 +24269,7 @@
       "ru": "VRAM",
       "zh-chs": "虚拟RAM",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->959"
+        "index.html->id_computerSelector->dialog->21->980"
       ]
     },
     {
@@ -24037,7 +24285,7 @@
       "ru": "VT100 + (F10 = ESC + [OY)",
       "zh-chs": "VT100 +（F10 = ESC + [OY）",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1118"
+        "index.html->id_computerSelector->dialog->21->1139"
       ]
     },
     {
@@ -24053,7 +24301,7 @@
       "ru": "действительный",
       "zh-chs": "有效",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1643"
+        "index.html->id_computerSelector->dialog->21->1667"
       ]
     },
     {
@@ -24133,9 +24381,9 @@
       "ru": "продавец",
       "zh-chs": "供应商",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1024",
-        "index.html->id_computerSelector->dialog->21->1479",
-        "index.html->id_computerSelector->dialog->21->1491"
+        "index.html->id_computerSelector->dialog->21->1045",
+        "index.html->id_computerSelector->dialog->21->1503",
+        "index.html->id_computerSelector->dialog->21->1515"
       ]
     },
     {
@@ -24151,7 +24399,7 @@
       "ru": "Название поставщика",
       "zh-chs": "供应商名称",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1492"
+        "index.html->id_computerSelector->dialog->21->1516"
       ]
     },
     {
@@ -24167,7 +24415,7 @@
       "ru": "Verbocity",
       "zh-chs": "详细性",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->23->3"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->25->3"
       ]
     },
     {
@@ -24183,12 +24431,18 @@
       "ru": "Подробный",
       "zh-chs": "详细",
       "xloc": [
-        "index.html->id_computerSelector->dialog->dialog->5->dialog24->23->idx_d24Verbocity->idx_d24Verbocity2"
+        "index.html->id_computerSelector->dialog->dialog->5->dialog24->25->idx_d24Verbocity->idx_d24Verbocity2"
       ]
     },
     {
       "en": "Verified boot failed (bad image)"
     },
+    {
+      "en": "Verify Storage Erase",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->1425"
+      ]
+    },
     {
       "de": "Ausführung",
       "en": "Version",
@@ -24202,10 +24456,10 @@
       "ru": "Версия",
       "zh-chs": "版",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1013",
-        "index.html->id_computerSelector->dialog->21->1019",
-        "index.html->id_computerSelector->dialog->21->1025",
-        "index.html->id_computerSelector->dialog->21->1030"
+        "index.html->id_computerSelector->dialog->21->1034",
+        "index.html->id_computerSelector->dialog->21->1040",
+        "index.html->id_computerSelector->dialog->21->1046",
+        "index.html->id_computerSelector->dialog->21->1051"
       ]
     },
     {
@@ -24365,8 +24619,8 @@
       "ru": "Посмотреть...",
       "zh-chs": "视图...",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1567",
-        "index.html->id_computerSelector->dialog->21->1571"
+        "index.html->id_computerSelector->dialog->21->1591",
+        "index.html->id_computerSelector->dialog->21->1595"
       ]
     },
     {
@@ -24398,8 +24652,7 @@
       "ru": "WEP",
       "zh-chs": "WEP",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->922",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->11->idx_d12enc->id_d12e2"
+        "index.html->id_computerSelector->dialog->21->926"
       ]
     },
     {
@@ -24415,7 +24668,8 @@
       "ru": "WPA IEEE 802.1x",
       "zh-chs": "WPA IEEE 802.1x",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->917"
+        "index.html->id_computerSelector->dialog->21->920",
+        "index.html->id_computerSelector->dialog->21->957"
       ]
     },
     {
@@ -24431,8 +24685,8 @@
       "ru": "WPA PSK",
       "zh-chs": "WPA PSK",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->916",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->9->idx_d12auth->9"
+        "index.html->id_computerSelector->dialog->21->919",
+        "index.html->id_computerSelector->dialog->21->959"
       ]
     },
     {
@@ -24448,7 +24702,8 @@
       "ru": "WPA2 IEEE 802.1x",
       "zh-chs": "WPA2 IEEE 802.1x",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->919"
+        "index.html->id_computerSelector->dialog->21->922",
+        "index.html->id_computerSelector->dialog->21->956"
       ]
     },
     {
@@ -24464,15 +24719,25 @@
       "ru": "WPA2 PSK",
       "zh-chs": "WPA2 PSK",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->918",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->9->idx_d12auth->5"
+        "index.html->id_computerSelector->dialog->21->921",
+        "index.html->id_computerSelector->dialog->21->958"
       ]
     },
     {
-      "en": "WPA3 SAE",
+      "en": "WPA3 OWE IEEE 802.1x",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->920",
-        "index.html->id_computerSelector->dialog->dialog->5->dialog12->9->idx_d12auth->idx_d12auth_wpa3"
+        "index.html->id_computerSelector->dialog->21->924",
+        "index.html->id_computerSelector->dialog->21->954"
+      ]
+    },
+    {
+      "en": "WPA3 SAE"
+    },
+    {
+      "en": "WPA3 SAE IEEE 802.1x",
+      "xloc": [
+        "index.html->id_computerSelector->dialog->21->923",
+        "index.html->id_computerSelector->dialog->21->955"
       ]
     },
     {
@@ -24505,7 +24770,7 @@
       "ru": "Ошибка синтаксического анализа WSMAN",
       "zh-chs": "WSMAN解析错误",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1692"
+        "index.html->id_computerSelector->dialog->21->1716"
       ]
     },
     {
@@ -24554,7 +24819,7 @@
       "ru": "Время пробуждения",
       "zh-chs": "唤醒时间",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1528"
+        "index.html->id_computerSelector->dialog->21->1552"
       ]
     },
     {
@@ -24602,7 +24867,7 @@
       "ru": "Сторожевая собака",
       "zh-chs": "看门狗",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->788"
+        "index.html->id_computerSelector->dialog->21->791"
       ]
     },
     {
@@ -24618,8 +24883,8 @@
       "ru": "Watchdog Action",
       "zh-chs": "看门狗动作",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->795",
-        "index.html->id_computerSelector->dialog->21->799"
+        "index.html->id_computerSelector->dialog->21->798",
+        "index.html->id_computerSelector->dialog->21->802"
       ]
     },
     {
@@ -24648,7 +24913,7 @@
       "ru": "Сторожевой таймер {0}",
       "zh-chs": "看门狗{0}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->781"
+        "index.html->id_computerSelector->dialog->21->784"
       ]
     },
     {
@@ -24664,7 +24929,7 @@
       "ru": "У нас есть закрытый ключ для этого сертификата.",
       "zh-chs": "我们有此证书的私钥。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1565"
+        "index.html->id_computerSelector->dialog->21->1589"
       ]
     },
     {
@@ -24680,7 +24945,7 @@
       "ru": "Мы доверяем сертификатам, подписанным этим сертификатом.",
       "zh-chs": "我们信任此证书签名的证书。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1563"
+        "index.html->id_computerSelector->dialog->21->1587"
       ]
     },
     {
@@ -24856,7 +25121,7 @@
       "ru": "Проводная",
       "zh-chs": "有线",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->814"
+        "index.html->id_computerSelector->dialog->21->817"
       ]
     },
     {
@@ -24888,7 +25153,7 @@
       "ru": "беспроводной",
       "zh-chs": "无线",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->815"
+        "index.html->id_computerSelector->dialog->21->818"
       ]
     },
     {
@@ -24933,8 +25198,8 @@
       "ru": "Беспроводной профиль",
       "zh-chs": "无线配置文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->942",
-        "index.html->id_computerSelector->dialog->21->944"
+        "index.html->id_computerSelector->dialog->21->949",
+        "index.html->id_computerSelector->dialog->21->951"
       ]
     },
     {
@@ -24989,7 +25254,7 @@
       "ru": "Профили беспроводных сетей",
       "zh-chs": "无线配置文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->926"
+        "index.html->id_computerSelector->dialog->21->930"
       ]
     },
     {
@@ -25005,7 +25270,7 @@
       "ru": "Wireless State",
       "zh-chs": "无线状态",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->931"
+        "index.html->id_computerSelector->dialog->21->935"
       ]
     },
     {
@@ -25021,7 +25286,7 @@
       "ru": "Профили беспроводных сетей, которые Intel&reg; AMT будет использовать для подключения к сети.",
       "zh-chs": "英特尔&reg;AMT将用于网络连接的无线配置文件。",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->927"
+        "index.html->id_computerSelector->dialog->21->931"
       ]
     },
     {
@@ -25037,7 +25302,7 @@
       "ru": "Заворачивает, когда полный",
       "zh-chs": "装满时自动包装",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->617"
+        "index.html->id_computerSelector->dialog->21->620"
       ]
     },
     {
@@ -25053,7 +25318,7 @@
       "ru": "Написать в журнал событий",
       "zh-chs": "写入事件日志",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->793"
+        "index.html->id_computerSelector->dialog->21->796"
       ]
     },
     {
@@ -25069,7 +25334,7 @@
       "ru": "да",
       "zh-chs": "是",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->676"
+        "index.html->id_computerSelector->dialog->21->679"
       ]
     },
     {
@@ -25085,13 +25350,13 @@
       "ru": "ZIP",
       "zh-chs": "压缩",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->989"
+        "index.html->id_computerSelector->dialog->21->1010"
       ]
     },
     {
       "en": "ZRLE16, Compressed Color",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1149"
+        "index.html->id_computerSelector->dialog->21->1170"
       ]
     },
     {
@@ -25100,25 +25365,25 @@
     {
       "en": "ZRLE4G, Compressed Gray",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1146"
+        "index.html->id_computerSelector->dialog->21->1167"
       ]
     },
     {
       "en": "ZRLE8, Compressed Color",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1148"
+        "index.html->id_computerSelector->dialog->21->1169"
       ]
     },
     {
       "en": "ZRLE8G, Compressed Gray",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1147"
+        "index.html->id_computerSelector->dialog->21->1168"
       ]
     },
     {
       "en": "Zinc air",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1056"
+        "index.html->id_computerSelector->dialog->21->1077"
       ]
     },
     {
@@ -25237,7 +25502,7 @@
       "ru": "столкновение",
       "zh-chs": "碰撞",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1335"
+        "index.html->id_computerSelector->dialog->21->1356"
       ]
     },
     {
@@ -25309,7 +25574,7 @@
       "ru": "Устаревшее",
       "zh-chs": "不推荐使用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1332"
+        "index.html->id_computerSelector->dialog->21->1353"
       ]
     },
     {
@@ -25325,7 +25590,7 @@
       "ru": "истекший",
       "zh-chs": "已过期",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1334"
+        "index.html->id_computerSelector->dialog->21->1355"
       ]
     },
     {
@@ -25341,7 +25606,7 @@
       "ru": "файл",
       "zh-chs": "文件",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1559"
+        "index.html->id_computerSelector->dialog->21->1583"
       ]
     },
     {
@@ -25359,13 +25624,13 @@
     {
       "en": "mVolts",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1066"
+        "index.html->id_computerSelector->dialog->21->1087"
       ]
     },
     {
       "en": "mWatt-hours",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1064"
+        "index.html->id_computerSelector->dialog->21->1085"
       ]
     },
     {
@@ -25381,7 +25646,7 @@
       "ru": "имя1, имя2",
       "zh-chs": "名称1，名称2",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->732"
+        "index.html->id_computerSelector->dialog->21->735"
       ]
     },
     {
@@ -25397,7 +25662,7 @@
       "ru": "не положено",
       "zh-chs": "不允许",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1336"
+        "index.html->id_computerSelector->dialog->21->1357"
       ]
     },
     {
@@ -25447,7 +25712,7 @@
       "ru": "p24filetable",
       "zh-chs": "p24文件表",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1175"
+        "index.html->id_computerSelector->dialog->21->1196"
       ]
     },
     {
@@ -25483,7 +25748,7 @@
       "ru": "предпочтительный / устаревший",
       "zh-chs": "首选/已弃用",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1333"
+        "index.html->id_computerSelector->dialog->21->1354"
       ]
     },
     {
@@ -25512,7 +25777,7 @@
       "ru": "sblock_",
       "zh-chs": "sblock_",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1541"
+        "index.html->id_computerSelector->dialog->21->1565"
       ]
     },
     {
@@ -25528,7 +25793,7 @@
       "ru": "script.mescript",
       "zh-chs": "script.mescript",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1560"
+        "index.html->id_computerSelector->dialog->21->1584"
       ]
     },
     {
@@ -25583,7 +25848,7 @@
       "ru": "действительный",
       "zh-chs": "有效",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1331"
+        "index.html->id_computerSelector->dialog->21->1352"
       ]
     },
     {
@@ -25599,7 +25864,7 @@
       "ru": "проснуться",
       "zh-chs": "醒来",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1511"
+        "index.html->id_computerSelector->dialog->21->1535"
       ]
     },
     {
@@ -25628,7 +25893,7 @@
       "ru": "{0} соединение",
       "zh-chs": "{0}连接",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1245"
+        "index.html->id_computerSelector->dialog->21->1266"
       ]
     },
     {
@@ -25644,7 +25909,7 @@
       "ru": "{0} байт",
       "zh-chs": "{0}个字节",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1177"
+        "index.html->id_computerSelector->dialog->21->1198"
       ]
     },
     {
@@ -25660,7 +25925,7 @@
       "ru": "{0} секунд",
       "zh-chs": "{0}秒",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1667"
+        "index.html->id_computerSelector->dialog->21->1691"
       ]
     },
     {
@@ -25676,7 +25941,7 @@
       "ru": "{0} в {1}",
       "zh-chs": "{0}至{1}",
       "xloc": [
-        "index.html->id_computerSelector->dialog->21->1674"
+        "index.html->id_computerSelector->dialog->21->1698"
       ]
     },
     {