diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h
index db8f30a9..5c453329 100644
--- a/src/Cedar/Cedar.h
+++ b/src/Cedar/Cedar.h
@@ -138,7 +138,7 @@
 #define	CEDAR_VER					415
 
 // Build Number
-#define	CEDAR_BUILD					9537
+#define	CEDAR_BUILD					9538
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -153,16 +153,16 @@
 
 // Specify the location to build
 #ifndef	BUILD_PLACE
-#define	BUILD_PLACE			"pc26"
+#define	BUILD_PLACE			"pc25"
 #endif	// BUILD_PLACE
 
 // Specifies the build date
 #define	BUILD_DATE_Y		2015
 #define	BUILD_DATE_M		3
-#define	BUILD_DATE_D		26
-#define	BUILD_DATE_HO		16
-#define	BUILD_DATE_MI		48
-#define	BUILD_DATE_SE		15
+#define	BUILD_DATE_D		27
+#define	BUILD_DATE_HO		19
+#define	BUILD_DATE_MI		32
+#define	BUILD_DATE_SE		50
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/WinUi.c b/src/Cedar/WinUi.c
index 4317ca7b..26c0654b 100644
--- a/src/Cedar/WinUi.c
+++ b/src/Cedar/WinUi.c
@@ -1004,6 +1004,12 @@ void ShowWizard(HWND hWndParent, WIZARD *w, UINT start_id)
 		w->IsAreoStyle = false;
 	}
 
+	if (MsIsWindows10())
+	{
+		// Windows 10 Icon Bug: Disable Aero Style!
+		w->IsAreoStyle = false;
+	}
+
 	if (w->IsAreoStyle)
 	{
 		// Aero Wizard
@@ -2960,12 +2966,14 @@ void AdjustWindowAndControlSize(HWND hWnd, bool *need_resize, double *factor_x,
 		*need_resize = false;
 		*factor_x = 1.0;
 		*factor_y = 1.0;
+		//Debug("// There is no need to adjust\n");
 		return;
 	}
 
 	// Calculate the adjustment amount
 	*factor_x = (double)dlgfont_x / (double)WINUI_DEFAULT_DIALOG_UNIT_X;
 	*factor_y = (double)dlgfont_y / (double)WINUI_DEFAULT_DIALOG_UNIT_Y;
+	//Debug("Factors: %f %f\n", *factor_x, *factor_y);
 
 	if (MsIsVista())
 	{
@@ -10042,6 +10050,15 @@ UINT DlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, bool white_color
 	switch (msg)
 	{
 	case WM_INITDIALOG:
+		if (true)
+		{
+			RECT rect1;
+
+			SetRect(&rect1, 0, 0, 100, 100);
+			MapDialogRect(hWnd, &rect1);
+			Debug("%u %u %u %u\n", rect1.left, rect1.right, rect1.top, rect1.bottom);
+		}
+
 		param = (void *)lParam;
 		SetParam(hWnd, param);
 
diff --git a/src/Cedar/WinUi.h b/src/Cedar/WinUi.h
index a6cce9f5..ec25052b 100644
--- a/src/Cedar/WinUi.h
+++ b/src/Cedar/WinUi.h
@@ -120,7 +120,7 @@
 #define WINUI_PASSWORD_NULL_USERNAME				"NULL"
 
 #define WINUI_DEFAULT_DIALOG_UNIT_X					7
-#define WINUI_DEFAULT_DIALOG_UNIT_Y					12
+#define WINUI_DEFAULT_DIALOG_UNIT_Y					14
 
 // Make available the types for Windows even if windows.h is not included
 #ifndef	_WINDEF_
diff --git a/src/CurrentBuild.txt b/src/CurrentBuild.txt
index 930731ed..d764c5fe 100644
--- a/src/CurrentBuild.txt
+++ b/src/CurrentBuild.txt
@@ -1,4 +1,4 @@
-BUILD_NUMBER 9537
+BUILD_NUMBER 9538
 VERSION 415
 BUILD_NAME beta
-BUILD_DATE 20150326_164815
+BUILD_DATE 20150327_193250
diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc
index c78dd8e5..e0447530 100644
--- a/src/PenCore/PenCore.rc
+++ b/src/PenCore/PenCore.rc
@@ -59,167 +59,167 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 299
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 193
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 166
     END
 
     D_PKCSUTIL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 292
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 287
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 246
     END
 
     D_PASSPHRASE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 232
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 84
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 72
     END
 
     D_NM_CONNECT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 264
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 51
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 44
     END
 
     D_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 207
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 178
     END
 
     D_STATUS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 208
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 59
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 51
     END
 
     D_CERT, DIALOG
     BEGIN
         LEFTMARGIN, 6
         RIGHTMARGIN, 264
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 384
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 330
     END
 
     D_CHECKCERT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 244
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 294
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 252
     END
 
     D_CONNECTERROR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 244
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 206
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 177
     END
 
     D_CM_LOGIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 127
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 109
     END
 
     D_CM_MAIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 251
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 240
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 206
     END
 
     D_CONNECTION_STATUS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 284
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 261
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 224
     END
 
     D_CM_POLICY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 296
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 296
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 254
     END
 
     D_CM_ACCOUNT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 370
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 318
     END
 
     D_CM_PROXY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 248
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 146
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 126
     END
 
     D_CM_DETAIL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 427
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 357
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 306
     END
 
     D_CM_NEW_VLAN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 244
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 108
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 93
     END
 
     D_CM_TRUST, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 328
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 221
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 190
     END
 
     D_CM_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 270
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 179
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 154
     END
 
     D_CM_CONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 295
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 391
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 336
     END
 
     D_ABOUT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 326
-        BOTTOMMARGIN, 354
+        BOTTOMMARGIN, 304
         HORZGUIDE, 315
     END
 
@@ -227,8 +227,8 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 168
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 144
     END
 
     D_CM_DESKTOP, DIALOG
@@ -236,16 +236,16 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 363
         VERTGUIDE, 31
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 217
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 186
     END
 
     D_CM_CHANGE_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 241
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 207
     END
 
     D_SM_MAIN, DIALOG
@@ -257,151 +257,151 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 428
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 300
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 258
     END
 
     D_SM_SERVER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 432
-        TOPMARGIN, 7
+        TOPMARGIN, 5
     END
 
     D_SM_STATUS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 328
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 285
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 245
     END
 
     D_SM_EDIT_HUB, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 424
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 325
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 279
     END
 
     D_SM_CREATE_LISTENER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 263
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 154
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 132
     END
 
     D_SM_SSL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 456
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 358
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 307
     END
 
     D_SM_SAVE_KEY_PAIR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 288
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 341
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 293
     END
 
     D_SM_CONNECTION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 311
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 265
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 228
     END
 
     D_SM_FARM, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 381
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 327
     END
 
     D_SM_FARM_MEMBER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 408
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 258
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 222
     END
 
     D_SM_CHANGE_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 243
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 105
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 90
     END
 
     D_SM_HUB, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 396
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 351
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 301
     END
 
     D_SM_USER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 447
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 274
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 235
     END
 
     D_SM_EDIT_USER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 448
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 345
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 296
     END
 
     D_SM_POLICY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 443
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 334
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 287
     END
 
     D_SM_GROUP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 327
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 275
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 236
     END
 
     D_SM_EDIT_GROUP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 236
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 291
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 250
     END
 
     D_SM_ACCESS_LIST, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 315
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 270
     END
 
     D_SM_EDIT_ACCESS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 452
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 404
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 347
         HORZGUIDE, 7
     END
 
@@ -409,528 +409,528 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 276
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 317
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 272
     END
 
     D_SM_LINK, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 416
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 306
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 263
     END
 
     D_SM_LOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 272
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 382
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 328
     END
 
     D_SM_CA, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 328
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 220
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 189
     END
 
     D_SM_SESSION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 446
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 355
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 305
     END
 
     D_SM_MAC, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 330
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 283
     END
 
     D_SM_IP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 330
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 283
     END
 
     D_SM_CREATE_CERT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 294
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 364
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 312
     END
 
     D_NM_LOGIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 127
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 109
     END
 
     D_SPEEDMETER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 312
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 288
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 247
     END
 
     D_NM_MAIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 344
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 373
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 320
     END
 
     D_NM_OPTION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 412
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 318
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 273
     END
 
     D_NM_NAT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 330
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 283
     END
 
     D_NM_DHCP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 444
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 330
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 283
     END
 
     D_NM_CHANGE_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 243
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 105
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 90
     END
 
     D_SM_SNAT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 348
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 311
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 267
     END
 
     D_SM_BRIDGE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 360
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 373
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 320
     END
 
     D_WIN9X_REBOOT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 232
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 97
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 84
     END
 
     D_DEFAULT1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 83
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 72
     END
 
     D_EM_MAIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 328
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 204
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 175
     END
 
     D_EM_ADD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 272
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 340
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 292
     END
 
     D_EM_PASSWORD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 243
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 105
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 90
     END
 
     D_SM_CONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 376
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 361
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 310
     END
 
     D_SM_ADMIN_OPTION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 352
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 302
     END
 
     D_SM_AO_VALUE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 199
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 73
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 63
     END
 
     D_SM_L3, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 284
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 291
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 250
     END
 
     D_SM_L3_ADD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 227
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 98
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 84
     END
 
     D_SM_L3_SW, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 291
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 367
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 315
     END
 
     D_SM_L3_SW_IF, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 282
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 242
     END
 
     D_SM_L3_SW_TABLE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 255
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 219
     END
 
     D_CM_SELECT_SECURE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 288
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 243
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 209
     END
 
     D_CM_SECURE_MANAGER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 288
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 260
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 223
     END
 
     D_CM_SECURE_TYPE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 188
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 119
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 102
     END
 
     D_STRING, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 259
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 115
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 99
     END
 
     D_SM_SELECT_KEYPAIR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 194
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 276
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 237
     END
 
     D_CM_LOAD_X, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 232
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 202
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 174
     END
 
     D_CM_SECURE_PIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 256
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 214
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 184
     END
 
     D_SM_CRL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 328
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 220
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 189
     END
 
     D_SM_EDIT_CRL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 344
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 358
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 307
     END
 
     D_SM_AC_LIST, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 302
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 223
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 192
     END
 
     D_SM_AC, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 304
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 261
     END
 
     D_SM_LOG_FILE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 391
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 333
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 286
     END
 
     D_SM_READ_LOG_FILE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 280
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 104
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 90
     END
 
     D_SM_SAVE_LOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 264
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 75
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 65
     END
 
     D_TCP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 324
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 309
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 265
     END
 
     D_TCP_MSG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 240
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 200
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 172
     END
 
     D_CM_PKCSEULA, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 260
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 151
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 130
     END
 
     D_CM_KAKUSHI, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 358
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 266
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 228
     END
 
     D_CM_TRAFFIC, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 388
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 353
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 303
     END
 
     D_CM_TRAFFIC_RUN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 352
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 295
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 253
     END
 
     D_CM_TRAFFIC_RESULT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 323
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 221
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 190
     END
 
     D_SM_LICENSE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 420
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 360
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 309
     END
 
     D_SM_LICENSE_ADD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 352
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 260
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 223
     END
 
     D_FREEINFO, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 235
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 202
     END
 
     D_EM_LICENSE_ADD, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 352
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 260
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 223
     END
 
     D_EM_LICENSE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 420
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 355
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 305
     END
 
     D_EM_REMOTE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 168
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 144
     END
 
     D_CM_SETTING, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 276
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 332
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 285
     END
 
     D_SM_SETUP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 440
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 357
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 306
     END
 
     D_SM_SETUP_HUB, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 222
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 94
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 81
     END
 
     D_SM_SETUP_STEP, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 322
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 344
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 295
     END
 
     D_CPU64_WARNING, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 292
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 172
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 148
     END
 
     D_ONCEMSG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 244
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 181
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 156
     END
 
     D_CONNECT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 182
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 72
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 62
     END
 
     D_SM_SIMULATION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 274
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 252
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 216
     END
 
     D_SM_EDIT_ACCESS_V6, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 452
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 404
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 347
         HORZGUIDE, 7
     END
 
@@ -938,32 +938,32 @@ BEGIN
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 308
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 320
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 275
     END
 
     D_SM_MSG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 268
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 316
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 271
     END
 
     D_NICINFO, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 214
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 100
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 86
     END
 
     D_SM_IPSEC, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 416
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 352
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 302
     END
 
     D_SM_ETHERIP, DIALOG
@@ -971,303 +971,303 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 404
         VERTGUIDE, 326
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 278
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 239
     END
 
     D_SM_ETHERIP_ID, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 260
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 258
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 222
     END
 
     D_SM_OPENVPN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 420
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 380
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 326
     END
 
     D_SM_DDNS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 408
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 328
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 282
     END
 
     D_SM_SPECIALLISTENER, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 350
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 366
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 314
     END
 
     D_SM_REDIRECT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 351
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 356
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 306
     END
 
     D_SW_TEST1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_DUMMY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 179
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 83
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 72
     END
 
     D_SW_TEST2, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 168
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 92
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 79
     END
 
     D_SW_DEFAULT, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_WELCOME, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_MODE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
+        TOPMARGIN, 5
     END
 
     D_SW_NOT_ADMIN, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_COMPONENTS, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_EULA, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_WARNING, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_DIR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_READY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_PERFORM, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_ERROR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_FINISH, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_UNINST1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_LANG1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_EASY1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_EASY2, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_WEB1, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_SW_WEB2, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 316
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 175
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 150
     END
 
     D_UPDATE_NOTICE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 252
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 232
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 199
     END
 
     D_UPDATE_CONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 300
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 148
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 127
     END
 
     D_SM_VMBRIDGE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 304
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 308
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 264
     END
 
     D_SM_AZURE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 404
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 364
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 312
     END
 
     D_SM_PROXY, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 220
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 160
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 138
     END
 
     D_VGC_LIST, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 439
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 347
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 298
     END
 
     D_VGC_PROTOCOL, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 274
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 166
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 143
     END
 
     D_VGS_CONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 363
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 356
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 306
     END
 
     D_VGS_OPTION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 348
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 338
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 290
     END
 
     D_VGS_WARNING, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 342
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 284
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 244
     END
 
     D_NM_PUSH, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 360
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 286
+        TOPMARGIN, 5
+        BOTTOMMARGIN, 246
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -1278,3355 +1278,3355 @@ END
 // Dialog
 //
 
-D_SECURE DIALOGEX 0, 0, 307, 201
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+D_SECURE DIALOGEX 0, 0, 307, 172
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_SECURE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         107,S_IMAGE,"Static",SS_BITMAP,7,7,81,63
-    LTEXT           "@S_TITLE",S_TITLE,99,7,166,19
-    LTEXT           "%s",S_INSERT_SECURE,99,30,200,19
-    CONTROL         "@S_DEVICE_INFO",S_DEVICE_INFO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,106,70,173,26
-    GROUPBOX        "@IDS_STATIC1",IDS_STATIC1,99,55,189,45
-    EDITTEXT        E_PIN,106,118,180,13,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "@S_WARNING",S_WARNING,106,137,176,28
-    DEFPUSHBUTTON   "@IDOK",IDOK,186,175,54,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,245,175,54,18
-    CONTROL         "",A_PROGRESS,"SysAnimate32",ACS_TRANSPARENT | WS_TABSTOP,110,116,120,18,WS_EX_TRANSPARENT
-    LTEXT           "S_STATUS",S_STATUS,106,136,193,20,NOT WS_VISIBLE
-    RTEXT           "@S_PIN_CODE",S_PIN_CODE,40,119,64,12
-    LTEXT           "-- SOFTWARE TITLE --",S_SOFTWARE_TITLE,7,180,177,13
-    CONTROL         ICO_SESSION_BRIDGE,S_IMAGE2,"Static",SS_BITMAP,7,7,81,63
-    CONTROL         ICO_TRAY4,S_IMAGE_TSUKUBA,"Static",SS_BITMAP,7,7,81,63
+    CONTROL         107,S_IMAGE,"Static",SS_BITMAP,7,5,81,54
+    LTEXT           "@S_TITLE",S_TITLE,99,5,166,17
+    LTEXT           "%s",S_INSERT_SECURE,99,25,200,17
+    CONTROL         "@S_DEVICE_INFO",S_DEVICE_INFO,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,106,59,173,23
+    GROUPBOX        "@IDS_STATIC1",IDS_STATIC1,99,47,189,39
+    EDITTEXT        E_PIN,106,101,180,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "@S_WARNING",S_WARNING,106,117,176,24
+    DEFPUSHBUTTON   "@IDOK",IDOK,186,149,54,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,245,149,54,16
+    CONTROL         "",A_PROGRESS,"SysAnimate32",ACS_TRANSPARENT | WS_TABSTOP,110,99,120,16,WS_EX_TRANSPARENT
+    LTEXT           "S_STATUS",S_STATUS,106,116,193,18,NOT WS_VISIBLE
+    RTEXT           "@S_PIN_CODE",S_PIN_CODE,40,101,64,11
+    LTEXT           "-- SOFTWARE TITLE --",S_SOFTWARE_TITLE,7,154,177,12
+    CONTROL         ICO_SESSION_BRIDGE,S_IMAGE2,"Static",SS_BITMAP,7,5,81,54
+    CONTROL         ICO_TRAY4,S_IMAGE_TSUKUBA,"Static",SS_BITMAP,7,5,81,54
 END
 
-D_PKCSUTIL DIALOGEX 0, 0, 299, 294
-STYLE DS_SETFONT | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_PKCSUTIL DIALOGEX 0, 0, 299, 251
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_PKCSUTIL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,30,7,263,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,39,245,39
-    GROUPBOX        "@STATIC2",IDC_STATIC,31,89,241,86
-    LTEXT           "@STATIC3",IDC_STATIC,38,101,227,36
-    PUSHBUTTON      "@B_WRITE",B_WRITE,199,146,65,19
-    GROUPBOX        "@STATIC4",IDC_STATIC,31,183,241,64
-    LTEXT           "@STATIC5",IDC_STATIC,38,195,227,19
-    PUSHBUTTON      "@B_ERASE",B_ERASE,199,219,65,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,269,80,18
-    LTEXT           "@S_COPYRIGHT",S_COPYRIGHT,7,256,195,31
+    ICON            ICO_CERT,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,30,5,263,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,33,245,34
+    GROUPBOX        "@STATIC2",IDC_STATIC,31,76,241,74
+    LTEXT           "@STATIC3",IDC_STATIC,38,86,227,31
+    PUSHBUTTON      "@B_WRITE",B_WRITE,199,125,65,17
+    GROUPBOX        "@STATIC4",IDC_STATIC,31,156,241,55
+    LTEXT           "@STATIC5",IDC_STATIC,38,167,227,17
+    PUSHBUTTON      "@B_ERASE",B_ERASE,199,187,65,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,230,80,16
+    LTEXT           "@S_COPYRIGHT",S_COPYRIGHT,7,219,195,27
 END
 
-D_PASSPHRASE DIALOGEX 0, 0, 239, 91
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_PASSPHRASE DIALOGEX 0, 0, 239, 77
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_PASSPHRASE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,28,7,194,29
-    RTEXT           "@STATIC2",IDC_STATIC,7,44,55,11
-    EDITTEXT        E_PASSPHRASE,67,42,156,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,126,66,50,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,182,66,50,18
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,28,5,194,25
+    RTEXT           "@STATIC2",IDC_STATIC,7,37,55,10
+    EDITTEXT        E_PASSPHRASE,67,35,156,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,126,56,50,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,182,56,50,16
 END
 
-D_NM_CONNECT DIALOGEX 0, 0, 271, 58
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+D_NM_CONNECT DIALOGEX 0, 0, 271, 49
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "@D_NM_CONNECT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_ROUTER,IDC_STATIC,7,16,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,23,231,28
+    ICON            ICO_ROUTER,IDC_STATIC,7,13,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,19,231,24
 END
 
-D_PASSWORD DIALOGEX 0, 0, 259, 214
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_PASSWORD DIALOGEX 0, 0, 259, 183
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,14,221,29
-    GROUPBOX        "@STATIC1",IDC_STATIC,21,46,209,102
-    RTEXT           "@STATIC2",IDC_STATIC,32,65,60,12
-    COMBOBOX        C_TYPE,99,63,108,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@STATIC3",IDC_STATIC,32,87,60,11
-    EDITTEXT        E_USERNAME,99,85,108,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,32,109,60,11
-    EDITTEXT        E_PASSWORD,99,107,108,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "@R_NO_SAVE_PASSWORD",R_NO_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,127,120,10
-    LTEXT           "@S_COUNTDOWN",S_COUNTDOWN,21,152,207,15
-    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,21,170,209,9
-    DEFPUSHBUTTON   "@IDOK",IDOK,133,190,50,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,189,190,63,17
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,11,221,25
+    GROUPBOX        "@STATIC1",IDC_STATIC,21,39,209,88
+    RTEXT           "@STATIC2",IDC_STATIC,32,55,60,11
+    COMBOBOX        C_TYPE,99,53,108,48,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@STATIC3",IDC_STATIC,32,74,60,10
+    EDITTEXT        E_USERNAME,99,72,108,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,32,93,60,10
+    EDITTEXT        E_PASSWORD,99,91,108,11,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "@R_NO_SAVE_PASSWORD",R_NO_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,108,120,9
+    LTEXT           "@S_COUNTDOWN",S_COUNTDOWN,21,130,207,13
+    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,21,145,209,8
+    DEFPUSHBUTTON   "@IDOK",IDOK,133,162,50,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,189,162,63,15
 END
 
-D_STATUS DIALOGEX 0, 0, 215, 66
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_STATUS DIALOGEX 0, 0, 215, 56
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_STATUS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_STATUS",S_STATUS,31,7,177,32
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,81,43,50,16
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_STATUS",S_STATUS,31,5,177,28
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,81,36,50,14
 END
 
-D_CERT DIALOGEX 0, 0, 271, 391
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CERT DIALOGEX 0, 0, 271, 335
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CERT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,6,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,32,7,232,17
-    GROUPBOX        "@STATIC1",IDC_STATIC,6,33,258,68
-    RTEXT           "@STATIC2",IDC_STATIC,41,49,39,10
-    EDITTEXT        E_SUBJECT,85,49,164,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@STATIC3",IDC_STATIC,41,64,39,11
-    EDITTEXT        E_ISSUER,85,64,164,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@STATIC4",IDC_STATIC,41,79,39,10
-    EDITTEXT        E_EXPIRES,85,79,128,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    GROUPBOX        "@STATIC5",IDC_STATIC,6,109,258,180
-    CONTROL         "",L_CERTINFO,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,21,129,229,97
-    GROUPBOX        "@STATIC6",IDC_STATIC1,6,295,258,64
-    ICON            ICO_CERT,S_CERT_ICON,22,313,20,20
-    LTEXT           "@S_PARENT",S_PARENT,46,316,150,20
-    PUSHBUTTON      "",B_PARENT,220,309,29,26,BS_ICON
-    CTEXT           "@S_PARENT_BUTTON_STR",S_PARENT_BUTTON_STR,205,341,55,10
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,214,367,50,17
-    ICON            ICO_WARNING,S_WARNING_ICON,22,314,20,20
-    EDITTEXT        E_DETAIL,21,231,228,49,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL
-    PUSHBUTTON      "@B_SAVE",B_SAVE,128,367,76,17
+    ICON            ICO_CERT,IDC_STATIC,6,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,32,5,232,15
+    GROUPBOX        "@STATIC1",IDC_STATIC,6,28,258,59
+    RTEXT           "@STATIC2",IDC_STATIC,41,41,39,9
+    EDITTEXT        E_SUBJECT,85,41,164,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@STATIC3",IDC_STATIC,41,54,39,10
+    EDITTEXT        E_ISSUER,85,54,164,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@STATIC4",IDC_STATIC,41,67,39,9
+    EDITTEXT        E_EXPIRES,85,67,128,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    GROUPBOX        "@STATIC5",IDC_STATIC,6,93,258,155
+    CONTROL         "",L_CERTINFO,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,21,110,229,84
+    GROUPBOX        "@STATIC6",IDC_STATIC1,6,252,258,55
+    ICON            ICO_CERT,S_CERT_ICON,22,268,20,18
+    LTEXT           "@S_PARENT",S_PARENT,46,270,150,18
+    PUSHBUTTON      "",B_PARENT,220,264,29,23,BS_ICON
+    CTEXT           "@S_PARENT_BUTTON_STR",S_PARENT_BUTTON_STR,205,292,55,9
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,214,314,50,15
+    ICON            ICO_WARNING,S_WARNING_ICON,22,269,20,18
+    EDITTEXT        E_DETAIL,21,197,228,42,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_VSCROLL
+    PUSHBUTTON      "@B_SAVE",B_SAVE,128,314,76,15
 END
 
-D_CHECKCERT DIALOGEX 0, 0, 251, 301
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CHECKCERT DIALOGEX 0, 0, 251, 257
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_CHECKCERT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_WARNING,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,7,211,35
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,48,237,198
-    LTEXT           "@STATIC2",IDC_STATIC,14,61,222,26
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,17,97,20,20
-    LTEXT           "@S_MSG1",S_MSG1,42,97,193,26
-    RTEXT           "@STATIC3",IDC_STATIC,14,124,69,12
-    EDITTEXT        E_SUBJECT,88,124,149,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@STATIC4",IDC_STATIC,15,139,68,11
-    EDITTEXT        E_ISSUER,88,139,149,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@STATIC5",IDC_STATIC,15,154,68,11
-    EDITTEXT        E_EXPIRES,88,154,149,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    PUSHBUTTON      "@B_SHOW",B_SHOW,158,201,76,17
-    LTEXT           "@STATIC9",IDC_STATIC,7,247,237,29
-    RTEXT           "@STATIC6",IDC_STATIC,16,169,67,10
-    EDITTEXT        E_MD5,88,169,148,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@STATIC7",IDC_STATIC,14,185,69,12
-    EDITTEXT        E_SHA1,88,185,148,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    DEFPUSHBUTTON   "@IDOK",IDOK,38,277,80,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,127,277,80,17
-    LTEXT           "@STATIC8",IDC_STATIC,15,223,221,19
+    ICON            ICO_WARNING,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,5,211,30
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,41,237,170
+    LTEXT           "@STATIC2",IDC_STATIC,14,52,222,23
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,17,83,20,18
+    LTEXT           "@S_MSG1",S_MSG1,42,83,193,23
+    RTEXT           "@STATIC3",IDC_STATIC,14,106,69,11
+    EDITTEXT        E_SUBJECT,88,106,149,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@STATIC4",IDC_STATIC,15,119,68,10
+    EDITTEXT        E_ISSUER,88,119,149,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@STATIC5",IDC_STATIC,15,131,68,10
+    EDITTEXT        E_EXPIRES,88,131,149,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    PUSHBUTTON      "@B_SHOW",B_SHOW,158,172,76,15
+    LTEXT           "@STATIC9",IDC_STATIC,7,211,237,25
+    RTEXT           "@STATIC6",IDC_STATIC,16,144,67,9
+    EDITTEXT        E_MD5,88,144,148,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@STATIC7",IDC_STATIC,14,158,69,11
+    EDITTEXT        E_SHA1,88,158,148,11,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    DEFPUSHBUTTON   "@IDOK",IDOK,38,237,80,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,127,237,80,15
+    LTEXT           "@STATIC8",IDC_STATIC,15,191,221,17
 END
 
-D_CONNECTERROR DIALOGEX 0, 0, 251, 213
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CONNECTERROR DIALOGEX 0, 0, 251, 182
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_CONNECTERROR"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_OFFLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,213,24
-    EDITTEXT        E_ERROR,31,32,197,74,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER
-    LTEXT           "@S_COUNTDOWN",S_COUNTDOWN,23,124,207,23
-    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,23,150,209,9
-    DEFPUSHBUTTON   "@IDOK",IDOK,125,189,50,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,181,189,63,17
-    LTEXT           "---",S_RETRYINFO,23,110,207,13
-    CONTROL         "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,164,214,19
+    ICON            ICO_SERVER_OFFLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,213,21
+    EDITTEXT        E_ERROR,31,27,197,64,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER
+    LTEXT           "@S_COUNTDOWN",S_COUNTDOWN,23,106,207,20
+    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,23,128,209,8
+    DEFPUSHBUTTON   "@IDOK",IDOK,125,161,50,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,181,161,63,15
+    LTEXT           "---",S_RETRYINFO,23,94,207,12
+    CONTROL         "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,140,214,17
 END
 
-D_CM_LOGIN DIALOGEX 0, 0, 275, 134
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_LOGIN DIALOGEX 0, 0, 275, 114
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_LOGIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,237,34
-    RTEXT           "@STATIC1",IDC_STATIC,33,70,49,12
-    EDITTEXT        E_PASSWORD,87,68,141,12,ES_PASSWORD | ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC2",IDC_STATIC,26,47,222,50
-    DEFPUSHBUTTON   "@IDOK",IDOK,158,111,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,111,52,16
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,237,30
+    RTEXT           "@STATIC1",IDC_STATIC,33,59,49,11
+    EDITTEXT        E_PASSWORD,87,58,141,11,ES_PASSWORD | ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC2",IDC_STATIC,26,40,222,43
+    DEFPUSHBUTTON   "@IDOK",IDOK,158,95,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,95,52,14
 END
 
-D_CM_MAIN DIALOGEX 0, 0, 258, 247
-STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+D_CM_MAIN DIALOGEX 0, 0, 258, 211
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "PacketiX VPN Main Window"
 MENU M_MAIN
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         "",L_ACCOUNT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,7,244,143
-    CONTROL         "",L_VLAN,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,154,244,86
+    CONTROL         "",L_ACCOUNT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,5,244,123
+    CONTROL         "",L_VLAN,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,131,244,74
 END
 
-D_CONNECTION_STATUS DIALOGEX 0, 0, 291, 268
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CONNECTION_STATUS DIALOGEX 0, 0, 291, 229
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CONNECTION_STATUS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TOWER,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,28,7,256,26
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,39,277,199
-    PUSHBUTTON      "@B_POLICY",B_POLICY,7,244,73,17
-    PUSHBUTTON      "@B_SERVER_CERT",B_SERVER_CERT,88,244,65,17
-    PUSHBUTTON      "@B_CLIENT_CERT",B_CLIENT_CERT,161,244,65,17
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,234,244,50,17
+    ICON            ICO_TOWER,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,28,5,256,23
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,33,277,171
+    PUSHBUTTON      "@B_POLICY",B_POLICY,7,209,73,15
+    PUSHBUTTON      "@B_SERVER_CERT",B_SERVER_CERT,88,209,65,15
+    PUSHBUTTON      "@B_CLIENT_CERT",B_CLIENT_CERT,161,209,65,15
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,234,209,50,15
 END
 
-D_CM_POLICY DIALOGEX 0, 0, 303, 303
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_POLICY DIALOGEX 0, 0, 303, 259
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_POLICY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,34,14,262,19
-    CONTROL         "",L_POLICY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,39,289,180
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,246,279,50,17
-    EDITTEXT        S_DESCRIPTION,7,223,289,52,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,34,11,262,17
+    CONTROL         "",L_POLICY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,33,289,155
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,246,239,50,15
+    EDITTEXT        S_DESCRIPTION,7,191,289,45,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
 END
 
-D_CM_ACCOUNT DIALOGEX 0, 0, 451, 377
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_ACCOUNT DIALOGEX 0, 0, 451, 323
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_ACCOUNT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",S_STATIC1,29,7,186,27
-    RTEXT           "@S_ACCOUNT_NAME",S_ACCOUNT_NAME,7,38,61,12
-    EDITTEXT        E_ACCOUNT_NAME,72,36,126,12,ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC2",S_STATIC2,7,51,206,104
-    ICON            ICO_VPNSERVER,IDC_STATIC,14,65,20,20
-    LTEXT           "@STATIC3",S_STATIC3,40,65,166,29
-    RTEXT           "@STATIC4",S_STATIC4,14,101,54,10
-    EDITTEXT        E_HOSTNAME,72,99,126,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC5",S_STATIC5,14,119,54,10
-    COMBOBOX        C_PORT,72,115,77,48,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "@R_DISABLE_NATT",R_DISABLE_NATT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,117,57,10
-    LTEXT           "@STATIC6",S_STATIC66,172,159,46,11,NOT WS_VISIBLE
-    RTEXT           "@STATIC7",S_STATIC7,14,137,54,10
-    COMBOBOX        C_HUBNAME,72,133,126,72,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "@STATIC8",IDC_STATIC,7,161,206,108
-    ICON            ICO_TOWER,IDC_STATIC,14,175,20,20
-    LTEXT           "@STATIC9",IDC_STATIC,40,175,163,19
-    PUSHBUTTON      "@B_IE",B_IE,74,185,114,17
-    RTEXT           "@STATIC10",IDC_STATIC,14,205,54,10
-    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,203,135,11
-    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,215,135,11
-    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,227,135,11
-    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,243,114,17
-    GROUPBOX        "@STATIC11",S_STATIC11,7,275,206,80
-    ICON            ICO_CERT,IDC_STATIC,14,287,20,20
-    CONTROL         "@R_CHECK_CERT",R_CHECK_CERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,291,133,10
-    PUSHBUTTON      "@B_TRUST",B_TRUST,41,307,157,17
-    PUSHBUTTON      "@B_SERVER_CERT",B_SERVER_CERT,41,329,77,17
-    PUSHBUTTON      "@B_VIEW_SERVER_CERT",B_VIEW_SERVER_CERT,123,329,75,17
-    CONTROL         "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,360,148,10
-    CONTROL         "@R_HIDE2",R_HIDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,360,132,10
-    CONTROL         "",L_VLAN,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,233,21,200,76
-    GROUPBOX        "@S_VLAN_GROUP",S_VLAN_GROUP,224,7,220,102
-    LTEXT           "@S_POLICY_1",S_POLICY_1,258,21,163,28,NOT WS_VISIBLE
-    PUSHBUTTON      "@B_POLICY",B_POLICY,343,53,77,17,NOT WS_VISIBLE
-    ICON            ICO_CASCADE,S_POLICY_2,233,21,20,20,NOT WS_VISIBLE
-    GROUPBOX        "@STATIC12",IDC_STATIC,223,115,221,126
-    ICON            ICO_KEY,IDC_STATIC,230,127,20,20
-    LTEXT           "@STATIC15",IDC_STATIC,251,127,185,20
-    RTEXT           "@STATIC13",IDC_STATIC,237,153,48,10
-    COMBOBOX        C_TYPE,289,151,126,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_USERNAME",S_USERNAME,230,172,54,10
-    EDITTEXT        E_USERNAME,289,170,126,12,ES_AUTOHSCROLL
-    RTEXT           "@S_PASSWORD",S_PASSWORD,230,189,54,10,NOT WS_VISIBLE
-    ICON            ICO_CERT,S_CERT,248,185,20,20
-    LTEXT           "@S_CERT_INFO",S_CERT_INFO,272,187,160,28
-    EDITTEXT        E_PASSWORD,289,187,126,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE
-    CTEXT           "@S_CHANGE_PASSWORD",S_CHANGE_PASSWORD,244,203,187,11
-    PUSHBUTTON      "VIEW_CLIENT_CERT",B_VIEW_CLIENT_CERT,246,215,90,17
-    PUSHBUTTON      "@B_REGIST_CLIENT_CERT",B_REGIST_CLIENT_CERT,341,215,90,17
-    PUSHBUTTON      "@B_CHANGE_PASSWORD",B_CHANGE_PASSWORD,341,215,90,17
-    GROUPBOX        "@STATIC14",IDC_STATIC,223,248,221,100
-    ICON            ICO_MACHINE,IDC_STATIC,230,262,20,20
-    CONTROL         "@R_RETRY",R_RETRY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,263,184,10
-    RTEXT           "@S_RETRY_NUM_1",S_RETRY_NUM_1,253,279,61,10
-    EDITTEXT        E_RETRY_NUM,318,277,41,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_RETRY_NUM_2",S_RETRY_NUM_2,364,279,73,9
-    RTEXT           "@S_RETRY_SPAN_1",S_RETRY_SPAN_1,228,295,86,10
-    EDITTEXT        E_RETRY_SPAN,318,293,41,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_RETRY_SPAN_2",S_RETRY_SPAN_2,364,295,72,10
-    CONTROL         "@R_INFINITE",R_INFINITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,310,171,10
-    CONTROL         "@R_NOTLS1",R_NOTLS1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,327,87,10
-    PUSHBUTTON      "@B_DETAIL",B_DETAIL,344,324,87,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,308,351,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,380,351,64,19
-    CONTROL         178,S_ROUTER_LOGO,"Static",SS_BITMAP | NOT WS_VISIBLE,358,7,86,103
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",S_STATIC1,29,5,186,24
+    RTEXT           "@S_ACCOUNT_NAME",S_ACCOUNT_NAME,7,32,61,11
+    EDITTEXT        E_ACCOUNT_NAME,72,30,126,11,ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC2",S_STATIC2,7,43,206,90
+    ICON            ICO_VPNSERVER,IDC_STATIC,14,55,20,18
+    LTEXT           "@STATIC3",S_STATIC3,40,55,166,25
+    RTEXT           "@STATIC4",S_STATIC4,14,86,54,9
+    EDITTEXT        E_HOSTNAME,72,84,126,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC5",S_STATIC5,14,101,54,9
+    COMBOBOX        C_PORT,72,98,77,42,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "@R_DISABLE_NATT",R_DISABLE_NATT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,100,57,9
+    LTEXT           "@STATIC6",S_STATIC66,172,136,46,10,NOT WS_VISIBLE
+    RTEXT           "@STATIC7",S_STATIC7,14,117,54,9
+    COMBOBOX        C_HUBNAME,72,113,126,62,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "@STATIC8",IDC_STATIC,7,137,206,93
+    ICON            ICO_TOWER,IDC_STATIC,14,149,20,18
+    LTEXT           "@STATIC9",IDC_STATIC,40,149,163,17
+    PUSHBUTTON      "@B_IE",B_IE,74,158,114,15
+    RTEXT           "@STATIC10",IDC_STATIC,14,175,54,9
+    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,173,135,10
+    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,184,135,10
+    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,194,135,10
+    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,208,114,15
+    GROUPBOX        "@STATIC11",S_STATIC11,7,235,206,69
+    ICON            ICO_CERT,IDC_STATIC,14,245,20,18
+    CONTROL         "@R_CHECK_CERT",R_CHECK_CERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,249,133,9
+    PUSHBUTTON      "@B_TRUST",B_TRUST,41,263,157,15
+    PUSHBUTTON      "@B_SERVER_CERT",B_SERVER_CERT,41,281,77,15
+    PUSHBUTTON      "@B_VIEW_SERVER_CERT",B_VIEW_SERVER_CERT,123,281,75,15
+    CONTROL         "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,308,148,9
+    CONTROL         "@R_HIDE2",R_HIDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,308,132,9
+    CONTROL         "",L_VLAN,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,233,17,200,66
+    GROUPBOX        "@S_VLAN_GROUP",S_VLAN_GROUP,224,5,220,88
+    LTEXT           "@S_POLICY_1",S_POLICY_1,258,17,163,24,NOT WS_VISIBLE
+    PUSHBUTTON      "@B_POLICY",B_POLICY,343,45,77,15,NOT WS_VISIBLE
+    ICON            ICO_CASCADE,S_POLICY_2,233,17,20,18,NOT WS_VISIBLE
+    GROUPBOX        "@STATIC12",IDC_STATIC,223,98,221,108
+    ICON            ICO_KEY,IDC_STATIC,230,108,20,18
+    LTEXT           "@STATIC15",IDC_STATIC,251,108,185,18
+    RTEXT           "@STATIC13",IDC_STATIC,237,131,48,9
+    COMBOBOX        C_TYPE,289,129,126,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_USERNAME",S_USERNAME,230,147,54,9
+    EDITTEXT        E_USERNAME,289,145,126,11,ES_AUTOHSCROLL
+    RTEXT           "@S_PASSWORD",S_PASSWORD,230,161,54,9,NOT WS_VISIBLE
+    ICON            ICO_CERT,S_CERT,248,158,20,18
+    LTEXT           "@S_CERT_INFO",S_CERT_INFO,272,160,160,24
+    EDITTEXT        E_PASSWORD,289,160,126,11,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE
+    CTEXT           "@S_CHANGE_PASSWORD",S_CHANGE_PASSWORD,244,173,187,10
+    PUSHBUTTON      "VIEW_CLIENT_CERT",B_VIEW_CLIENT_CERT,246,184,90,15
+    PUSHBUTTON      "@B_REGIST_CLIENT_CERT",B_REGIST_CLIENT_CERT,341,184,90,15
+    PUSHBUTTON      "@B_CHANGE_PASSWORD",B_CHANGE_PASSWORD,341,184,90,15
+    GROUPBOX        "@STATIC14",IDC_STATIC,223,212,221,86
+    ICON            ICO_MACHINE,IDC_STATIC,230,224,20,18
+    CONTROL         "@R_RETRY",R_RETRY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,225,184,9
+    RTEXT           "@S_RETRY_NUM_1",S_RETRY_NUM_1,253,239,61,9
+    EDITTEXT        E_RETRY_NUM,318,237,41,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_RETRY_NUM_2",S_RETRY_NUM_2,364,239,73,8
+    RTEXT           "@S_RETRY_SPAN_1",S_RETRY_SPAN_1,228,252,86,9
+    EDITTEXT        E_RETRY_SPAN,318,251,41,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_RETRY_SPAN_2",S_RETRY_SPAN_2,364,252,72,9
+    CONTROL         "@R_INFINITE",R_INFINITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,265,171,9
+    CONTROL         "@R_NOTLS1",R_NOTLS1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,280,87,9
+    PUSHBUTTON      "@B_DETAIL",B_DETAIL,344,277,87,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,308,300,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,380,300,64,17
+    CONTROL         178,S_ROUTER_LOGO,"Static",SS_BITMAP | NOT WS_VISIBLE,358,5,86,89
 END
 
-D_CM_PROXY DIALOGEX 0, 0, 255, 153
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_PROXY DIALOGEX 0, 0, 255, 131
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_PROXY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TOWER,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,26,7,222,29
-    RTEXT           "@STATIC2",IDC_STATIC,7,45,74,10
-    EDITTEXT        E_HOSTNAME,85,43,126,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC3",IDC_STATIC,7,63,74,9
-    COMBOBOX        C_PORT,85,59,48,48,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@STATIC4",IDC_STATIC,7,82,74,11
-    EDITTEXT        E_USERNAME,85,80,99,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC5",IDC_STATIC,7,101,74,10
-    EDITTEXT        E_PASSWORD,85,99,99,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,115,129,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,184,129,64,17
-    LTEXT           "@STATIC6",IDC_STATIC,191,82,57,13
-    LTEXT           "@STATIC7",IDC_STATIC,191,101,57,12
+    ICON            ICO_TOWER,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,26,5,222,25
+    RTEXT           "@STATIC2",IDC_STATIC,7,38,74,9
+    EDITTEXT        E_HOSTNAME,85,36,126,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC3",IDC_STATIC,7,53,74,8
+    COMBOBOX        C_PORT,85,50,48,42,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@STATIC4",IDC_STATIC,7,70,74,10
+    EDITTEXT        E_USERNAME,85,68,99,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC5",IDC_STATIC,7,86,74,9
+    EDITTEXT        E_PASSWORD,85,84,99,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,115,110,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,184,110,64,15
+    LTEXT           "@STATIC6",IDC_STATIC,191,70,57,12
+    LTEXT           "@STATIC7",IDC_STATIC,191,86,57,11
 END
 
-D_CM_DETAIL DIALOGEX 0, 0, 435, 365
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_DETAIL DIALOGEX 0, 0, 435, 312
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_DETAIL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,394,23
-    GROUPBOX        "@STATIC2",S_STATIC2,7,38,205,319
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,15,52,18,21
-    LTEXT           "@STATIC3",S_STATIC3,39,52,167,28
-    LTEXT           "@STATIC4",S_STATIC4,15,84,130,10
-    COMBOBOX        C_NUM_TCP,39,97,33,110,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "@STATIC5",S_STATIC5,78,100,125,10
-    LTEXT           "@STATIC6",S_STATIC6,39,115,165,18
-    LTEXT           "@STATIC7",S_STATIC7,15,138,130,10
-    RTEXT           "@STATIC8",S_STATIC8,15,153,106,10
-    EDITTEXT        E_INTERVAL,125,151,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC9",S_STATIC9,169,153,38,9
-    CONTROL         "@R_USE_DISCONNECT",R_USE_DISCONNECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,39,171,160,18
-    RTEXT           "@STATIC10",S_STATIC10,15,194,105,9
-    EDITTEXT        E_DISCONNECT_SPAN,125,192,40,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC11",S_STATIC11,169,194,40,10
-    LTEXT           "@STATIC12",S_STATIC12,15,213,190,78
-    CONTROL         "@R_USE_HALF_CONNECTION",R_USE_HALF_CONNECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,294,160,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,311,190,35
-    LTEXT           "@STATIC19",S_STATIC19,18,317,184,19
-    CONTROL         "@R_DISABLE_QOS",R_DISABLE_QOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,339,161,11
-    GROUPBOX        "@STATIC13",S_STATIC133,222,38,205,142
-    ICON            ICO_KEY,IDC_STATIC,230,47,18,21
-    LTEXT           "@STATIC14",IDC_STATIC,254,47,167,37
-    CONTROL         "@R_USE_ENCRYPT",R_USE_ENCRYPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,87,160,10
-    ICON            ICO_VPN,IDC_STATIC,230,104,18,21
-    LTEXT           "@S_UDPACCEL",IDC_STATIC,254,104,167,34
-    CONTROL         "@R_USE_COMPRESS",R_USE_COMPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,141,160,10
-    CONTROL         "@R_DISABLE_UDP",R_DISABLE_UDP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,161,160,10
-    GROUPBOX        "@STATIC16",IDC_STATIC,222,185,205,73
-    LTEXT           "@S_MODE",S_MODE,254,198,166,19
-    CONTROL         "@R_BRIDGE",R_BRIDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,223,166,10
-    CONTROL         "@R_MONITOR",R_MONITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,240,166,10
-    GROUPBOX        "@STATIC17",IDC_STATIC,222,263,205,34
-    CONTROL         "@R_NO_ROUTING",R_NO_ROUTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,278,181,10
-    ICON            ICO_WARNING,S_WARNING_ICON,223,305,18,21
-    LTEXT           "@STATIC18",IDC_STATIC,247,305,180,30
-    DEFPUSHBUTTON   "@IDOK",IDOK,294,340,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,363,340,64,17
-    ICON            ICO_SWITCH,IDC_STATIC,230,198,18,21
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,394,20
+    GROUPBOX        "@STATIC2",S_STATIC2,7,32,205,274
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,15,44,18,18
+    LTEXT           "@STATIC3",S_STATIC3,39,44,167,24
+    LTEXT           "@STATIC4",S_STATIC4,15,71,130,9
+    COMBOBOX        C_NUM_TCP,39,83,33,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "@STATIC5",S_STATIC5,78,85,125,9
+    LTEXT           "@STATIC6",S_STATIC6,39,98,165,16
+    LTEXT           "@STATIC7",S_STATIC7,15,118,130,9
+    RTEXT           "@STATIC8",S_STATIC8,15,131,106,9
+    EDITTEXT        E_INTERVAL,125,129,40,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC9",S_STATIC9,169,131,38,8
+    CONTROL         "@R_USE_DISCONNECT",R_USE_DISCONNECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,39,146,160,16
+    RTEXT           "@STATIC10",S_STATIC10,15,166,105,8
+    EDITTEXT        E_DISCONNECT_SPAN,125,164,40,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC11",S_STATIC11,169,166,40,9
+    LTEXT           "@STATIC12",S_STATIC12,15,182,190,67
+    CONTROL         "@R_USE_HALF_CONNECTION",R_USE_HALF_CONNECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,251,160,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,266,190,30
+    LTEXT           "@STATIC19",S_STATIC19,18,271,184,17
+    CONTROL         "@R_DISABLE_QOS",R_DISABLE_QOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,290,161,10
+    GROUPBOX        "@STATIC13",S_STATIC133,222,32,205,122
+    ICON            ICO_KEY,IDC_STATIC,230,40,18,18
+    LTEXT           "@STATIC14",IDC_STATIC,254,40,167,32
+    CONTROL         "@R_USE_ENCRYPT",R_USE_ENCRYPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,74,160,9
+    ICON            ICO_VPN,IDC_STATIC,230,89,18,18
+    LTEXT           "@S_UDPACCEL",IDC_STATIC,254,89,167,30
+    CONTROL         "@R_USE_COMPRESS",R_USE_COMPRESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,120,160,9
+    CONTROL         "@R_DISABLE_UDP",R_DISABLE_UDP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,137,160,9
+    GROUPBOX        "@STATIC16",IDC_STATIC,222,158,205,63
+    LTEXT           "@S_MODE",S_MODE,254,169,166,17
+    CONTROL         "@R_BRIDGE",R_BRIDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,191,166,9
+    CONTROL         "@R_MONITOR",R_MONITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,205,166,9
+    GROUPBOX        "@STATIC17",IDC_STATIC,222,225,205,30
+    CONTROL         "@R_NO_ROUTING",R_NO_ROUTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,238,181,9
+    ICON            ICO_WARNING,S_WARNING_ICON,223,261,18,18
+    LTEXT           "@STATIC18",IDC_STATIC,247,261,180,26
+    DEFPUSHBUTTON   "@IDOK",IDOK,294,291,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,363,291,64,15
+    ICON            ICO_SWITCH,IDC_STATIC,230,169,18,18
 END
 
-D_CM_NEW_VLAN DIALOGEX 0, 0, 251, 115
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_NEW_VLAN DIALOGEX 0, 0, 251, 98
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_NEW_VLAN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_INFO",S_INFO,32,10,212,27
-    RTEXT           "@STATIC1",IDC_STATIC,7,45,93,10
-    EDITTEXT        E_NAME,105,43,120,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,112,91,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,180,91,64,17
-    LTEXT           "@S_WIN8",S_WIN8,7,65,237,24,NOT WS_VISIBLE
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_INFO",S_INFO,32,8,212,24
+    RTEXT           "@STATIC1",IDC_STATIC,7,38,93,9
+    EDITTEXT        E_NAME,105,36,120,11,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,112,77,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,180,77,64,15
+    LTEXT           "@S_WIN8",S_WIN8,7,55,237,21,NOT WS_VISIBLE
 END
 
-D_CM_TRUST DIALOGEX 0, 0, 335, 228
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_TRUST DIALOGEX 0, 0, 335, 195
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_TRUST"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,295,44
-    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,52,321,142
-    PUSHBUTTON      "@B_IMPORT",B_IMPORT,7,204,55,17
-    PUSHBUTTON      "@B_EXPORT",B_EXPORT,66,204,54,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,187,204,62,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,255,204,73,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,126,204,54,17
+    ICON            ICO_CERT,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,295,38
+    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,44,321,122
+    PUSHBUTTON      "@B_IMPORT",B_IMPORT,7,174,55,15
+    PUSHBUTTON      "@B_EXPORT",B_EXPORT,66,174,54,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,187,174,62,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,255,174,73,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,126,174,54,15
 END
 
-D_CM_PASSWORD DIALOGEX 0, 0, 277, 186
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_PASSWORD DIALOGEX 0, 0, 277, 159
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,29,7,241,37
-    GROUPBOX        "@STATIC1",IDC_STATIC,26,47,222,103
-    CONTROL         "@R_USE_PASSWORD",R_USE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,36,64,190,10
-    CONTROL         "@R_REMOTE_ONLY",R_REMOTE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,36,81,190,10
-    RTEXT           "@IDC_STATIC1",IDC_STATIC1,33,104,49,10
-    EDITTEXT        E_PASSWORD,87,102,141,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@IDC_STATIC2",IDC_STATIC2,33,124,49,10
-    EDITTEXT        E_PASSWORD2,87,122,141,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,158,163,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,218,163,52,16
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,29,5,241,32
+    GROUPBOX        "@STATIC1",IDC_STATIC,26,40,222,89
+    CONTROL         "@R_USE_PASSWORD",R_USE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,36,54,190,9
+    CONTROL         "@R_REMOTE_ONLY",R_REMOTE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,36,69,190,9
+    RTEXT           "@IDC_STATIC1",IDC_STATIC1,33,89,49,9
+    EDITTEXT        E_PASSWORD,87,87,141,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@IDC_STATIC2",IDC_STATIC2,33,106,49,9
+    EDITTEXT        E_PASSWORD2,87,104,141,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,158,139,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,218,139,52,14
 END
 
-D_CM_CONFIG DIALOGEX 0, 0, 303, 399
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_CONFIG DIALOGEX 0, 0, 303, 341
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_CONFIG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,32,7,263,19
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,40,288,94
-    ICON            ICO_VPN,IDC_STATIC,14,54,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,41,55,246,17
-    CONTROL         "@R_ALLOW_REMOTE_CONFIG",R_ALLOW_REMOTE_CONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,81,232,12
-    LTEXT           "@S_WARNING",S_WARNING,41,94,246,38
-    GROUPBOX        "@STATIC7",IDC_STATIC,7,141,288,162
-    ICON            ICO_INTERNET,IDC_STATIC,14,155,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,41,156,246,29
-    CONTROL         "@R_USE_KEEP_CONNECT",R_USE_KEEP_CONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,187,232,12
-    RTEXT           "@S_HOSTNAME",S_HOSTNAME,16,207,63,10
-    EDITTEXT        E_HOSTNAME,82,205,139,12,ES_AUTOHSCROLL
-    RTEXT           "@S_PORT",S_PORT,16,227,63,10
-    EDITTEXT        E_PORT,82,225,36,12,ES_AUTOHSCROLL | ES_NUMBER
-    RTEXT           "@S_INTERVAL",S_INTERVAL,131,227,63,11
-    EDITTEXT        E_INTERVAL,197,225,36,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_INTERVAL2",S_INTERVAL2,239,227,47,10
-    RTEXT           "@S_PROTOCOL",S_PROTOCOL,16,247,63,10
-    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON,85,247,74,10
-    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,171,247,75,10
-    LTEXT           "@S_INFO",S_INFO,41,265,246,36
-    ICON            ICO_INFORMATION,S_INFO2,14,260,20,20
-    DEFPUSHBUTTON   "@IDOK",IDOK,162,374,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,231,374,64,17
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,311,288,54
-    CONTROL         "@R_ALPHA",R_ALPHA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,332,105,12
-    EDITTEXT        E_ALPHA_VALUE,150,331,27,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "%",IDC_STATIC,185,333,8,11
-    LTEXT           "@STATIC6",IDC_STATIC,43,349,243,9
-    ICON            ICO_SETUP,S_INFO3,14,329,20,20
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,32,5,263,17
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,34,288,81
+    ICON            ICO_VPN,IDC_STATIC,14,46,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,41,47,246,15
+    CONTROL         "@R_ALLOW_REMOTE_CONFIG",R_ALLOW_REMOTE_CONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,69,232,11
+    LTEXT           "@S_WARNING",S_WARNING,41,80,246,33
+    GROUPBOX        "@STATIC7",IDC_STATIC,7,120,288,139
+    ICON            ICO_INTERNET,IDC_STATIC,14,132,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,41,133,246,25
+    CONTROL         "@R_USE_KEEP_CONNECT",R_USE_KEEP_CONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,160,232,11
+    RTEXT           "@S_HOSTNAME",S_HOSTNAME,16,177,63,9
+    EDITTEXT        E_HOSTNAME,82,175,139,11,ES_AUTOHSCROLL
+    RTEXT           "@S_PORT",S_PORT,16,194,63,9
+    EDITTEXT        E_PORT,82,192,36,11,ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT           "@S_INTERVAL",S_INTERVAL,131,194,63,10
+    EDITTEXT        E_INTERVAL,197,192,36,11,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_INTERVAL2",S_INTERVAL2,239,194,47,9
+    RTEXT           "@S_PROTOCOL",S_PROTOCOL,16,211,63,9
+    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON,85,211,74,9
+    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,171,211,75,9
+    LTEXT           "@S_INFO",S_INFO,41,227,246,31
+    ICON            ICO_INFORMATION,S_INFO2,14,222,20,18
+    DEFPUSHBUTTON   "@IDOK",IDOK,162,320,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,231,320,64,15
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,266,288,47
+    CONTROL         "@R_ALPHA",R_ALPHA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,284,105,11
+    EDITTEXT        E_ALPHA_VALUE,150,283,27,11,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "%",IDC_STATIC,185,285,8,10
+    LTEXT           "@STATIC6",IDC_STATIC,43,299,243,8
+    ICON            ICO_SETUP,S_INFO3,14,281,20,18
 END
 
-D_ABOUT DIALOGEX 0, 0, 333, 361
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_ABOUT DIALOGEX 0, 0, 333, 309
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_ABOUT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,250,339,76,18
-    CONTROL         224,S_LOGO,"Static",SS_BITMAP,7,6,319,76
-    LTEXT           "@S_INFO1",S_INFO1,7,83,240,17
-    PUSHBUTTON      "@B_AUTHORS",B_AUTHORS,251,83,75,18
-    LTEXT           "@S_INFO2",S_INFO2,7,101,319,39
-    LTEXT           "@S_INFO4",S_INFO4,7,143,319,61
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,211,319,1
-    LTEXT           "@S_INFO3",S_INFO3,7,217,319,98
-    PUSHBUTTON      "@B_EULA",B_EULA,7,315,74,18
-    PUSHBUTTON      "@B_IMPORTANT",B_IMPORTANT,88,315,74,18
-    PUSHBUTTON      "@B_LEGAL",B_LEGAL,169,315,74,18
-    PUSHBUTTON      "Lan&guage Settings",B_LANGUAGE,250,315,75,18
-    PUSHBUTTON      "@B_WEB",B_WEB,7,339,130,18
-    PUSHBUTTON      "@B_UPDATE_CONFIG",B_UPDATE_CONFIG,142,339,96,18
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,250,290,76,16
+    CONTROL         224,S_LOGO,"Static",SS_BITMAP,7,5,319,66
+    LTEXT           "@S_INFO1",S_INFO1,7,71,240,15
+    PUSHBUTTON      "@B_AUTHORS",B_AUTHORS,251,71,75,16
+    LTEXT           "@S_INFO2",S_INFO2,7,86,319,34
+    LTEXT           "@S_INFO4",S_INFO4,7,122,319,53
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,180,319,1
+    LTEXT           "@S_INFO3",S_INFO3,7,185,319,84
+    PUSHBUTTON      "@B_EULA",B_EULA,7,269,74,16
+    PUSHBUTTON      "@B_IMPORTANT",B_IMPORTANT,88,269,74,16
+    PUSHBUTTON      "@B_LEGAL",B_LEGAL,169,269,74,16
+    PUSHBUTTON      "Lan&guage Settings",B_LANGUAGE,250,269,75,16
+    PUSHBUTTON      "@B_WEB",B_WEB,7,290,130,16
+    PUSHBUTTON      "@B_UPDATE_CONFIG",B_UPDATE_CONFIG,142,290,96,16
 END
 
-D_REMOTE DIALOGEX 0, 0, 275, 175
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_REMOTE DIALOGEX 0, 0, 275, 149
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_REMOTE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TEST,S_ICON,7,7,20,20
-    LTEXT           "S_TITLE",S_TITLE,31,7,237,64
-    GROUPBOX        "@STATIC1",-1,26,78,222,61
-    CONTROL         "@R_LOCAL",R_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,92,200,17
-    RTEXT           "@S_HOSTNAME",S_HOSTNAME,28,115,54,12
-    DEFPUSHBUTTON   "@IDOK",IDOK,158,152,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,152,52,16
-    COMBOBOX        C_HOSTNAME,86,113,150,106,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    ICON            ICO_TEST,S_ICON,7,5,20,18
+    LTEXT           "S_TITLE",S_TITLE,31,5,237,55
+    GROUPBOX        "@STATIC1",-1,26,66,222,53
+    CONTROL         "@R_LOCAL",R_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,78,200,15
+    RTEXT           "@S_HOSTNAME",S_HOSTNAME,28,98,54,11
+    DEFPUSHBUTTON   "@IDOK",IDOK,158,130,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,130,52,14
+    COMBOBOX        C_HOSTNAME,86,96,150,91,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
 END
 
-D_CM_DESKTOP DIALOGEX 0, 0, 370, 224
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_DESKTOP DIALOGEX 0, 0, 370, 191
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_DESKTOP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_DISPLAY,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,31,14,332,26
-    LTEXT           "@S_WARNING",S_WARNING,31,41,332,23
-    LTEXT           "",S_MSG_1,31,65,332,31
-    LTEXT           "",S_MSG_2,31,99,332,32
-    LTEXT           "",S_MSG_3,31,135,332,44
-    LTEXT           "@S_INFO",S_INFO,31,183,332,16
-    DEFPUSHBUTTON   "@IDOK",IDOK,253,201,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,311,201,52,16
+    ICON            ICO_DISPLAY,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,31,11,332,23
+    LTEXT           "@S_WARNING",S_WARNING,31,35,332,20
+    LTEXT           "",S_MSG_1,31,55,332,27
+    LTEXT           "",S_MSG_2,31,84,332,28
+    LTEXT           "",S_MSG_3,31,115,332,38
+    LTEXT           "@S_INFO",S_INFO,31,156,332,14
+    DEFPUSHBUTTON   "@IDOK",IDOK,253,172,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,311,172,52,14
 END
 
-D_CM_CHANGE_PASSWORD DIALOGEX 0, 0, 259, 248
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_CHANGE_PASSWORD DIALOGEX 0, 0, 259, 212
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_CM_CHANGE_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,14,221,29
-    GROUPBOX        "@STATIC1",IDC_STATIC,21,46,209,148
-    RTEXT           "@STATIC2",IDC_STATIC,32,65,60,11
-    EDITTEXT        E_HUBNAME,99,63,108,12,ES_AUTOHSCROLL | WS_DISABLED
-    RTEXT           "@STATIC3",IDC_STATIC,32,87,60,11
-    EDITTEXT        E_USERNAME,99,85,108,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,32,109,60,11
-    EDITTEXT        E_OLD_PASSWORD,99,107,108,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC5",IDC_STATIC,31,131,60,9
-    EDITTEXT        E_NEW_PASSWORD1,99,129,108,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC6",IDC_STATIC,31,151,60,19
-    EDITTEXT        E_NEW_PASSWORD2,99,151,108,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,120,224,63,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,189,224,63,17
-    LTEXT           "@S_STATIC",S_STATIC,21,199,231,18
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,11,221,25
+    GROUPBOX        "@STATIC1",IDC_STATIC,21,39,209,127
+    RTEXT           "@STATIC2",IDC_STATIC,32,55,60,10
+    EDITTEXT        E_HUBNAME,99,53,108,11,ES_AUTOHSCROLL | WS_DISABLED
+    RTEXT           "@STATIC3",IDC_STATIC,32,74,60,10
+    EDITTEXT        E_USERNAME,99,72,108,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,32,93,60,10
+    EDITTEXT        E_OLD_PASSWORD,99,91,108,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC5",IDC_STATIC,31,112,60,8
+    EDITTEXT        E_NEW_PASSWORD1,99,110,108,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC6",IDC_STATIC,31,129,60,17
+    EDITTEXT        E_NEW_PASSWORD2,99,129,108,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,120,191,63,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,189,191,63,15
+    LTEXT           "@S_STATIC",S_STATIC,21,170,231,16
 END
 
-D_SM_MAIN DIALOGEX 0, 0, 275, 361
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_MAIN DIALOGEX 0, 0, 275, 309
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_SM_MAIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         141,IDC_STATIC,"Static",SS_BITMAP,0,0,275,53
-    GROUPBOX        "@STATIC1",IDC_STATIC,6,63,261,218
-    ICON            ICO_VPNSERVER,IDC_STATIC,14,79,20,20
-    LTEXT           "@STATIC2",IDC_STATIC,41,79,218,33
-    CONTROL         "",L_SETTING,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,15,113,242,111
-    PUSHBUTTON      "@B_NEW_SETTING",B_NEW_SETTING,15,231,76,16
-    PUSHBUTTON      "@B_EDIT_SETTING",B_EDIT_SETTING,98,231,76,16
-    PUSHBUTTON      "@B_DELETE",B_DELETE,181,231,76,16
-    PUSHBUTTON      "@IDOK",IDOK,181,254,76,19
-    ICON            ICO_CERT,IDC_STATIC,147,288,20,20
-    PUSHBUTTON      "@B_CERT_TOOL",B_CERT_TOOL,171,290,86,16
-    ICON            ICO_SECURE,IDC_STATIC,45,311,20,20
-    PUSHBUTTON      "@B_SECURE_MANAGER",B_SECURE_MANAGER,67,314,96,16
-    PUSHBUTTON      "@B_SELECT_SECURE",B_SELECT_SECURE,171,314,86,16
-    PUSHBUTTON      "@B_ABOUT",B_ABOUT,14,337,76,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,98,337,159,16
+    CONTROL         141,IDC_STATIC,"Static",SS_BITMAP,0,0,275,46
+    GROUPBOX        "@STATIC1",IDC_STATIC,6,53,261,187
+    ICON            ICO_VPNSERVER,IDC_STATIC,14,67,20,18
+    LTEXT           "@STATIC2",IDC_STATIC,41,67,218,29
+    CONTROL         "",L_SETTING,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,15,96,242,96
+    PUSHBUTTON      "@B_NEW_SETTING",B_NEW_SETTING,15,197,76,14
+    PUSHBUTTON      "@B_EDIT_SETTING",B_EDIT_SETTING,98,197,76,14
+    PUSHBUTTON      "@B_DELETE",B_DELETE,181,197,76,14
+    PUSHBUTTON      "@IDOK",IDOK,181,217,76,17
+    ICON            ICO_CERT,IDC_STATIC,147,246,20,18
+    PUSHBUTTON      "@B_CERT_TOOL",B_CERT_TOOL,171,248,86,14
+    ICON            ICO_SECURE,IDC_STATIC,45,266,20,18
+    PUSHBUTTON      "@B_SECURE_MANAGER",B_SECURE_MANAGER,67,269,96,14
+    PUSHBUTTON      "@B_SELECT_SECURE",B_SELECT_SECURE,171,269,86,14
+    PUSHBUTTON      "@B_ABOUT",B_ABOUT,14,288,76,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,98,288,159,14
 END
 
-D_SM_EDIT_SETTING DIALOGEX 0, 0, 435, 307
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_SETTING DIALOGEX 0, 0, 435, 263
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_SETTING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,32,15,396,12
-    RTEXT           "@STATIC2",IDC_STATIC,7,33,61,11
-    EDITTEXT        E_ACCOUNT_NAME,72,31,126,12,ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC3",IDC_STATIC,7,51,206,101
-    ICON            ICO_VPNSERVER,IDC_STATIC,14,65,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,40,65,166,29
-    RTEXT           "@STATIC5",IDC_STATIC,14,101,54,12
-    EDITTEXT        E_HOSTNAME,72,99,126,12,ES_AUTOHSCROLL
-    CONTROL         "@R_LOCALHOST",R_LOCALHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,115,122,10
-    RTEXT           "@STATIC6",IDC_STATIC,14,133,54,12
-    COMBOBOX        C_PORT,72,129,81,48,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "@STATIC7",IDC_STATIC,159,133,46,11
-    GROUPBOX        "@STATIC8",IDC_STATIC,7,169,206,108
-    ICON            ICO_TOWER,IDC_STATIC,14,183,20,20
-    LTEXT           "@STATIC9",IDC_STATIC,40,183,163,19
-    RTEXT           "@STATIC10",IDC_STATIC,14,213,54,11
-    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,211,135,11
-    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,223,135,11
-    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,235,135,11
-    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,251,114,17
-    GROUPBOX        "@STATIC11",IDC_STATIC,222,51,206,225
-    ICON            ICO_USER_ADMIN,IDC_STATIC,229,65,20,20
-    LTEXT           "@STATIC12",IDC_STATIC,255,65,165,94
-    CONTROL         "@R_SERVER_ADMIN",R_SERVER_ADMIN,"Button",BS_AUTORADIOBUTTON,239,162,82,13
-    CONTROL         "@R_HUB_ADMIN",R_HUB_ADMIN,"Button",BS_AUTORADIOBUTTON,324,162,85,13
-    RTEXT           "@S_HUBNAME",S_HUBNAME,224,189,61,14
-    COMBOBOX        C_HUBNAME,288,185,126,90,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    ICON            ICO_KEY,IDC_STATIC,230,217,20,20
-    LTEXT           "@STATIC13",IDC_STATIC,251,220,177,18
-    RTEXT           "@S_PASSWORD",S_PASSWORD,227,243,60,10
-    EDITTEXT        E_PASSWORD,289,241,126,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "@R_NO_SAVE",R_NO_SAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,290,261,127,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,291,281,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,364,281,64,19
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,233,209,183,1
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,32,12,396,11
+    RTEXT           "@STATIC2",IDC_STATIC,7,28,61,10
+    EDITTEXT        E_ACCOUNT_NAME,72,26,126,11,ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC3",IDC_STATIC,7,43,206,87
+    ICON            ICO_VPNSERVER,IDC_STATIC,14,55,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,40,55,166,25
+    RTEXT           "@STATIC5",IDC_STATIC,14,86,54,11
+    EDITTEXT        E_HOSTNAME,72,84,126,11,ES_AUTOHSCROLL
+    CONTROL         "@R_LOCALHOST",R_LOCALHOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,98,122,9
+    RTEXT           "@STATIC6",IDC_STATIC,14,113,54,11
+    COMBOBOX        C_PORT,72,110,81,42,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "@STATIC7",IDC_STATIC,159,113,46,10
+    GROUPBOX        "@STATIC8",IDC_STATIC,7,144,206,93
+    ICON            ICO_TOWER,IDC_STATIC,14,156,20,18
+    LTEXT           "@STATIC9",IDC_STATIC,40,156,163,17
+    RTEXT           "@STATIC10",IDC_STATIC,14,182,54,10
+    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,180,135,10
+    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,191,135,10
+    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,201,135,10
+    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,215,114,15
+    GROUPBOX        "@STATIC11",IDC_STATIC,222,43,206,193
+    ICON            ICO_USER_ADMIN,IDC_STATIC,229,55,20,18
+    LTEXT           "@STATIC12",IDC_STATIC,255,55,165,81
+    CONTROL         "@R_SERVER_ADMIN",R_SERVER_ADMIN,"Button",BS_AUTORADIOBUTTON,239,138,82,12
+    CONTROL         "@R_HUB_ADMIN",R_HUB_ADMIN,"Button",BS_AUTORADIOBUTTON,324,138,85,12
+    RTEXT           "@S_HUBNAME",S_HUBNAME,224,161,61,12
+    COMBOBOX        C_HUBNAME,288,158,126,78,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON            ICO_KEY,IDC_STATIC,230,185,20,18
+    LTEXT           "@STATIC13",IDC_STATIC,251,188,177,16
+    RTEXT           "@S_PASSWORD",S_PASSWORD,227,208,60,9
+    EDITTEXT        E_PASSWORD,289,206,126,11,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "@R_NO_SAVE",R_NO_SAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,290,223,127,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,291,240,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,364,240,64,17
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,233,179,183,1
 END
 
-D_SM_SERVER DIALOGEX 0, 0, 439, 367
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SERVER DIALOGEX 0, 0, 439, 314
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SERVER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_VPNSERVER,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,322,25
-    CONTROL         "",L_HUB,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,33,410,112
-    DEFPUSHBUTTON   "@IDOK",IDOK,14,151,84,18
-    PUSHBUTTON      "@B_ONLINE",B_ONLINE,101,151,48,18
-    PUSHBUTTON      "@B_OFFLINE",B_OFFLINE,153,151,47,18
-    PUSHBUTTON      "@B_HUB_STATUS",B_HUB_STATUS,203,151,54,18
-    PUSHBUTTON      "@B_CREATE",B_CREATE,261,151,70,18
-    PUSHBUTTON      "@B_EDIT",B_EDIT,334,151,48,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,385,151,39,18
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,174,176,123
-    LTEXT           "@STATIC2",IDC_STATIC,14,187,108,10
-    CONTROL         "",L_LISTENER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,202,109,88
-    PUSHBUTTON      "@B_CREATE_LISTENER",B_CREATE_LISTENER,128,199,48,18
-    PUSHBUTTON      "@B_DELETE_LISTENER",B_DELETE_LISTENER,128,223,48,18
-    PUSHBUTTON      "@B_START",B_START,128,247,48,18
-    PUSHBUTTON      "@B_STOP",B_STOP,128,271,48,18
-    GROUPBOX        "@STATIC3",IDC_STATIC,187,174,245,123
-    ICON            ICO_KEY,IDC_STATIC,194,189,20,20
-    PUSHBUTTON      "@B_SSL",B_SSL,218,191,100,18
-    ICON            ICO_TOWER,IDC_STATIC,194,214,20,20
-    PUSHBUTTON      "@B_STATUS",B_STATUS,218,217,100,18
-    ICON            ICO_VPNSERVER,IDC_STATIC,194,240,20,20
-    PUSHBUTTON      "@B_INFO",B_INFO,218,241,100,24,BS_MULTILINE
-    ICON            ICO_CERT,S_LICENSE,194,270,20,20
-    PUSHBUTTON      "@B_LICENSE",B_LICENSE,218,272,100,18
-    ICON            ICO_FARM,IDC_STATIC,323,190,20,20
-    PUSHBUTTON      "@B_FARM",B_FARM,344,190,81,18,BS_MULTILINE
-    ICON            ICO_INTERNET,IDC_STATIC,323,217,20,20
-    PUSHBUTTON      "@B_FARM_STATUS",B_FARM_STATUS,344,217,81,18,BS_MULTILINE
-    ICON            ICO_PROTOCOL,IDC_STATIC,323,240,20,20
-    PUSHBUTTON      "@B_CONNECTION",B_CONNECTION,344,241,81,24,BS_MULTILINE
-    ICON            ICO_MACHINE,IDC_STATIC,323,270,20,20
-    PUSHBUTTON      "@B_CONFIG",B_CONFIG,344,272,81,18
-    ICON            ICO_BRIDGE,IDC_STATIC,7,301,20,20
-    PUSHBUTTON      "@B_BRIDGE",B_BRIDGE,28,304,71,18
-    ICON            ICO_SWITCH,IDC_STATIC,108,301,20,20
-    PUSHBUTTON      "@B_L3",B_L3,129,304,74,18
-    ICON            ICO_IPSEC,IDC_STATIC,206,301,20,20
-    PUSHBUTTON      "@B_IPSEC",B_IPSEC,227,304,77,18
-    ICON            ICO_OPENVPN,IDC_STATIC,310,302,20,20
-    PUSHBUTTON      "@B_OPENVPN",B_OPENVPN,334,304,97,18
-    ICON            ICO_DISPLAY,IDC_STATIC,7,327,20,20
-    PUSHBUTTON      "@B_DDNS",B_DDNS,28,329,71,18
-    RTEXT           "@S_DDNS",S_DDNS,0,354,75,10
-    EDITTEXT        E_DDNS_HOST,78,352,114,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    CTEXT           "@S_BETA",S_BETA,193,274,126,17
-    PUSHBUTTON      "@B_AZURE",B_AZURE,129,329,74,18
-    RTEXT           "@S_AZURE",S_AZURE,196,354,65,10
-    EDITTEXT        E_AZURE_HOST,266,352,126,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    ICON            ICO_RESEARCH,S_ICO_VPNGATE,206,327,20,20
-    PUSHBUTTON      "@B_VPNGATE",B_VPNGATE,227,329,77,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,307,329,71,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,381,329,50,18
-    ICON            ICO_AZURE,IDC_STATIC,108,328,20,20
+    ICON            ICO_VPNSERVER,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,322,22
+    CONTROL         "",L_HUB,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,28,410,96
+    DEFPUSHBUTTON   "@IDOK",IDOK,14,129,84,16
+    PUSHBUTTON      "@B_ONLINE",B_ONLINE,101,129,48,16
+    PUSHBUTTON      "@B_OFFLINE",B_OFFLINE,153,129,47,16
+    PUSHBUTTON      "@B_HUB_STATUS",B_HUB_STATUS,203,129,54,16
+    PUSHBUTTON      "@B_CREATE",B_CREATE,261,129,70,16
+    PUSHBUTTON      "@B_EDIT",B_EDIT,334,129,48,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,385,129,39,16
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,149,176,106
+    LTEXT           "@STATIC2",IDC_STATIC,14,160,108,9
+    CONTROL         "",L_LISTENER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,173,109,76
+    PUSHBUTTON      "@B_CREATE_LISTENER",B_CREATE_LISTENER,128,170,48,16
+    PUSHBUTTON      "@B_DELETE_LISTENER",B_DELETE_LISTENER,128,191,48,16
+    PUSHBUTTON      "@B_START",B_START,128,211,48,16
+    PUSHBUTTON      "@B_STOP",B_STOP,128,232,48,16
+    GROUPBOX        "@STATIC3",IDC_STATIC,187,149,245,106
+    ICON            ICO_KEY,IDC_STATIC,194,161,20,18
+    PUSHBUTTON      "@B_SSL",B_SSL,218,163,100,16
+    ICON            ICO_TOWER,IDC_STATIC,194,183,20,18
+    PUSHBUTTON      "@B_STATUS",B_STATUS,218,185,100,16
+    ICON            ICO_VPNSERVER,IDC_STATIC,194,205,20,18
+    PUSHBUTTON      "@B_INFO",B_INFO,218,206,100,21,BS_MULTILINE
+    ICON            ICO_CERT,S_LICENSE,194,231,20,18
+    PUSHBUTTON      "@B_LICENSE",B_LICENSE,218,233,100,16
+    ICON            ICO_FARM,IDC_STATIC,323,162,20,18
+    PUSHBUTTON      "@B_FARM",B_FARM,344,162,81,16,BS_MULTILINE
+    ICON            ICO_INTERNET,IDC_STATIC,323,185,20,18
+    PUSHBUTTON      "@B_FARM_STATUS",B_FARM_STATUS,344,185,81,16,BS_MULTILINE
+    ICON            ICO_PROTOCOL,IDC_STATIC,323,205,20,18
+    PUSHBUTTON      "@B_CONNECTION",B_CONNECTION,344,206,81,21,BS_MULTILINE
+    ICON            ICO_MACHINE,IDC_STATIC,323,231,20,18
+    PUSHBUTTON      "@B_CONFIG",B_CONFIG,344,233,81,16
+    ICON            ICO_BRIDGE,IDC_STATIC,7,257,20,18
+    PUSHBUTTON      "@B_BRIDGE",B_BRIDGE,28,260,71,16
+    ICON            ICO_SWITCH,IDC_STATIC,108,257,20,18
+    PUSHBUTTON      "@B_L3",B_L3,129,260,74,16
+    ICON            ICO_IPSEC,IDC_STATIC,206,257,20,18
+    PUSHBUTTON      "@B_IPSEC",B_IPSEC,227,260,77,16
+    ICON            ICO_OPENVPN,IDC_STATIC,310,258,20,18
+    PUSHBUTTON      "@B_OPENVPN",B_OPENVPN,334,260,97,16
+    ICON            ICO_DISPLAY,IDC_STATIC,7,280,20,18
+    PUSHBUTTON      "@B_DDNS",B_DDNS,28,281,71,16
+    RTEXT           "@S_DDNS",S_DDNS,0,303,75,9
+    EDITTEXT        E_DDNS_HOST,78,301,114,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    CTEXT           "@S_BETA",S_BETA,193,234,126,15
+    PUSHBUTTON      "@B_AZURE",B_AZURE,129,281,74,16
+    RTEXT           "@S_AZURE",S_AZURE,196,303,65,9
+    EDITTEXT        E_AZURE_HOST,266,301,126,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    ICON            ICO_RESEARCH,S_ICO_VPNGATE,206,280,20,18
+    PUSHBUTTON      "@B_VPNGATE",B_VPNGATE,227,281,77,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,307,281,71,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,381,281,50,16
+    ICON            ICO_AZURE,IDC_STATIC,108,281,20,18
 END
 
-D_SM_STATUS DIALOGEX 0, 0, 335, 292
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_STATUS DIALOGEX 0, 0, 335, 250
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_STATUS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INFORMATION,S_ICON,7,7,18,21
-    LTEXT           "S_TITLE",S_TITLE,30,7,298,29
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,39,321,219
-    DEFPUSHBUTTON   "@IDOK",IDOK,177,267,80,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,265,267,63,18
+    ICON            ICO_INFORMATION,S_ICON,7,5,18,18
+    LTEXT           "S_TITLE",S_TITLE,30,5,298,25
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,33,321,188
+    DEFPUSHBUTTON   "@IDOK",IDOK,177,228,80,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,265,228,63,16
 END
 
-D_SM_EDIT_HUB DIALOGEX 0, 0, 431, 333
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_HUB DIALOGEX 0, 0, 431, 285
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_HUB"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_HUB,IDC_STATIC,7,7,18,21
-    RTEXT           "@STATIC1",IDC_STATIC,31,18,54,14
-    EDITTEXT        E_HUBNAME,90,16,115,12,ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,34,205,87
-    ICON            ICO_KEY,IDC_STATIC,16,46,18,21
-    LTEXT           "@S_BOLD",S_BOLD,42,48,151,10
-    RTEXT           "@STATIC3",IDC_STATIC,38,63,46,11
-    EDITTEXT        E_PASSWORD1,90,61,114,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,29,80,56,12
-    EDITTEXT        E_PASSWORD2,90,78,114,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "@R_NO_ENUM",R_NO_ENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,96,161,23
-    GROUPBOX        "@STATIC7",IDC_STATIC,7,126,205,48
-    ICON            ICO_HUB_OFFLINE,IDC_STATIC,15,140,18,21
-    LTEXT           "@STATIC8",IDC_STATIC,42,140,140,13
-    CONTROL         "@R_ONLINE",R_ONLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,46,154,56,10
-    CONTROL         "@R_OFFLINE",R_OFFLINE,"Button",BS_AUTORADIOBUTTON,118,154,62,10
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,181,205,144
-    ICON            ICO_MACHINE,IDC_STATIC,16,191,18,21
-    CONTROL         "@R_LIMIT_MAX_SESSION",R_LIMIT_MAX_SESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,191,159,13
-    RTEXT           "@S_MAX_SESSION_1",S_MAX_SESSION_1,42,207,86,11
-    EDITTEXT        E_MAX_SESSION,135,205,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_MAX_SESSION_2",S_MAX_SESSION_2,174,207,29,11
-    LTEXT           "@STATIC6",IDC_STATIC,42,219,160,26
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,15,257,190,1
-    ICON            ICO_LINK2,S_AO_4,16,265,18,21
-    LTEXT           "@STATIC10",S_STATIC,42,267,160,26
-    PUSHBUTTON      "@B_EXTOPTION",B_EXTOPTION,76,295,128,19
-    GROUPBOX        "@STATIC9",IDC_STATIC,219,34,205,67
-    ICON            ICO_FARM,IDC_STATIC,227,48,18,21
-    LTEXT           "@S_FARM_INFO",S_FARM_INFO,253,49,163,26
-    CONTROL         "@R_STATIC",R_STATIC,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,254,78,81,10
-    CONTROL         "@R_DYNAMIC",R_DYNAMIC,"Button",BS_AUTORADIOBUTTON,337,78,83,10
-    GROUPBOX        "@S_AO_1",S_AO_1,219,105,205,61
-    ICON            ICO_USER_ADMIN,S_AO_2,227,117,18,21
-    LTEXT           "@S_AO_3",S_AO_3,252,117,164,19
-    PUSHBUTTON      "@B_ADMINOPTION",B_ADMINOPTION,313,139,102,19
-    GROUPBOX        "@S_ACL_3",S_ACL_3,219,170,205,63
-    ICON            ICO_INTERNET,S_ACL_2,227,184,18,21
-    LTEXT           "@S_ACL",S_ACL,252,184,164,18
-    PUSHBUTTON      "@B_ACL",B_ACL,313,205,102,19
-    GROUPBOX        "@S_MSG_1",S_MSG_1,219,237,205,63
-    ICON            ICO_LOG2,S_MSG_4,227,251,18,21
-    LTEXT           "@S_MSG_2",S_MSG_2,252,251,164,18
-    PUSHBUTTON      "@B_MSG",B_MSG,313,273,102,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,291,306,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,360,306,64,19
+    ICON            ICO_HUB,IDC_STATIC,7,5,18,18
+    RTEXT           "@STATIC1",IDC_STATIC,31,15,54,12
+    EDITTEXT        E_HUBNAME,90,13,115,11,ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,29,205,75
+    ICON            ICO_KEY,IDC_STATIC,16,39,18,18
+    LTEXT           "@S_BOLD",S_BOLD,42,41,151,9
+    RTEXT           "@STATIC3",IDC_STATIC,38,53,46,10
+    EDITTEXT        E_PASSWORD1,90,52,114,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,29,68,56,11
+    EDITTEXT        E_PASSWORD2,90,66,114,11,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "@R_NO_ENUM",R_NO_ENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,82,161,20
+    GROUPBOX        "@STATIC7",IDC_STATIC,7,107,205,42
+    ICON            ICO_HUB_OFFLINE,IDC_STATIC,15,119,18,18
+    LTEXT           "@STATIC8",IDC_STATIC,42,119,140,12
+    CONTROL         "@R_ONLINE",R_ONLINE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,46,131,56,9
+    CONTROL         "@R_OFFLINE",R_OFFLINE,"Button",BS_AUTORADIOBUTTON,118,131,62,9
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,155,205,124
+    ICON            ICO_MACHINE,IDC_STATIC,16,163,18,18
+    CONTROL         "@R_LIMIT_MAX_SESSION",R_LIMIT_MAX_SESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,163,159,12
+    RTEXT           "@S_MAX_SESSION_1",S_MAX_SESSION_1,42,177,86,10
+    EDITTEXT        E_MAX_SESSION,135,175,32,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_MAX_SESSION_2",S_MAX_SESSION_2,174,177,29,10
+    LTEXT           "@STATIC6",IDC_STATIC,42,187,160,23
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,15,220,190,1
+    ICON            ICO_LINK2,S_AO_4,16,227,18,18
+    LTEXT           "@STATIC10",S_STATIC,42,228,160,23
+    PUSHBUTTON      "@B_EXTOPTION",B_EXTOPTION,76,252,128,17
+    GROUPBOX        "@STATIC9",IDC_STATIC,219,29,205,58
+    ICON            ICO_FARM,IDC_STATIC,227,41,18,18
+    LTEXT           "@S_FARM_INFO",S_FARM_INFO,253,41,163,23
+    CONTROL         "@R_STATIC",R_STATIC,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,254,66,81,9
+    CONTROL         "@R_DYNAMIC",R_DYNAMIC,"Button",BS_AUTORADIOBUTTON,337,66,83,9
+    GROUPBOX        "@S_AO_1",S_AO_1,219,89,205,53
+    ICON            ICO_USER_ADMIN,S_AO_2,227,100,18,18
+    LTEXT           "@S_AO_3",S_AO_3,252,100,164,17
+    PUSHBUTTON      "@B_ADMINOPTION",B_ADMINOPTION,313,119,102,17
+    GROUPBOX        "@S_ACL_3",S_ACL_3,219,145,205,54
+    ICON            ICO_INTERNET,S_ACL_2,227,157,18,18
+    LTEXT           "@S_ACL",S_ACL,252,157,164,16
+    PUSHBUTTON      "@B_ACL",B_ACL,313,175,102,17
+    GROUPBOX        "@S_MSG_1",S_MSG_1,219,203,205,54
+    ICON            ICO_LOG2,S_MSG_4,227,215,18,18
+    LTEXT           "@S_MSG_2",S_MSG_2,252,215,164,16
+    PUSHBUTTON      "@B_MSG",B_MSG,313,233,102,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,291,262,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,360,262,64,17
 END
 
-D_SM_CREATE_LISTENER DIALOGEX 0, 0, 270, 161
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CREATE_LISTENER DIALOGEX 0, 0, 270, 137
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CREATE_LISTENER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PROTOCOL,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,14,230,36
-    LTEXT           "@STATIC2",IDC_STATIC,33,85,230,48
-    ICON            ICO_INFORMATION,IDC_STATIC,7,86,20,20
-    RTEXT           "@STATIC3",IDC_STATIC,39,60,55,10
-    EDITTEXT        E_PORT,98,58,35,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    DEFPUSHBUTTON   "@IDOK",IDOK,126,135,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,199,135,64,19
-    LTEXT           "@STATIC4",IDC_STATIC,137,60,107,9
+    ICON            ICO_PROTOCOL,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,11,230,31
+    LTEXT           "@STATIC2",IDC_STATIC,33,72,230,42
+    ICON            ICO_INFORMATION,IDC_STATIC,7,73,20,18
+    RTEXT           "@STATIC3",IDC_STATIC,39,51,55,9
+    EDITTEXT        E_PORT,98,49,35,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    DEFPUSHBUTTON   "@IDOK",IDOK,126,115,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,199,115,64,17
+    LTEXT           "@STATIC4",IDC_STATIC,137,51,107,8
 END
 
-D_SM_SSL DIALOGEX 0, 0, 463, 365
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SSL DIALOGEX 0, 0, 463, 312
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SSL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@STATIC1",IDC_STATIC,7,7,449,20
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,28,218,77
-    ICON            ICO_KEY,IDC_STATIC,14,41,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,39,43,179,38
-    RTEXT           "@STATIC4",IDC_STATIC,15,87,84,13
-    COMBOBOX        C_CIPHER,106,84,110,93,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "@STATIC6",IDC_STATIC,7,109,218,124
-    ICON            ICO_SERVER_CERT,IDC_STATIC,14,124,20,20
-    LTEXT           "@STATIC7",IDC_STATIC,39,126,178,17
-    GROUPBOX        "@STATIC10",IDC_STATIC,38,147,179,53
-    LTEXT           "CERT_INFO",S_CERT_INFO,50,159,162,33
-    PUSHBUTTON      "@B_REGENERATE",B_REGENERATE,12,205,47,18
-    PUSHBUTTON      "@B_IMPORT",B_IMPORT,61,205,47,18
-    PUSHBUTTON      "@B_EXPORT",B_EXPORT,110,205,47,18
-    PUSHBUTTON      "@B_VIEW",B_VIEW,159,205,56,18
-    GROUPBOX        "@STATIC12",IDC_STATIC,7,237,218,101
-    ICON            ICO_LOG2,IDC_STATIC,14,249,20,20
-    LTEXT           "@STATIC13",IDC_STATIC,35,249,184,28
-    COMBOBOX        C_SYSLOG,16,281,199,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@STATIC14",S_01,15,304,84,11
-    EDITTEXT        E_SYSLOG_HOSTNAME,102,302,113,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC15",S_02,15,322,84,13
-    EDITTEXT        E_SYSLOG_PORT,102,320,32,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        "@STATIC8",IDC_STATIC,230,28,223,169
-    ICON            ICO_INTERNET,IDC_STATIC,233,42,20,20
-    LTEXT           "@STATIC9",IDC_STATIC,256,38,179,49
-    CONTROL         "@R_USE_KEEP_CONNECT",R_USE_KEEP_CONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,255,87,172,12
-    RTEXT           "@S_HOSTNAME",S_HOSTNAME,244,107,50,11
-    EDITTEXT        E_HOSTNAME,297,105,139,12,ES_AUTOHSCROLL
-    RTEXT           "@S_PORT",S_PORT,246,127,48,11
-    EDITTEXT        E_PORT,297,125,27,12,ES_AUTOHSCROLL | ES_NUMBER
-    RTEXT           "@S_INTERVAL",S_INTERVAL,326,127,59,11
-    EDITTEXT        E_INTERVAL,387,125,36,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_INTERVAL2",S_INTERVAL2,426,127,21,11
-    RTEXT           "@S_PROTOCOL",S_PROTOCOL,238,147,48,11
-    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON,292,147,72,10
-    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,369,147,76,10
-    ICON            ICO_INFORMATION,S_INFO2,233,161,20,20
-    LTEXT           "@S_INFO",S_INFO,256,165,194,26
-    GROUPBOX        "@STATIC11",IDC_STATIC,230,202,226,61
-    LTEXT           "@S_INFO4",S_INFO4,237,213,210,19
-    ICON            ICO_USER_ADMIN,IDC_STATIC,322,235,20,20
-    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,347,237,98,18
-    GROUPBOX        "@S_OVER_FUNCS",IDC_STATIC,230,268,226,64
-    LTEXT           "@S_INFO5",S_INFO5,236,282,210,26
-    ICON            ICO_SPECIALLISTENER,IDC_STATIC,322,306,20,20
-    PUSHBUTTON      "@B_SPECIALLISTENER",B_SPECIALLISTENER,346,308,98,18
-    PUSHBUTTON      "@B_UPDATE_CONFIG",B_UPDATE_CONFIG,230,339,85,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,321,339,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,392,339,64,19
+    LTEXT           "@STATIC1",IDC_STATIC,7,5,449,18
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,23,218,66
+    ICON            ICO_KEY,IDC_STATIC,14,35,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,39,36,179,33
+    RTEXT           "@STATIC4",IDC_STATIC,15,74,84,12
+    COMBOBOX        C_CIPHER,106,71,110,80,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "@STATIC6",IDC_STATIC,7,93,218,107
+    ICON            ICO_SERVER_CERT,IDC_STATIC,14,106,20,18
+    LTEXT           "@STATIC7",IDC_STATIC,39,107,178,15
+    GROUPBOX        "@STATIC10",IDC_STATIC,38,125,179,46
+    LTEXT           "CERT_INFO",S_CERT_INFO,50,136,162,29
+    PUSHBUTTON      "@B_REGENERATE",B_REGENERATE,12,175,47,16
+    PUSHBUTTON      "@B_IMPORT",B_IMPORT,61,175,47,16
+    PUSHBUTTON      "@B_EXPORT",B_EXPORT,110,175,47,16
+    PUSHBUTTON      "@B_VIEW",B_VIEW,159,175,56,16
+    GROUPBOX        "@STATIC12",IDC_STATIC,7,203,218,87
+    ICON            ICO_LOG2,IDC_STATIC,14,213,20,18
+    LTEXT           "@STATIC13",IDC_STATIC,35,213,184,24
+    COMBOBOX        C_SYSLOG,16,240,199,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@STATIC14",S_01,15,260,84,10
+    EDITTEXT        E_SYSLOG_HOSTNAME,102,258,113,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC15",S_02,15,275,84,12
+    EDITTEXT        E_SYSLOG_PORT,102,274,32,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "@STATIC8",IDC_STATIC,230,23,223,145
+    ICON            ICO_INTERNET,IDC_STATIC,233,35,20,18
+    LTEXT           "@STATIC9",IDC_STATIC,256,32,179,42
+    CONTROL         "@R_USE_KEEP_CONNECT",R_USE_KEEP_CONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,255,74,172,11
+    RTEXT           "@S_HOSTNAME",S_HOSTNAME,244,91,50,10
+    EDITTEXT        E_HOSTNAME,297,89,139,11,ES_AUTOHSCROLL
+    RTEXT           "@S_PORT",S_PORT,246,108,48,10
+    EDITTEXT        E_PORT,297,107,27,11,ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT           "@S_INTERVAL",S_INTERVAL,326,108,59,10
+    EDITTEXT        E_INTERVAL,387,107,36,11,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_INTERVAL2",S_INTERVAL2,426,108,21,10
+    RTEXT           "@S_PROTOCOL",S_PROTOCOL,238,125,48,10
+    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON,292,125,72,9
+    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,369,125,76,9
+    ICON            ICO_INFORMATION,S_INFO2,233,137,20,18
+    LTEXT           "@S_INFO",S_INFO,256,141,194,23
+    GROUPBOX        "@STATIC11",IDC_STATIC,230,173,226,53
+    LTEXT           "@S_INFO4",S_INFO4,237,182,210,17
+    ICON            ICO_USER_ADMIN,IDC_STATIC,322,201,20,18
+    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,347,203,98,16
+    GROUPBOX        "@S_OVER_FUNCS",IDC_STATIC,230,229,226,55
+    LTEXT           "@S_INFO5",S_INFO5,236,241,210,23
+    ICON            ICO_SPECIALLISTENER,IDC_STATIC,322,262,20,18
+    PUSHBUTTON      "@B_SPECIALLISTENER",B_SPECIALLISTENER,346,263,98,16
+    PUSHBUTTON      "@B_UPDATE_CONFIG",B_UPDATE_CONFIG,230,290,85,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,321,290,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,392,290,64,17
 END
 
-D_SM_SAVE_KEY_PAIR DIALOGEX 0, 0, 295, 348
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SAVE_KEY_PAIR DIALOGEX 0, 0, 295, 298
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SAVE_KEY_PAIR"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@STATIC1",IDC_STATIC,7,7,281,17
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,27,281,195
-    CONTROL         "@R_X509_AND_KEY",R_X509_AND_KEY,"Button",BS_AUTORADIOBUTTON,14,39,249,10
-    CONTROL         "@R_PKCS12",R_PKCS12,"Button",BS_AUTORADIOBUTTON,14,81,249,10
-    CONTROL         "@R_SECURE",R_SECURE,"Button",BS_AUTORADIOBUTTON,14,127,249,10
-    ICON            ICO_CERT,IDC_STATIC,26,50,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,51,51,218,28
-    ICON            ICO_PKCS12,IDC_STATIC,26,98,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,51,98,224,28
-    ICON            ICO_SECURE,IDC_STATIC,26,141,20,20
-    LTEXT           "@STATIC5",IDC_STATIC,51,144,224,19
-    PUSHBUTTON      "@B_SELECT",B_SELECT,50,168,110,20
-    GROUPBOX        "@S_PASS3",S_PASS3,7,227,281,90
-    ICON            ICO_KEY,IDC_STATIC,14,241,20,20
-    LTEXT           "@S_PASS4",S_PASS4,39,242,242,20
-    CONTROL         "@R_USE_PASS",R_USE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,265,144,10
-    RTEXT           "@S_PASS1",S_PASS1,31,280,56,12
-    EDITTEXT        E_PASS1,94,279,158,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@S_PASS2",S_PASS2,31,299,56,12
-    EDITTEXT        E_PASS2,94,297,158,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,150,322,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,224,322,64,19
-    LTEXT           "",S_INFO,52,190,227,26
-    PUSHBUTTON      "@B_SECURE_MANAGER",B_SECURE_MANAGER,169,168,110,20,NOT WS_VISIBLE
+    LTEXT           "@STATIC1",IDC_STATIC,7,5,281,15
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,23,281,168
+    CONTROL         "@R_X509_AND_KEY",R_X509_AND_KEY,"Button",BS_AUTORADIOBUTTON,14,33,249,9
+    CONTROL         "@R_PKCS12",R_PKCS12,"Button",BS_AUTORADIOBUTTON,14,69,249,9
+    CONTROL         "@R_SECURE",R_SECURE,"Button",BS_AUTORADIOBUTTON,14,108,249,9
+    ICON            ICO_CERT,IDC_STATIC,26,42,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,51,43,218,24
+    ICON            ICO_PKCS12,IDC_STATIC,26,83,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,51,83,224,24
+    ICON            ICO_SECURE,IDC_STATIC,26,120,20,18
+    LTEXT           "@STATIC5",IDC_STATIC,51,123,224,17
+    PUSHBUTTON      "@B_SELECT",B_SELECT,50,143,110,18
+    GROUPBOX        "@S_PASS3",S_PASS3,7,194,281,78
+    ICON            ICO_KEY,IDC_STATIC,14,206,20,18
+    LTEXT           "@S_PASS4",S_PASS4,39,207,242,18
+    CONTROL         "@R_USE_PASS",R_USE_PASS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,227,144,9
+    RTEXT           "@S_PASS1",S_PASS1,31,239,56,11
+    EDITTEXT        E_PASS1,94,239,158,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@S_PASS2",S_PASS2,31,256,56,11
+    EDITTEXT        E_PASS2,94,254,158,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,150,275,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,224,275,64,17
+    LTEXT           "",S_INFO,52,162,227,23
+    PUSHBUTTON      "@B_SECURE_MANAGER",B_SECURE_MANAGER,169,143,110,18,NOT WS_VISIBLE
 END
 
-D_SM_CONNECTION DIALOGEX 0, 0, 318, 272
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CONNECTION DIALOGEX 0, 0, 318, 233
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CONNECTION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PROTOCOL,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,32,7,279,21
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,304,201
-    DEFPUSHBUTTON   "@IDOK",IDOK,7,247,99,18
-    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,113,247,49,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,169,247,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,258,247,51,18
+    ICON            ICO_PROTOCOL,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,32,5,279,18
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,304,173
+    DEFPUSHBUTTON   "@IDOK",IDOK,7,211,99,16
+    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,113,211,49,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,169,211,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,258,211,51,16
 END
 
-D_SM_FARM DIALOGEX 0, 0, 259, 388
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_FARM DIALOGEX 0, 0, 259, 332
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_FARM"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_FARM,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,33,7,219,18
-    LTEXT           "@STATIC1",IDC_STATIC,7,36,245,22
-    RTEXT           "@STATIC2",IDC_STATIC,7,60,69,10
-    LTEXT           "--",S_CURRENT,82,58,154,16
-    GROUPBOX        "@STATIC3",IDC_STATIC,7,76,245,242
-    CONTROL         "@R_STANDALONE",R_STANDALONE,"Button",BS_AUTORADIOBUTTON,14,86,180,10
-    CONTROL         "@R_CONTROLLER",R_CONTROLLER,"Button",BS_AUTORADIOBUTTON,14,101,119,10
-    CONTROL         "@R_MEMBER",R_MEMBER,"Button",BS_AUTORADIOBUTTON,14,117,117,10
-    GROUPBOX        "@STATIC4",IDC_STATIC,25,153,220,157
-    ICON            ICO_PROTOCOL,IDC_STATIC,32,168,18,21
-    RTEXT           "@S_IP_1",S_IP_1,59,169,59,10
-    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,122,166,75,13
-    LTEXT           "@S_IP_2",S_IP_2,74,183,164,29
-    RTEXT           "@S_PORT_1",S_PORT_1,59,218,59,11
-    EDITTEXT        E_PORT,122,216,117,12,ES_AUTOHSCROLL
-    RTEXT           "@S_PORT_2",S_PORT_2,62,232,179,11
-    RTEXT           "@S_CONTROLLER",S_CONTROLLER,55,245,63,20
-    EDITTEXT        E_CONTROLLER,122,248,85,12,ES_AUTOHSCROLL
-    RTEXT           "@S_CONTROLLER_PORT",S_CONTROLLER_PORT,59,266,59,18
-    EDITTEXT        E_CONTROLLER_PORT,122,268,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_PORT_3",S_PORT_3,165,271,59,10
-    RTEXT           "@S_PASSWORD",S_PASSWORD,27,293,92,12
-    EDITTEXT        E_PASSWORD,122,290,117,12,ES_PASSWORD | ES_AUTOHSCROLL
-    ICON            ICO_WARNING,IDC_STATIC,7,322,18,21
-    LTEXT           "@STATIC5",IDC_STATIC,32,322,220,37
-    DEFPUSHBUTTON   "@IDOK",IDOK,115,362,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,362,64,19
-    RTEXT           "@S_1",S_1,14,138,104,10
-    EDITTEXT        E_WEIGHT,122,136,34,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_2",S_2,161,138,71,12
-    CONTROL         "@R_CONTROLLER_ONLY",R_CONTROLLER_ONLY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,146,100,98,35
+    ICON            ICO_FARM,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,33,5,219,16
+    LTEXT           "@STATIC1",IDC_STATIC,7,30,245,19
+    RTEXT           "@STATIC2",IDC_STATIC,7,51,69,9
+    LTEXT           "--",S_CURRENT,82,49,154,14
+    GROUPBOX        "@STATIC3",IDC_STATIC,7,65,245,208
+    CONTROL         "@R_STANDALONE",R_STANDALONE,"Button",BS_AUTORADIOBUTTON,14,73,180,9
+    CONTROL         "@R_CONTROLLER",R_CONTROLLER,"Button",BS_AUTORADIOBUTTON,14,86,119,9
+    CONTROL         "@R_MEMBER",R_MEMBER,"Button",BS_AUTORADIOBUTTON,14,100,117,9
+    GROUPBOX        "@STATIC4",IDC_STATIC,25,131,220,135
+    ICON            ICO_PROTOCOL,IDC_STATIC,32,143,18,18
+    RTEXT           "@S_IP_1",S_IP_1,59,144,59,9
+    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,122,142,75,12
+    LTEXT           "@S_IP_2",S_IP_2,74,156,164,25
+    RTEXT           "@S_PORT_1",S_PORT_1,59,186,59,10
+    EDITTEXT        E_PORT,122,185,117,11,ES_AUTOHSCROLL
+    RTEXT           "@S_PORT_2",S_PORT_2,62,198,179,10
+    RTEXT           "@S_CONTROLLER",S_CONTROLLER,55,209,63,18
+    EDITTEXT        E_CONTROLLER,122,212,85,11,ES_AUTOHSCROLL
+    RTEXT           "@S_CONTROLLER_PORT",S_CONTROLLER_PORT,59,227,59,16
+    EDITTEXT        E_CONTROLLER_PORT,122,229,39,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_PORT_3",S_PORT_3,165,232,59,9
+    RTEXT           "@S_PASSWORD",S_PASSWORD,27,251,92,11
+    EDITTEXT        E_PASSWORD,122,248,117,11,ES_PASSWORD | ES_AUTOHSCROLL
+    ICON            ICO_WARNING,IDC_STATIC,7,275,18,18
+    LTEXT           "@STATIC5",IDC_STATIC,32,275,220,32
+    DEFPUSHBUTTON   "@IDOK",IDOK,115,310,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,310,64,17
+    RTEXT           "@S_1",S_1,14,118,104,9
+    EDITTEXT        E_WEIGHT,122,116,34,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_2",S_2,161,118,71,11
+    CONTROL         "@R_CONTROLLER_ONLY",R_CONTROLLER_ONLY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,146,85,98,30
 END
 
-D_SM_FARM_MEMBER DIALOGEX 0, 0, 415, 265
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_FARM_MEMBER DIALOGEX 0, 0, 415, 227
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_FARM_MEMBER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_FARM,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,32,7,376,22
-    CONTROL         "",L_FARM_MEMBER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,34,401,198
-    DEFPUSHBUTTON   "@IDOK",IDOK,7,240,122,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,268,240,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,357,240,51,18
-    PUSHBUTTON      "@B_CERT",B_CERT,132,240,93,18
+    ICON            ICO_FARM,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,32,5,376,19
+    CONTROL         "",L_FARM_MEMBER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,29,401,170
+    DEFPUSHBUTTON   "@IDOK",IDOK,7,205,122,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,268,205,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,357,205,51,16
+    PUSHBUTTON      "@B_CERT",B_CERT,132,205,93,16
 END
 
-D_SM_CHANGE_PASSWORD DIALOGEX 0, 0, 250, 112
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CHANGE_PASSWORD DIALOGEX 0, 0, 250, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CHANGE_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_USER_ADMIN,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,212,20
-    RTEXT           "@STATIC1",IDC_STATIC,7,41,65,11
-    EDITTEXT        E_PASSWORD1,78,39,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC2",IDC_STATIC,7,60,65,11
-    EDITTEXT        E_PASSWORD2,78,58,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,106,86,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,86,64,19
+    ICON            ICO_USER_ADMIN,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,212,18
+    RTEXT           "@STATIC1",IDC_STATIC,7,35,65,10
+    EDITTEXT        E_PASSWORD1,78,33,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC2",IDC_STATIC,7,51,65,10
+    EDITTEXT        E_PASSWORD2,78,49,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,106,73,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,73,64,17
 END
 
-D_SM_HUB DIALOGEX 0, 0, 403, 359
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_HUB DIALOGEX 0, 0, 403, 307
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_HUB"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_TITLE",S_TITLE,7,7,176,19,SS_WORDELLIPSIS
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,29,173,145
-    ICON            ICO_USER,IDC_STATIC,14,38,20,20
-    PUSHBUTTON      "@B_USER",B_USER,38,40,104,17
-    LTEXT           "@S_USER",S_USER,38,61,132,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,75,156,1
-    ICON            ICO_GROUP,IDC_STATIC,14,82,20,20
-    PUSHBUTTON      "@B_GROUP",B_GROUP,38,84,104,17
-    LTEXT           "@S_GROUP",S_GROUP,38,106,132,12
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,120,156,1
-    ICON            ICO_PASS,IDC_STATIC,14,127,20,20
-    PUSHBUTTON      "@B_ACCESS",B_ACCESS,38,129,104,17
-    LTEXT           "@S_ACCESS",S_ACCESS,38,151,132,20
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,181,173,170
-    ICON            ICO_HUB,IDC_STATIC,14,193,20,20
-    PUSHBUTTON      "@B_PROPERTY",B_PROPERTY,38,193,104,17
-    LTEXT           "@S_PROPERTY",S_PROPERTY,40,213,137,17
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,231,156,1
-    ICON            ICO_TOWER,IDC_STATIC,14,237,20,20
-    PUSHBUTTON      "@B_RADIUS",B_RADIUS,38,239,104,17
-    LTEXT           "@S_RADIUS",S_RADIUS,38,260,132,27
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,288,156,1
-    ICON            ICO_CASCADE,IDC_STATIC,14,297,20,20
-    PUSHBUTTON      "@B_LINK",B_LINK,38,299,104,17
-    LTEXT           "@S_LINK",S_LINK,38,320,132,26
-    GROUPBOX        "@STATIC3",IDC_STATIC,188,7,208,167
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,194,21,191,125
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,303,150,82,18
-    GROUPBOX        "@STATIC4",IDC_STATIC,187,178,209,130
-    ICON            ICO_LOG2,IDC_STATIC,192,188,20,20
-    PUSHBUTTON      "@B_LOG",B_LOG,216,188,100,17
-    PUSHBUTTON      "@B_LOG_FILE",B_LOG_FILE,321,188,63,17
-    LTEXT           "@S_LOG",S_LOG,216,209,173,11
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,192,221,193,1
-    ICON            ICO_SERVER_CERT,IDC_STATIC,192,224,20,20
-    PUSHBUTTON      "@B_CA",B_CA,216,226,100,17
-    PUSHBUTTON      "@B_CRL",B_CRL,321,226,63,17
-    LTEXT           "@S_CA",S_CA,216,244,170,17
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,193,261,193,1
-    ICON            ICO_ROUTER,IDC_STATIC,192,263,20,20
-    PUSHBUTTON      "@B_SNAT",B_SNAT,215,266,169,17
-    LTEXT           "@S_SNAT",S_SNAT,215,286,170,18
-    GROUPBOX        "@STATIC5",IDC_STATIC,187,311,140,40
-    ICON            ICO_VPN,IDC_STATIC,194,323,20,20
-    PUSHBUTTON      "@B_SESSION",B_SESSION,221,327,100,17,BS_MULTILINE
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,336,333,60,18
+    LTEXT           "@S_TITLE",S_TITLE,7,5,176,17,SS_WORDELLIPSIS
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,24,173,125
+    ICON            ICO_USER,IDC_STATIC,14,32,20,18
+    PUSHBUTTON      "@B_USER",B_USER,38,34,104,15
+    LTEXT           "@S_USER",S_USER,38,52,132,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,64,156,1
+    ICON            ICO_GROUP,IDC_STATIC,14,70,20,18
+    PUSHBUTTON      "@B_GROUP",B_GROUP,38,71,104,15
+    LTEXT           "@S_GROUP",S_GROUP,38,90,132,11
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,102,156,1
+    ICON            ICO_PASS,IDC_STATIC,14,108,20,18
+    PUSHBUTTON      "@B_ACCESS",B_ACCESS,38,110,104,15
+    LTEXT           "@S_ACCESS",S_ACCESS,38,129,132,18
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,155,173,146
+    ICON            ICO_HUB,IDC_STATIC,14,165,20,18
+    PUSHBUTTON      "@B_PROPERTY",B_PROPERTY,38,165,104,15
+    LTEXT           "@S_PROPERTY",S_PROPERTY,40,182,137,15
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,197,156,1
+    ICON            ICO_TOWER,IDC_STATIC,14,203,20,18
+    PUSHBUTTON      "@B_RADIUS",B_RADIUS,38,204,104,15
+    LTEXT           "@S_RADIUS",S_RADIUS,38,222,132,24
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,246,156,1
+    ICON            ICO_CASCADE,IDC_STATIC,14,254,20,18
+    PUSHBUTTON      "@B_LINK",B_LINK,38,256,104,15
+    LTEXT           "@S_LINK",S_LINK,38,274,132,23
+    GROUPBOX        "@STATIC3",IDC_STATIC,188,5,208,144
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,194,17,191,108
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,303,128,82,16
+    GROUPBOX        "@STATIC4",IDC_STATIC,187,152,209,112
+    ICON            ICO_LOG2,IDC_STATIC,192,161,20,18
+    PUSHBUTTON      "@B_LOG",B_LOG,216,161,100,15
+    PUSHBUTTON      "@B_LOG_FILE",B_LOG_FILE,321,161,63,15
+    LTEXT           "@S_LOG",S_LOG,216,179,173,10
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,192,189,193,1
+    ICON            ICO_SERVER_CERT,IDC_STATIC,192,191,20,18
+    PUSHBUTTON      "@B_CA",B_CA,216,193,100,15
+    PUSHBUTTON      "@B_CRL",B_CRL,321,193,63,15
+    LTEXT           "@S_CA",S_CA,216,209,170,15
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,193,223,193,1
+    ICON            ICO_ROUTER,IDC_STATIC,192,225,20,18
+    PUSHBUTTON      "@B_SNAT",B_SNAT,215,227,169,15
+    LTEXT           "@S_SNAT",S_SNAT,215,245,170,16
+    GROUPBOX        "@STATIC5",IDC_STATIC,187,266,140,35
+    ICON            ICO_VPN,IDC_STATIC,194,276,20,18
+    PUSHBUTTON      "@B_SESSION",B_SESSION,221,280,100,15,BS_MULTILINE
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,336,285,60,16
 END
 
-D_SM_USER DIALOGEX 0, 0, 454, 281
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_USER DIALOGEX 0, 0, 454, 240
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_USER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_USER,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,416,15
-    CONTROL         "",L_USER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,32,440,218
-    DEFPUSHBUTTON   "@IDOK",IDOK,83,257,65,17
-    PUSHBUTTON      "@B_CREATE",B_CREATE,13,257,65,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,226,257,65,17
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,297,257,81,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,382,257,65,17
-    PUSHBUTTON      "@B_STATUS",B_STATUS,153,257,68,17
+    ICON            ICO_USER,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,416,13
+    CONTROL         "",L_USER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,27,440,187
+    DEFPUSHBUTTON   "@IDOK",IDOK,83,220,65,15
+    PUSHBUTTON      "@B_CREATE",B_CREATE,13,220,65,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,226,220,65,15
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,297,220,81,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,382,220,65,15
+    PUSHBUTTON      "@B_STATUS",B_STATUS,153,220,68,15
 END
 
-D_SM_EDIT_USER DIALOGEX 0, 0, 455, 352
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_USER DIALOGEX 0, 0, 455, 301
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_USER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_USER,IDC_STATIC,7,7,20,20
-    RTEXT           "@IDC_STATIC1",IDC_STATIC1,31,16,44,10
-    EDITTEXT        E_USERNAME,80,14,154,12,ES_AUTOHSCROLL
-    RTEXT           "@IDC_STATIC3",IDC_STATIC3,7,35,68,10
-    EDITTEXT        E_REALNAME,80,33,154,12,ES_AUTOHSCROLL
-    RTEXT           "@IDC_STATIC4",IDC_STATIC4,7,55,68,9
-    EDITTEXT        E_NOTE,80,53,154,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,71,226,1
-    ICON            ICO_GROUP,IDC_STATIC,7,79,20,20
-    RTEXT           "@IDC_STATIC5",IDC_STATIC5,31,82,44,24
-    EDITTEXT        E_GROUP,80,84,80,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_GROUP",B_GROUP,164,80,70,18
-    ICON            ICO_DATETIME,IDC_STATIC,7,105,20,20
-    CONTROL         "@R_EXPIRES",R_EXPIRES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,106,161,10
-    CONTROL         "",E_EXPIRES_DATE,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,48,121,75,15
-    CONTROL         "",E_EXPIRES_TIME,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP,131,121,67,15
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,143,227,1
-    RTEXT           "@IDC_STATIC6",IDC_STATIC6,7,151,68,11
-    CONTROL         "",L_AUTH,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,80,150,120,76
-    GROUPBOX        "@S_RADIUS_3",S_RADIUS_3,7,232,229,87
-    ICON            ICO_TOWER,IDC_STATIC,14,244,20,20
-    LTEXT           "@S_RADIUS_1",S_RADIUS_1,35,246,195,27
-    CONTROL         "@R_SET_RADIUS_USERNAME",R_SET_RADIUS_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,276,184,10
-    RTEXT           "@S_RADIUS_2",S_RADIUS_2,11,292,113,13
-    EDITTEXT        E_RADIUS_USERNAME,127,290,101,12,ES_AUTOHSCROLL
-    GROUPBOX        "@S_POLICY_1",S_POLICY_1,242,7,206,40
-    ICON            ICO_MACHINE,IDC_STATIC,249,19,20,20
-    CONTROL         "@R_POLICY",R_POLICY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,281,19,83,21
-    PUSHBUTTON      "@B_POLICY",B_POLICY,367,21,73,18
-    GROUPBOX        "@S_PASSWORD_1",S_PASSWORD_1,242,56,206,53
-    ICON            ICO_KEY,IDC_STATIC,249,70,20,20
-    RTEXT           "@S_PASSWORD_2",S_PASSWORD_2,275,74,70,10
-    EDITTEXT        E_PASSWORD1,348,72,92,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@S_PASSWORD_3",S_PASSWORD_3,270,92,75,10
-    EDITTEXT        E_PASSWORD2,348,90,92,12,ES_PASSWORD | ES_AUTOHSCROLL
-    GROUPBOX        "@S_USER_CERT_1",S_USER_CERT_1,242,114,206,82
-    ICON            ICO_CERT,IDC_STATIC,249,126,20,20
-    LTEXT           "S_CERT_INFO\r\nS_CERT_INFO\r\nS_CERT_INFO\r\nS_CERT_INFO",S_CERT_INFO,272,128,176,40
-    PUSHBUTTON      "@B_LOAD_CERT",B_LOAD_CERT,248,170,57,18
-    PUSHBUTTON      "@B_VIEW_CERT",B_VIEW_CERT,308,170,58,18
-    PUSHBUTTON      "@B_CREATE",B_CREATE,369,170,75,18
-    GROUPBOX        "@S_ROOT_CERT_1",S_ROOT_CERT_1,242,197,206,122
-    ICON            ICO_SERVER_CERT,IDC_STATIC,249,214,20,20
-    LTEXT           "@S_ROOT_CERT_2",S_ROOT_CERT_2,272,210,168,31
-    CONTROL         "@R_CN",R_CN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,257,240,184,10
-    EDITTEXT        E_CN,267,254,174,12,ES_AUTOHSCROLL
-    CONTROL         "@R_SERIAL",R_SERIAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,257,272,184,10
-    EDITTEXT        E_SERIAL,267,286,174,12,ES_AUTOHSCROLL
-    RTEXT           "@S_ROOT_CERT_3",S_ROOT_CERT_3,267,303,170,11
-    DEFPUSHBUTTON   "@IDOK",IDOK,311,326,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,384,326,64,19
-    LTEXT           "@S_HINT",S_HINT,7,322,299,30
+    ICON            ICO_USER,IDC_STATIC,7,5,20,18
+    RTEXT           "@IDC_STATIC1",IDC_STATIC1,31,13,44,9
+    EDITTEXT        E_USERNAME,80,11,154,11,ES_AUTOHSCROLL
+    RTEXT           "@IDC_STATIC3",IDC_STATIC3,7,29,68,9
+    EDITTEXT        E_REALNAME,80,28,154,11,ES_AUTOHSCROLL
+    RTEXT           "@IDC_STATIC4",IDC_STATIC4,7,47,68,8
+    EDITTEXT        E_NOTE,80,45,154,11,ES_AUTOHSCROLL
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,60,226,1
+    ICON            ICO_GROUP,IDC_STATIC,7,67,20,18
+    RTEXT           "@IDC_STATIC5",IDC_STATIC5,31,70,44,21
+    EDITTEXT        E_GROUP,80,71,80,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_GROUP",B_GROUP,164,68,70,16
+    ICON            ICO_DATETIME,IDC_STATIC,7,89,20,18
+    CONTROL         "@R_EXPIRES",R_EXPIRES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,90,161,9
+    CONTROL         "",E_EXPIRES_DATE,"SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,48,103,75,13
+    CONTROL         "",E_EXPIRES_TIME,"SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | WS_TABSTOP,131,103,67,13
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,122,227,1
+    RTEXT           "@IDC_STATIC6",IDC_STATIC6,7,129,68,10
+    CONTROL         "",L_AUTH,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,80,128,120,66
+    GROUPBOX        "@S_RADIUS_3",S_RADIUS_3,7,198,229,75
+    ICON            ICO_TOWER,IDC_STATIC,14,209,20,18
+    LTEXT           "@S_RADIUS_1",S_RADIUS_1,35,210,195,24
+    CONTROL         "@R_SET_RADIUS_USERNAME",R_SET_RADIUS_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,236,184,9
+    RTEXT           "@S_RADIUS_2",S_RADIUS_2,11,250,113,12
+    EDITTEXT        E_RADIUS_USERNAME,127,248,101,11,ES_AUTOHSCROLL
+    GROUPBOX        "@S_POLICY_1",S_POLICY_1,242,5,206,35
+    ICON            ICO_MACHINE,IDC_STATIC,249,16,20,18
+    CONTROL         "@R_POLICY",R_POLICY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,281,16,83,18
+    PUSHBUTTON      "@B_POLICY",B_POLICY,367,17,73,16
+    GROUPBOX        "@S_PASSWORD_1",S_PASSWORD_1,242,47,206,46
+    ICON            ICO_KEY,IDC_STATIC,249,59,20,18
+    RTEXT           "@S_PASSWORD_2",S_PASSWORD_2,275,63,70,9
+    EDITTEXT        E_PASSWORD1,348,61,92,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@S_PASSWORD_3",S_PASSWORD_3,270,78,75,9
+    EDITTEXT        E_PASSWORD2,348,77,92,11,ES_PASSWORD | ES_AUTOHSCROLL
+    GROUPBOX        "@S_USER_CERT_1",S_USER_CERT_1,242,97,206,71
+    ICON            ICO_CERT,IDC_STATIC,249,107,20,18
+    LTEXT           "S_CERT_INFO\r\nS_CERT_INFO\r\nS_CERT_INFO\r\nS_CERT_INFO",S_CERT_INFO,272,109,176,35
+    PUSHBUTTON      "@B_LOAD_CERT",B_LOAD_CERT,248,145,57,16
+    PUSHBUTTON      "@B_VIEW_CERT",B_VIEW_CERT,308,145,58,16
+    PUSHBUTTON      "@B_CREATE",B_CREATE,369,145,75,16
+    GROUPBOX        "@S_ROOT_CERT_1",S_ROOT_CERT_1,242,168,206,105
+    ICON            ICO_SERVER_CERT,IDC_STATIC,249,183,20,18
+    LTEXT           "@S_ROOT_CERT_2",S_ROOT_CERT_2,272,179,168,27
+    CONTROL         "@R_CN",R_CN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,257,205,184,9
+    EDITTEXT        E_CN,267,217,174,11,ES_AUTOHSCROLL
+    CONTROL         "@R_SERIAL",R_SERIAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,257,233,184,9
+    EDITTEXT        E_SERIAL,267,245,174,11,ES_AUTOHSCROLL
+    RTEXT           "@S_ROOT_CERT_3",S_ROOT_CERT_3,267,259,170,10
+    DEFPUSHBUTTON   "@IDOK",IDOK,311,279,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,384,279,64,17
+    LTEXT           "@S_HINT",S_HINT,7,275,299,26
 END
 
-D_SM_POLICY DIALOGEX 0, 0, 450, 341
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_POLICY DIALOGEX 0, 0, 450, 292
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_POLICY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,20,20
-    LTEXT           "S_TITLE",S_TITLE,30,7,281,19
-    CONTROL         "",L_POLICY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,33,257,269
-    GROUPBOX        "@STATIC1",IDC_STATIC,270,30,173,274
-    LTEXT           "S_POLICY_TITLE  S_POLICY_TITLE  S_POLICY_TITLE  S_POLICY_TITLE  ",S_POLICY_TITLE,278,45,158,30
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,277,80,159,1
-    EDITTEXT        E_POLICY_DESCRIPTION,277,99,157,56,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
-    LTEXT           "@S_BOLD",S_BOLD,277,86,114,11
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,277,165,158,1
-    LTEXT           "@S_BOLD2",S_BOLD2,277,173,114,11
-    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTORADIOBUTTON,284,189,149,14
-    CONTROL         "@R_DISABLE",R_DISABLE,"Button",BS_AUTORADIOBUTTON,284,208,149,14
-    CONTROL         "@R_DEFINE",R_DEFINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,284,191,151,11
-    EDITTEXT        E_VALUE,293,207,74,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "S_TANI",S_TANI,371,209,64,12
-    LTEXT           "S_LIMIT",S_LIMIT,294,227,142,34
-    DEFPUSHBUTTON   "@IDOK",IDOK,306,315,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,379,315,64,19
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,20,18
+    LTEXT           "S_TITLE",S_TITLE,30,5,281,17
+    CONTROL         "",L_POLICY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,28,257,231
+    GROUPBOX        "@STATIC1",IDC_STATIC,270,25,173,235
+    LTEXT           "S_POLICY_TITLE  S_POLICY_TITLE  S_POLICY_TITLE  S_POLICY_TITLE  ",S_POLICY_TITLE,278,38,158,26
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,277,68,159,1
+    EDITTEXT        E_POLICY_DESCRIPTION,277,84,157,48,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+    LTEXT           "@S_BOLD",S_BOLD,277,73,114,10
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,277,141,158,1
+    LTEXT           "@S_BOLD2",S_BOLD2,277,148,114,10
+    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTORADIOBUTTON,284,161,149,12
+    CONTROL         "@R_DISABLE",R_DISABLE,"Button",BS_AUTORADIOBUTTON,284,178,149,12
+    CONTROL         "@R_DEFINE",R_DEFINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,284,163,151,10
+    EDITTEXT        E_VALUE,293,177,74,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "S_TANI",S_TANI,371,179,64,11
+    LTEXT           "S_LIMIT",S_LIMIT,294,194,142,30
+    DEFPUSHBUTTON   "@IDOK",IDOK,306,269,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,379,269,64,17
 END
 
-D_SM_GROUP DIALOGEX 0, 0, 334, 282
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_GROUP DIALOGEX 0, 0, 334, 241
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_GROUP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_GROUP,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,31,7,252,18
-    CONTROL         "",L_GROUP,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,32,320,218
-    PUSHBUTTON      "@B_CREATE",B_CREATE,8,258,51,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,64,258,36,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,105,258,40,17
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,150,258,69,17
-    PUSHBUTTON      "@B_USER",B_USER,224,258,51,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,280,258,47,17
+    ICON            ICO_GROUP,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,252,16
+    CONTROL         "",L_GROUP,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,27,320,187
+    PUSHBUTTON      "@B_CREATE",B_CREATE,8,221,51,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,64,221,36,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,105,221,40,15
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,150,221,69,15
+    PUSHBUTTON      "@B_USER",B_USER,224,221,51,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,280,221,47,15
 END
 
-D_SM_EDIT_GROUP DIALOGEX 0, 0, 243, 298
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_GROUP DIALOGEX 0, 0, 243, 255
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_GROUP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_GROUP,IDC_STATIC,7,7,20,20
-    RTEXT           "@IDC_STATIC1",IDC_STATIC1,31,16,44,12
-    EDITTEXT        E_GROUPNAME,80,14,154,12,ES_AUTOHSCROLL
-    RTEXT           "@IDC_STATIC3",IDC_STATIC3,7,35,68,12
-    EDITTEXT        E_REALNAME,80,33,154,12,ES_AUTOHSCROLL
-    RTEXT           "@IDC_STATIC4",IDC_STATIC4,7,55,68,12
-    EDITTEXT        E_NOTE,80,53,154,12,ES_AUTOHSCROLL
-    GROUPBOX        "@S_POLICY_1",S_POLICY_1,7,76,229,40
-    ICON            ICO_MACHINE,IDC_STATIC,14,88,20,20
-    CONTROL         "@R_POLICY",R_POLICY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,40,87,104,21
-    PUSHBUTTON      "@B_POLICY",B_POLICY,154,90,73,18
-    GROUPBOX        "@S_POLICY_2",S_POLICY_2,7,123,229,144
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,138,213,118
-    DEFPUSHBUTTON   "@IDOK",IDOK,98,272,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,172,272,64,19
+    ICON            ICO_GROUP,IDC_STATIC,7,5,20,18
+    RTEXT           "@IDC_STATIC1",IDC_STATIC1,31,13,44,11
+    EDITTEXT        E_GROUPNAME,80,11,154,11,ES_AUTOHSCROLL
+    RTEXT           "@IDC_STATIC3",IDC_STATIC3,7,29,68,11
+    EDITTEXT        E_REALNAME,80,28,154,11,ES_AUTOHSCROLL
+    RTEXT           "@IDC_STATIC4",IDC_STATIC4,7,47,68,11
+    EDITTEXT        E_NOTE,80,45,154,11,ES_AUTOHSCROLL
+    GROUPBOX        "@S_POLICY_1",S_POLICY_1,7,65,229,35
+    ICON            ICO_MACHINE,IDC_STATIC,14,75,20,18
+    CONTROL         "@R_POLICY",R_POLICY,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,40,74,104,18
+    PUSHBUTTON      "@B_POLICY",B_POLICY,154,77,73,16
+    GROUPBOX        "@S_POLICY_2",S_POLICY_2,7,105,229,124
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,14,118,213,102
+    DEFPUSHBUTTON   "@IDOK",IDOK,98,233,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,172,233,64,17
 END
 
-D_SM_ACCESS_LIST DIALOGEX 0, 0, 451, 322
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_ACCESS_LIST DIALOGEX 0, 0, 451, 275
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_ACCESS_LIST"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PASS,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,7,411,23
-    CONTROL         "",L_ACCESS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,34,364,257
-    PUSHBUTTON      "@B_ADD",B_ADD,376,33,68,18
-    PUSHBUTTON      "@B_ADD_V6",B_ADD_V6,376,55,68,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,376,77,68,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,376,99,68,18
-    PUSHBUTTON      "@B_CLONE",B_CLONE,376,138,68,18
-    PUSHBUTTON      "@B_ENABLE",B_ENABLE,376,178,68,18
-    PUSHBUTTON      "@B_DISABLE",B_DISABLE,376,200,68,18
-    LTEXT           "@STATIC1",IDC_STATIC,377,238,67,28
-    PUSHBUTTON      "@B_SAVE",B_SAVE,376,272,68,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,376,297,68,18
-    ICON            ICO_INFORMATION,IDC_STATIC,7,294,20,20
-    LTEXT           "@STATIC2",IDC_STATIC,28,295,340,20
+    ICON            ICO_PASS,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,5,411,20
+    CONTROL         "",L_ACCESS_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,29,364,221
+    PUSHBUTTON      "@B_ADD",B_ADD,376,28,68,16
+    PUSHBUTTON      "@B_ADD_V6",B_ADD_V6,376,47,68,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,376,65,68,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,376,84,68,16
+    PUSHBUTTON      "@B_CLONE",B_CLONE,376,118,68,16
+    PUSHBUTTON      "@B_ENABLE",B_ENABLE,376,152,68,16
+    PUSHBUTTON      "@B_DISABLE",B_DISABLE,376,171,68,16
+    LTEXT           "@STATIC1",IDC_STATIC,377,203,67,24
+    PUSHBUTTON      "@B_SAVE",B_SAVE,376,233,68,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,376,254,68,16
+    ICON            ICO_INFORMATION,IDC_STATIC,7,251,20,18
+    LTEXT           "@STATIC2",IDC_STATIC,28,252,340,18
 END
 
-D_SM_EDIT_ACCESS DIALOGEX 0, 0, 459, 411
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_ACCESS DIALOGEX 0, 0, 459, 352
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_ACCESS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PASS,S_ICON,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,421,19
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,34,217,71
-    RTEXT           "@STATIC3",IDC_STATIC,14,51,71,11
-    EDITTEXT        E_NOTE,91,49,115,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,14,69,71,9
-    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON,91,64,47,18
-    CONTROL         "@R_DISCARD",R_DISCARD,"Button",BS_AUTORADIOBUTTON,142,64,51,18
-    RTEXT           "@STATIC5",IDC_STATIC,14,88,71,10
-    EDITTEXT        E_PRIORITY,91,86,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC6",IDC_STATIC,134,85,73,18
-    GROUPBOX        "@STATIC11",S_STATIC11,7,108,217,112
-    ICON            ICO_USER,IDC_STATIC,11,119,20,20
-    LTEXT           "@STATIC12",S_STATIC12,34,121,177,28
-    RTEXT           "@STATIC13",S_STATIC13,12,155,73,12
-    EDITTEXT        E_USERNAME1,89,153,84,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_USER1",B_USER1,179,151,41,18
-    RTEXT           "@STATIC14",S_STATIC14,13,178,72,12
-    EDITTEXT        E_USERNAME2,89,176,84,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_USER2",B_USER2,179,174,41,18
-    LTEXT           "@STATIC15",S_STATIC15,56,195,156,22
-    GROUPBOX        "@STATIC16",IDC_STATIC,7,223,217,152
-    RTEXT           "@S_CHECK_SRC_MAC",S_CHECK_SRC_MAC,14,235,71,10
-    CONTROL         "@R_CHECK_SRC_MAC",R_CHECK_SRC_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,233,121,10
-    RTEXT           "@S_SRC_MAC",S_SRC_MAC,14,250,108,10
-    EDITTEXT        E_SRC_MAC,128,248,78,12,ES_AUTOHSCROLL
-    RTEXT           "@S_SRC_MAC_MASK",S_SRC_MAC_MASK,14,267,108,10
-    EDITTEXT        E_SRC_MAC_MASK,128,265,78,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,18,283,193,1
-    RTEXT           "@S_CHECK_DST_MAC",S_CHECK_DST_MAC,13,289,71,10
-    CONTROL         "@R_CHECK_DST_MAC",R_CHECK_DST_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,287,121,10
-    RTEXT           "@S_DST_MAC",S_DST_MAC,14,304,108,10
-    EDITTEXT        E_DST_MAC,128,302,78,12,ES_AUTOHSCROLL
-    RTEXT           "@S_DST_MAC_MASK",S_DST_MAC_MASK,14,322,108,10
-    EDITTEXT        E_DST_MAC_MASK,128,320,78,12,ES_AUTOHSCROLL
-    LTEXT           "@S_MAC_NOTE",S_MAC_NOTE,18,337,197,30
-    GROUPBOX        "@STATIC7",IDC_STATIC,232,34,220,211
-    RTEXT           "@S_ACCESS_SRC_ALL",S_ACCESS_SRC_ALL,237,50,71,10
-    CONTROL         "@R_SRC_ALL",R_SRC_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,48,121,10
-    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,237,64,108,10
-    CONTROL         "",E_SRC_IP,"SysIPAddress32",WS_TABSTOP,349,62,75,13
-    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,237,82,108,9
-    CONTROL         "",E_SRC_MASK,"SysIPAddress32",WS_TABSTOP,349,80,75,13
-    RTEXT           "@S_SRC_IP_3",S_SRC_IP_3,237,102,195,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,118,208,1
-    RTEXT           "@S_ACCESS_DST_ALL",S_ACCESS_DST_ALL,237,128,71,10
-    CONTROL         "@R_DST_ALL",R_DST_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,126,121,10
-    RTEXT           "@S_IP_DST_1",S_IP_DST_1,237,142,108,10
-    CONTROL         "",E_DST_IP,"SysIPAddress32",WS_TABSTOP,349,140,75,13
-    RTEXT           "@S_IP_DST_2",S_IP_DST_2,237,160,108,10
-    CONTROL         "",E_DST_MASK,"SysIPAddress32",WS_TABSTOP,349,158,75,13
-    RTEXT           "@S_IP_DST_3",S_IP_DST_3,237,178,197,11
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,196,208,1
-    RTEXT           "@STATIC9",IDC_STATIC,237,206,71,12
-    COMBOBOX        C_PROTOCOL,313,204,110,87,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_PROTOID",S_PROTOID,237,226,71,10
-    EDITTEXT        E_IP_PROTO,313,224,37,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        "@STATIC10",IDC_STATIC,232,247,220,129
-    LTEXT           "@S_TCP_1",S_TCP_1,318,259,31,10
-    LTEXT           "@S_TCP_2",S_TCP_2,370,259,31,10
-    RTEXT           "@S_TCP_3",S_TCP_3,234,273,71,10
-    EDITTEXT        E_SRC_PORT_1,311,271,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "-",S_TCP_4,356,273,8,8
-    EDITTEXT        E_SRC_PORT_2,365,271,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    RTEXT           "@S_TCP_5",S_TCP_5,234,291,71,10
-    EDITTEXT        E_DST_PORT_1,311,289,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "-",S_TCP_6,356,291,8,8
-    EDITTEXT        E_DST_PORT_2,365,289,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_TCP_7",S_TCP_7,240,308,204,25
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,340,208,1
-    CONTROL         "@R_CHECK_TCP_STATE",R_CHECK_TCP_STATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,346,158,10
-    CONTROL         "@R_ESTABLISHED",R_ESTABLISHED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,268,360,71,10
-    CONTROL         "@R_UNESTABLISHED",R_UNESTABLISHED,"Button",BS_AUTORADIOBUTTON,351,360,80,10
-    CONTROL         "@R_REDIRECT",R_REDIRECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,383,113,21
-    PUSHBUTTON      "@B_REDIRECT",B_REDIRECT,122,385,78,19
-    PUSHBUTTON      "@B_SIMULATION",B_SIMULATION,207,385,103,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,320,385,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,388,385,64,19
+    ICON            ICO_PASS,S_ICON,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,421,17
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,29,217,61
+    RTEXT           "@STATIC3",IDC_STATIC,14,43,71,10
+    EDITTEXT        E_NOTE,91,41,115,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,14,59,71,8
+    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON,91,54,47,16
+    CONTROL         "@R_DISCARD",R_DISCARD,"Button",BS_AUTORADIOBUTTON,142,54,51,16
+    RTEXT           "@STATIC5",IDC_STATIC,14,75,71,9
+    EDITTEXT        E_PRIORITY,91,73,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC6",IDC_STATIC,134,72,73,16
+    GROUPBOX        "@STATIC11",S_STATIC11,7,92,217,96
+    ICON            ICO_USER,IDC_STATIC,11,101,20,18
+    LTEXT           "@STATIC12",S_STATIC12,34,103,177,24
+    RTEXT           "@STATIC13",S_STATIC13,12,132,73,11
+    EDITTEXT        E_USERNAME1,89,131,84,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_USER1",B_USER1,179,129,41,16
+    RTEXT           "@STATIC14",S_STATIC14,13,152,72,11
+    EDITTEXT        E_USERNAME2,89,150,84,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_USER2",B_USER2,179,149,41,16
+    LTEXT           "@STATIC15",S_STATIC15,56,167,156,19
+    GROUPBOX        "@STATIC16",IDC_STATIC,7,191,217,131
+    RTEXT           "@S_CHECK_SRC_MAC",S_CHECK_SRC_MAC,14,201,71,9
+    CONTROL         "@R_CHECK_SRC_MAC",R_CHECK_SRC_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,199,121,9
+    RTEXT           "@S_SRC_MAC",S_SRC_MAC,14,214,108,9
+    EDITTEXT        E_SRC_MAC,128,212,78,11,ES_AUTOHSCROLL
+    RTEXT           "@S_SRC_MAC_MASK",S_SRC_MAC_MASK,14,228,108,9
+    EDITTEXT        E_SRC_MAC_MASK,128,227,78,11,ES_AUTOHSCROLL
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,18,242,193,1
+    RTEXT           "@S_CHECK_DST_MAC",S_CHECK_DST_MAC,13,247,71,9
+    CONTROL         "@R_CHECK_DST_MAC",R_CHECK_DST_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,245,121,9
+    RTEXT           "@S_DST_MAC",S_DST_MAC,14,260,108,9
+    EDITTEXT        E_DST_MAC,128,258,78,11,ES_AUTOHSCROLL
+    RTEXT           "@S_DST_MAC_MASK",S_DST_MAC_MASK,14,275,108,9
+    EDITTEXT        E_DST_MAC_MASK,128,274,78,11,ES_AUTOHSCROLL
+    LTEXT           "@S_MAC_NOTE",S_MAC_NOTE,18,288,197,26
+    GROUPBOX        "@STATIC7",IDC_STATIC,232,29,220,181
+    RTEXT           "@S_ACCESS_SRC_ALL",S_ACCESS_SRC_ALL,237,42,71,9
+    CONTROL         "@R_SRC_ALL",R_SRC_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,41,121,9
+    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,237,54,108,9
+    CONTROL         "",E_SRC_IP,"SysIPAddress32",WS_TABSTOP,349,53,75,12
+    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,237,70,108,8
+    CONTROL         "",E_SRC_MASK,"SysIPAddress32",WS_TABSTOP,349,68,75,12
+    RTEXT           "@S_SRC_IP_3",S_SRC_IP_3,237,87,195,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,101,208,1
+    RTEXT           "@S_ACCESS_DST_ALL",S_ACCESS_DST_ALL,237,109,71,9
+    CONTROL         "@R_DST_ALL",R_DST_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,107,121,9
+    RTEXT           "@S_IP_DST_1",S_IP_DST_1,237,121,108,9
+    CONTROL         "",E_DST_IP,"SysIPAddress32",WS_TABSTOP,349,119,75,12
+    RTEXT           "@S_IP_DST_2",S_IP_DST_2,237,137,108,9
+    CONTROL         "",E_DST_MASK,"SysIPAddress32",WS_TABSTOP,349,135,75,12
+    RTEXT           "@S_IP_DST_3",S_IP_DST_3,237,152,197,10
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,167,208,1
+    RTEXT           "@STATIC9",IDC_STATIC,237,176,71,11
+    COMBOBOX        C_PROTOCOL,313,174,110,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_PROTOID",S_PROTOID,237,193,71,9
+    EDITTEXT        E_IP_PROTO,313,191,37,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "@STATIC10",IDC_STATIC,232,211,220,111
+    LTEXT           "@S_TCP_1",S_TCP_1,318,221,31,9
+    LTEXT           "@S_TCP_2",S_TCP_2,370,221,31,9
+    RTEXT           "@S_TCP_3",S_TCP_3,234,233,71,9
+    EDITTEXT        E_SRC_PORT_1,311,232,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "-",S_TCP_4,356,233,8,7
+    EDITTEXT        E_SRC_PORT_2,365,232,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT           "@S_TCP_5",S_TCP_5,234,249,71,9
+    EDITTEXT        E_DST_PORT_1,311,247,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "-",S_TCP_6,356,249,8,7
+    EDITTEXT        E_DST_PORT_2,365,247,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_TCP_7",S_TCP_7,240,263,204,22
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,291,208,1
+    CONTROL         "@R_CHECK_TCP_STATE",R_CHECK_TCP_STATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,296,158,9
+    CONTROL         "@R_ESTABLISHED",R_ESTABLISHED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,268,308,71,9
+    CONTROL         "@R_UNESTABLISHED",R_UNESTABLISHED,"Button",BS_AUTORADIOBUTTON,351,308,80,9
+    CONTROL         "@R_REDIRECT",R_REDIRECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,328,113,18
+    PUSHBUTTON      "@B_REDIRECT",B_REDIRECT,122,329,78,17
+    PUSHBUTTON      "@B_SIMULATION",B_SIMULATION,207,329,103,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,320,329,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,388,329,64,17
 END
 
-D_SM_RADIUS DIALOGEX 0, 0, 283, 324
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_RADIUS DIALOGEX 0, 0, 283, 277
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_RADIUS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TOWER,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,30,7,236,29
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,46,269,200
-    CONTROL         "@R_USE_RADIUS",R_USE_RADIUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,61,255,14
-    RTEXT           "@S_RADIUS_1",S_RADIUS_1,14,81,95,18
-    EDITTEXT        E_HOSTNAME,115,84,154,12,ES_AUTOHSCROLL
-    RTEXT           "@S_RADIUS_2",S_RADIUS_2,14,119,95,13
-    EDITTEXT        E_PORT,115,117,41,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_RADIUS3",S_RADIUS3,162,119,106,13
-    RTEXT           "@S_RADIUS_4",S_RADIUS_4,14,139,95,11
-    EDITTEXT        E_SECRET1,115,137,154,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@S_RADIUS_5",S_RADIUS_5,14,158,95,11
-    EDITTEXT        E_SECRET2,115,156,154,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@S_RADIUS_8",S_RADIUS_8,14,176,95,11
-    EDITTEXT        E_RADIUS_RETRY_INTERVAL,115,174,41,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_RADIUS_7",S_RADIUS_7,163,177,106,18
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,199,255,1
-    ICON            ICO_INFORMATION,IDC_STATIC,14,205,18,21
-    LTEXT           "@S_RADIUS_6",S_RADIUS_6,38,205,231,31
-    ICON            ICO_LINK,IDC_STATIC,14,247,18,21
-    LTEXT           "@STATIC2",IDC_STATIC,38,251,230,37
-    DEFPUSHBUTTON   "@IDOK",IDOK,139,298,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,298,64,19
-    LTEXT           "@S_RADIUS_9",S_RADIUS_9,116,99,152,11
+    ICON            ICO_TOWER,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,30,5,236,25
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,39,269,172
+    CONTROL         "@R_USE_RADIUS",R_USE_RADIUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,52,255,12
+    RTEXT           "@S_RADIUS_1",S_RADIUS_1,14,69,95,16
+    EDITTEXT        E_HOSTNAME,115,71,154,11,ES_AUTOHSCROLL
+    RTEXT           "@S_RADIUS_2",S_RADIUS_2,14,101,95,12
+    EDITTEXT        E_PORT,115,100,41,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_RADIUS3",S_RADIUS3,162,101,106,12
+    RTEXT           "@S_RADIUS_4",S_RADIUS_4,14,119,95,10
+    EDITTEXT        E_SECRET1,115,117,154,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@S_RADIUS_5",S_RADIUS_5,14,135,95,10
+    EDITTEXT        E_SECRET2,115,133,154,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@S_RADIUS_8",S_RADIUS_8,14,150,95,10
+    EDITTEXT        E_RADIUS_RETRY_INTERVAL,115,149,41,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_RADIUS_7",S_RADIUS_7,163,151,106,16
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,170,255,1
+    ICON            ICO_INFORMATION,IDC_STATIC,14,175,18,18
+    LTEXT           "@S_RADIUS_6",S_RADIUS_6,38,175,231,27
+    ICON            ICO_LINK,IDC_STATIC,14,211,18,18
+    LTEXT           "@STATIC2",IDC_STATIC,38,215,230,32
+    DEFPUSHBUTTON   "@IDOK",IDOK,139,255,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,255,64,17
+    LTEXT           "@S_RADIUS_9",S_RADIUS_9,116,84,152,10
 END
 
-D_SM_LINK DIALOGEX 0, 0, 423, 313
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_LINK DIALOGEX 0, 0, 423, 268
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_LINK"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CASCADE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,29,7,387,19
-    GROUPBOX        "@STATIC2",IDC_STATIC,26,29,357,49
-    ICON            ICO_WARNING,IDC_STATIC,31,41,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,54,40,324,28
-    CONTROL         "",L_LINK,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,87,409,192
-    PUSHBUTTON      "@B_CREATE",B_CREATE,12,289,52,17
-    PUSHBUTTON      "@B_EDIT",B_EDIT,68,289,40,17
-    PUSHBUTTON      "@B_ONLINE",B_ONLINE,112,289,44,17
-    PUSHBUTTON      "@B_OFFLINE",B_OFFLINE,160,289,44,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,208,289,41,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,253,289,41,17
-    PUSHBUTTON      "@B_RENAME",B_RENAME,298,289,60,17
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,398,48,18,17,NOT WS_VISIBLE
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,373,289,43,17
+    ICON            ICO_CASCADE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,29,5,387,17
+    GROUPBOX        "@STATIC2",IDC_STATIC,26,24,357,42
+    ICON            ICO_WARNING,IDC_STATIC,31,35,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,54,34,324,24
+    CONTROL         "",L_LINK,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | WS_BORDER | WS_TABSTOP,7,74,409,165
+    PUSHBUTTON      "@B_CREATE",B_CREATE,12,247,52,15
+    PUSHBUTTON      "@B_EDIT",B_EDIT,68,247,40,15
+    PUSHBUTTON      "@B_ONLINE",B_ONLINE,112,247,44,15
+    PUSHBUTTON      "@B_OFFLINE",B_OFFLINE,160,247,44,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,208,247,41,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,253,247,41,15
+    PUSHBUTTON      "@B_RENAME",B_RENAME,298,247,60,15
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,398,41,18,15,NOT WS_VISIBLE
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,373,247,43,15
 END
 
-D_SM_LOG DIALOGEX 0, 0, 279, 389
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_LOG DIALOGEX 0, 0, 279, 333
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_LOG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_LOG2,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,30,7,242,28
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,46,265,58
-    ICON            ICO_MACHINE,IDC_STATIC,14,59,20,20
-    CONTROL         "@B_SEC",B_SEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,60,225,10
-    RTEXT           "@S_SEC",S_SEC,39,76,98,11
-    COMBOBOX        C_SEC_SWITCH,142,73,121,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,111,265,210
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,125,20,20
-    CONTROL         "@B_PACKET",B_PACKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,125,225,10
-    RTEXT           "@S_PACKET",S_PACKET,39,141,98,11
-    COMBOBOX        C_PACKET_SWITCH,142,139,121,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_PACKET_0",S_PACKET_0,19,169,58,11
-    CONTROL         "@B_PACKET_0_0",B_PACKET_0_0,"Button",BS_AUTORADIOBUTTON,82,167,45,10
-    CONTROL         "@B_PACKET_0_1",B_PACKET_0_1,"Button",BS_AUTORADIOBUTTON,128,167,52,10
-    CONTROL         "@B_PACKET_0_2",B_PACKET_0_2,"Button",BS_AUTORADIOBUTTON,181,167,78,10
-    RTEXT           "@S_PACKET_1",S_PACKET_1,19,185,58,11
-    CONTROL         "@B_PACKET_1_0",B_PACKET_1_0,"Button",BS_AUTORADIOBUTTON,82,184,45,10
-    CONTROL         "@B_PACKET_1_1",B_PACKET_1_1,"Button",BS_AUTORADIOBUTTON,128,184,52,10
-    CONTROL         "@B_PACKET_1_2",B_PACKET_1_2,"Button",BS_AUTORADIOBUTTON,181,184,78,10
-    RTEXT           "@S_PACKET_2",S_PACKET_2,19,202,58,12
-    CONTROL         "@B_PACKET_2_0",B_PACKET_2_0,"Button",BS_AUTORADIOBUTTON,82,201,45,10
-    CONTROL         "@B_PACKET_2_1",B_PACKET_2_1,"Button",BS_AUTORADIOBUTTON,128,201,52,10
-    CONTROL         "@B_PACKET_2_2",B_PACKET_2_2,"Button",BS_AUTORADIOBUTTON,181,201,78,10
-    RTEXT           "@S_PACKET_3",S_PACKET_3,19,219,58,10
-    CONTROL         "@B_PACKET_3_0",B_PACKET_3_0,"Button",BS_AUTORADIOBUTTON,82,218,44,10
-    CONTROL         "@B_PACKET_3_1",B_PACKET_3_1,"Button",BS_AUTORADIOBUTTON,128,218,52,10
-    CONTROL         "@B_PACKET_3_2",B_PACKET_3_2,"Button",BS_AUTORADIOBUTTON,181,218,78,10
-    RTEXT           "@S_PACKET_4",S_PACKET_4,19,235,58,11
-    CONTROL         "@B_PACKET_4_0",B_PACKET_4_0,"Button",BS_AUTORADIOBUTTON,82,235,45,10
-    CONTROL         "@B_PACKET_4_1",B_PACKET_4_1,"Button",BS_AUTORADIOBUTTON,128,235,52,10
-    CONTROL         "@B_PACKET_4_2",B_PACKET_4_2,"Button",BS_AUTORADIOBUTTON,181,235,78,10
-    RTEXT           "@S_PACKET_5",S_PACKET_5,19,252,58,11
-    CONTROL         "@B_PACKET_5_0",B_PACKET_5_0,"Button",BS_AUTORADIOBUTTON,82,252,45,10
-    CONTROL         "@B_PACKET_5_1",B_PACKET_5_1,"Button",BS_AUTORADIOBUTTON,128,252,52,10
-    CONTROL         "@B_PACKET_5_2",B_PACKET_5_2,"Button",BS_AUTORADIOBUTTON,181,252,78,10
-    RTEXT           "@S_PACKET_6",S_PACKET_6,19,269,58,10
-    CONTROL         "@B_PACKET_6_0",B_PACKET_6_0,"Button",BS_AUTORADIOBUTTON,82,269,45,10
-    CONTROL         "@B_PACKET_6_1",B_PACKET_6_1,"Button",BS_AUTORADIOBUTTON,128,269,52,10
-    CONTROL         "@B_PACKET_6_2",B_PACKET_6_2,"Button",BS_AUTORADIOBUTTON,181,269,78,10
-    RTEXT           "@S_PACKET_7",S_PACKET_7,19,284,58,19
-    CONTROL         "@B_PACKET_7_0",B_PACKET_7_0,"Button",BS_AUTORADIOBUTTON,82,285,45,10
-    CONTROL         "@B_PACKET_7_1",B_PACKET_7_1,"Button",BS_AUTORADIOBUTTON,128,286,53,10
-    CONTROL         "@B_PACKET_7_2",B_PACKET_7_2,"Button",BS_AUTORADIOBUTTON,181,286,78,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,135,363,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,363,64,19
-    ICON            ICO_WARNING,IDC_STATIC,7,328,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,29,327,243,35
+    ICON            ICO_LOG2,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,30,5,242,24
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,39,265,50
+    ICON            ICO_MACHINE,IDC_STATIC,14,50,20,18
+    CONTROL         "@B_SEC",B_SEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,51,225,9
+    RTEXT           "@S_SEC",S_SEC,39,65,98,10
+    COMBOBOX        C_SEC_SWITCH,142,62,121,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,95,265,180
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,107,20,18
+    CONTROL         "@B_PACKET",B_PACKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,39,107,225,9
+    RTEXT           "@S_PACKET",S_PACKET,39,120,98,10
+    COMBOBOX        C_PACKET_SWITCH,142,119,121,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_PACKET_0",S_PACKET_0,19,144,58,10
+    CONTROL         "@B_PACKET_0_0",B_PACKET_0_0,"Button",BS_AUTORADIOBUTTON,82,143,45,9
+    CONTROL         "@B_PACKET_0_1",B_PACKET_0_1,"Button",BS_AUTORADIOBUTTON,128,143,52,9
+    CONTROL         "@B_PACKET_0_2",B_PACKET_0_2,"Button",BS_AUTORADIOBUTTON,181,143,78,9
+    RTEXT           "@S_PACKET_1",S_PACKET_1,19,158,58,10
+    CONTROL         "@B_PACKET_1_0",B_PACKET_1_0,"Button",BS_AUTORADIOBUTTON,82,157,45,9
+    CONTROL         "@B_PACKET_1_1",B_PACKET_1_1,"Button",BS_AUTORADIOBUTTON,128,157,52,9
+    CONTROL         "@B_PACKET_1_2",B_PACKET_1_2,"Button",BS_AUTORADIOBUTTON,181,157,78,9
+    RTEXT           "@S_PACKET_2",S_PACKET_2,19,173,58,11
+    CONTROL         "@B_PACKET_2_0",B_PACKET_2_0,"Button",BS_AUTORADIOBUTTON,82,172,45,9
+    CONTROL         "@B_PACKET_2_1",B_PACKET_2_1,"Button",BS_AUTORADIOBUTTON,128,172,52,9
+    CONTROL         "@B_PACKET_2_2",B_PACKET_2_2,"Button",BS_AUTORADIOBUTTON,181,172,78,9
+    RTEXT           "@S_PACKET_3",S_PACKET_3,19,187,58,9
+    CONTROL         "@B_PACKET_3_0",B_PACKET_3_0,"Button",BS_AUTORADIOBUTTON,82,186,44,9
+    CONTROL         "@B_PACKET_3_1",B_PACKET_3_1,"Button",BS_AUTORADIOBUTTON,128,186,52,9
+    CONTROL         "@B_PACKET_3_2",B_PACKET_3_2,"Button",BS_AUTORADIOBUTTON,181,186,78,9
+    RTEXT           "@S_PACKET_4",S_PACKET_4,19,201,58,10
+    CONTROL         "@B_PACKET_4_0",B_PACKET_4_0,"Button",BS_AUTORADIOBUTTON,82,201,45,9
+    CONTROL         "@B_PACKET_4_1",B_PACKET_4_1,"Button",BS_AUTORADIOBUTTON,128,201,52,9
+    CONTROL         "@B_PACKET_4_2",B_PACKET_4_2,"Button",BS_AUTORADIOBUTTON,181,201,78,9
+    RTEXT           "@S_PACKET_5",S_PACKET_5,19,215,58,10
+    CONTROL         "@B_PACKET_5_0",B_PACKET_5_0,"Button",BS_AUTORADIOBUTTON,82,215,45,9
+    CONTROL         "@B_PACKET_5_1",B_PACKET_5_1,"Button",BS_AUTORADIOBUTTON,128,215,52,9
+    CONTROL         "@B_PACKET_5_2",B_PACKET_5_2,"Button",BS_AUTORADIOBUTTON,181,215,78,9
+    RTEXT           "@S_PACKET_6",S_PACKET_6,19,230,58,9
+    CONTROL         "@B_PACKET_6_0",B_PACKET_6_0,"Button",BS_AUTORADIOBUTTON,82,230,45,9
+    CONTROL         "@B_PACKET_6_1",B_PACKET_6_1,"Button",BS_AUTORADIOBUTTON,128,230,52,9
+    CONTROL         "@B_PACKET_6_2",B_PACKET_6_2,"Button",BS_AUTORADIOBUTTON,181,230,78,9
+    RTEXT           "@S_PACKET_7",S_PACKET_7,19,243,58,17
+    CONTROL         "@B_PACKET_7_0",B_PACKET_7_0,"Button",BS_AUTORADIOBUTTON,82,244,45,9
+    CONTROL         "@B_PACKET_7_1",B_PACKET_7_1,"Button",BS_AUTORADIOBUTTON,128,245,53,9
+    CONTROL         "@B_PACKET_7_2",B_PACKET_7_2,"Button",BS_AUTORADIOBUTTON,181,245,78,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,135,311,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,311,64,17
+    ICON            ICO_WARNING,IDC_STATIC,7,281,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,29,280,243,30
 END
 
-D_SM_CA DIALOGEX 0, 0, 335, 228
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CA DIALOGEX 0, 0, 335, 195
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CA"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_CERT,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,295,35
-    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,50,321,144
-    PUSHBUTTON      "@B_IMPORT",B_IMPORT,81,203,55,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,203,203,62,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,273,203,55,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,142,203,54,17
+    ICON            ICO_SERVER_CERT,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,295,30
+    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,42,321,124
+    PUSHBUTTON      "@B_IMPORT",B_IMPORT,81,173,55,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,203,173,62,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,273,173,55,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,142,173,54,15
 END
 
-D_SM_SESSION DIALOGEX 0, 0, 453, 362
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SESSION DIALOGEX 0, 0, 453, 310
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SESSION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_VPN,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,35,7,411,19
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,439,222
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,263,434,43
-    DEFPUSHBUTTON   "@IDOK",IDOK,13,277,81,18
-    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,100,277,47,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,152,277,71,18
-    PUSHBUTTON      "@B_SESSION_MAC_TABLE",B_SESSION_MAC_TABLE,231,277,99,18
-    PUSHBUTTON      "@B_SESSION_IP_TABLE",B_SESSION_IP_TABLE,337,277,90,18
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,312,245,43
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,324,18,21
-    PUSHBUTTON      "@B_MAC_TABLE",B_MAC_TABLE,39,326,92,18
-    ICON            ICO_PROTOCOL,IDC_STATIC,133,323,18,21
-    PUSHBUTTON      "@B_IP_TABLE",B_IP_TABLE,160,326,85,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,387,337,59,18
-    ICON            ICO_FARM,S_FARM_INFO_1,260,310,18,21,NOT WS_VISIBLE
-    LTEXT           "@S_FARM_INFO_2",S_FARM_INFO_2,281,309,165,24,NOT WS_VISIBLE
+    ICON            ICO_VPN,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,35,5,411,17
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,439,191
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,225,434,37
+    DEFPUSHBUTTON   "@IDOK",IDOK,13,237,81,16
+    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,100,237,47,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,152,237,71,16
+    PUSHBUTTON      "@B_SESSION_MAC_TABLE",B_SESSION_MAC_TABLE,231,237,99,16
+    PUSHBUTTON      "@B_SESSION_IP_TABLE",B_SESSION_IP_TABLE,337,237,90,16
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,267,245,37
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,277,18,18
+    PUSHBUTTON      "@B_MAC_TABLE",B_MAC_TABLE,39,279,92,16
+    ICON            ICO_PROTOCOL,IDC_STATIC,133,276,18,18
+    PUSHBUTTON      "@B_IP_TABLE",B_IP_TABLE,160,279,85,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,387,288,59,16
+    ICON            ICO_FARM,S_FARM_INFO_1,260,265,18,18,NOT WS_VISIBLE
+    LTEXT           "@S_FARM_INFO_2",S_FARM_INFO_2,281,264,165,21,NOT WS_VISIBLE
 END
 
-D_SM_MAC DIALOGEX 0, 0, 451, 337
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_MAC DIALOGEX 0, 0, 451, 288
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_MAC"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,35,7,409,21
-    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,437,265
-    PUSHBUTTON      "@B_DELETE",B_DELETE,201,312,93,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,312,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,312,51,18
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,35,5,409,18
+    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,437,228
+    PUSHBUTTON      "@B_DELETE",B_DELETE,201,267,93,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,267,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,267,51,16
 END
 
-D_SM_IP DIALOGEX 0, 0, 451, 337
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_IP DIALOGEX 0, 0, 451, 288
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_IP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PROTOCOL,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,35,7,409,21
-    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,437,265
-    PUSHBUTTON      "@B_DELETE",B_DELETE,201,312,93,18
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,312,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,312,51,18
+    ICON            ICO_PROTOCOL,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,35,5,409,18
+    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,437,228
+    PUSHBUTTON      "@B_DELETE",B_DELETE,201,267,93,16
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,267,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,267,51,16
 END
 
-D_SM_CREATE_CERT DIALOGEX 0, 0, 301, 371
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CREATE_CERT DIALOGEX 0, 0, 301, 317
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CREATE_CERT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,263,21
-    RTEXT           "@STATIC2",IDC_STATIC,7,39,69,13
-    CONTROL         "@R_ROOT_CERT",R_ROOT_CERT,"Button",BS_AUTORADIOBUTTON,81,37,187,10
-    CONTROL         "@R_SIGNED_CERT",R_SIGNED_CERT,"Button",BS_AUTORADIOBUTTON,81,53,189,10
-    RTEXT           "@S_LOAD_1",S_LOAD_1,7,75,69,19
-    PUSHBUTTON      "@B_LOAD",B_LOAD,81,75,102,18
-    LTEXT           "@S_LOAD_2",S_LOAD_2,81,97,206,36
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,137,287,20
-    RTEXT           "@S_LOAD_3",S_LOAD_3,7,146,69,12
-    EDITTEXT        E_CN,81,144,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_4",S_LOAD_4,7,163,69,11
-    EDITTEXT        E_O,81,161,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_5",S_LOAD_5,7,181,69,12
-    EDITTEXT        E_OU,81,179,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_6",S_LOAD_6,7,200,69,11
-    EDITTEXT        E_C,81,198,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_7",S_LOAD_7,7,217,69,11
-    EDITTEXT        E_ST,81,215,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_8",S_LOAD_8,7,235,69,10
-    EDITTEXT        E_L,81,233,205,12,ES_AUTOHSCROLL
-    RTEXT           "@S_LOAD_11",S_LOAD_11,7,253,69,19
-    EDITTEXT        E_SERIAL,81,251,205,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,273,286,1
-    RTEXT           "@S_LOAD_9",S_LOAD_9,7,286,69,11
-    EDITTEXT        E_EXPIRE,81,284,36,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_LOAD_10",S_LOAD_10,121,286,28,11
-    RTEXT           "@S_LOAD_12",S_LOAD_12,157,286,51,11
-    COMBOBOX        C_BITS,210,281,48,131,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "bits",S_LOAD_13,263,286,28,11
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,304,285,1
-    ICON            ICO_INFORMATION,IDC_STATIC,7,313,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,30,315,264,29
-    DEFPUSHBUTTON   "@IDOK",IDOK,157,345,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,230,345,64,19
+    ICON            ICO_CERT,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,263,18
+    RTEXT           "@STATIC2",IDC_STATIC,7,33,69,12
+    CONTROL         "@R_ROOT_CERT",R_ROOT_CERT,"Button",BS_AUTORADIOBUTTON,81,31,187,9
+    CONTROL         "@R_SIGNED_CERT",R_SIGNED_CERT,"Button",BS_AUTORADIOBUTTON,81,45,189,9
+    RTEXT           "@S_LOAD_1",S_LOAD_1,7,64,69,17
+    PUSHBUTTON      "@B_LOAD",B_LOAD,81,64,102,16
+    LTEXT           "@S_LOAD_2",S_LOAD_2,81,83,206,31
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,117,287,18
+    RTEXT           "@S_LOAD_3",S_LOAD_3,7,125,69,11
+    EDITTEXT        E_CN,81,123,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_4",S_LOAD_4,7,139,69,10
+    EDITTEXT        E_O,81,137,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_5",S_LOAD_5,7,155,69,11
+    EDITTEXT        E_OU,81,153,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_6",S_LOAD_6,7,171,69,10
+    EDITTEXT        E_C,81,169,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_7",S_LOAD_7,7,185,69,10
+    EDITTEXT        E_ST,81,184,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_8",S_LOAD_8,7,201,69,9
+    EDITTEXT        E_L,81,199,205,11,ES_AUTOHSCROLL
+    RTEXT           "@S_LOAD_11",S_LOAD_11,7,216,69,17
+    EDITTEXT        E_SERIAL,81,215,205,11,ES_AUTOHSCROLL
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,233,286,1
+    RTEXT           "@S_LOAD_9",S_LOAD_9,7,245,69,10
+    EDITTEXT        E_EXPIRE,81,243,36,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_LOAD_10",S_LOAD_10,121,245,28,10
+    RTEXT           "@S_LOAD_12",S_LOAD_12,157,245,51,10
+    COMBOBOX        C_BITS,210,240,48,113,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "bits",S_LOAD_13,263,245,28,10
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,260,285,1
+    ICON            ICO_INFORMATION,IDC_STATIC,7,268,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,30,269,264,25
+    DEFPUSHBUTTON   "@IDOK",IDOK,157,295,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,230,295,64,17
 END
 
-D_NM_LOGIN DIALOGEX 0, 0, 275, 134
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_LOGIN DIALOGEX 0, 0, 275, 114
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_LOGIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,237,34
-    RTEXT           "@STATIC1",IDC_STATIC,33,70,49,12
-    EDITTEXT        E_PASSWORD,87,68,141,12,ES_PASSWORD | ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC2",IDC_STATIC,26,47,222,50
-    DEFPUSHBUTTON   "@IDOK",IDOK,158,111,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,111,52,16
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,237,30
+    RTEXT           "@STATIC1",IDC_STATIC,33,59,49,11
+    EDITTEXT        E_PASSWORD,87,58,141,11,ES_PASSWORD | ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC2",IDC_STATIC,26,40,222,43
+    DEFPUSHBUTTON   "@IDOK",IDOK,158,95,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,95,52,14
 END
 
-D_SPEEDMETER DIALOGEX 0, 0, 319, 295
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SPEEDMETER DIALOGEX 0, 0, 319, 252
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SPEEDMETER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,14,281,12
-    COMBOBOX        E_LIST,32,30,215,141,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,56,305,232
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,19,73,276,203
-    PUSHBUTTON      "@STATIC3",B_REFRESH,254,29,50,16
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,11,281,11
+    COMBOBOX        E_LIST,32,25,215,121,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,47,305,199
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,19,62,276,174
+    PUSHBUTTON      "@STATIC3",B_REFRESH,254,24,50,14
 END
 
-D_NM_MAIN DIALOGEX 0, 0, 351, 380
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_MAIN DIALOGEX 0, 0, 351, 325
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_MAIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         176,IDC_STATIC,"Static",SS_BITMAP,7,7,338,103
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,112,337,85
-    ICON            ICO_VPNSERVER,IDC_STATIC,14,123,20,20
-    LTEXT           "@STATIC2",IDC_STATIC,38,126,297,20
-    PUSHBUTTON      "@B_SETTING",B_SETTING,44,148,111,17
-    PUSHBUTTON      "@B_CONNECT",B_CONNECT,164,148,61,17
-    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,234,148,61,17
-    ICON            ICO_INTERNET,IDC_STATIC,15,169,20,20
-    LTEXT           "",S_STATUS,39,176,298,15,SS_WORDELLIPSIS
-    GROUPBOX        "@STATIC3",IDC_STATIC,7,203,337,62
-    ICON            ICO_ROUTER,IDC_STATIC,15,215,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,38,218,297,14
-    PUSHBUTTON      "@B_OPTION",B_OPTION,113,238,120,17
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,267,337,83
-    ICON            ICO_MACHINE,IDC_STATIC,14,278,20,20
-    LTEXT           "@STATIC6",IDC_STATIC,38,280,297,14
-    PUSHBUTTON      "@B_NAT",B_NAT,75,298,97,17
-    PUSHBUTTON      "@B_DHCP",B_DHCP,186,298,97,17
-    PUSHBUTTON      "@B_STATUS",B_STATUS,75,322,97,17
-    PUSHBUTTON      "@B_INFO",B_INFO,186,322,97,17
-    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,7,356,97,17
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,109,356,71,17
-    PUSHBUTTON      "@B_ABOUT",B_ABOUT,192,356,71,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,279,356,65,17
+    CONTROL         176,IDC_STATIC,"Static",SS_BITMAP,7,5,338,89
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,95,337,73
+    ICON            ICO_VPNSERVER,IDC_STATIC,14,105,20,18
+    LTEXT           "@STATIC2",IDC_STATIC,38,107,297,18
+    PUSHBUTTON      "@B_SETTING",B_SETTING,44,126,111,15
+    PUSHBUTTON      "@B_CONNECT",B_CONNECT,164,126,61,15
+    PUSHBUTTON      "@B_DISCONNECT",B_DISCONNECT,234,126,61,15
+    ICON            ICO_INTERNET,IDC_STATIC,15,144,20,18
+    LTEXT           "",S_STATUS,39,150,298,13,SS_WORDELLIPSIS
+    GROUPBOX        "@STATIC3",IDC_STATIC,7,173,337,54
+    ICON            ICO_ROUTER,IDC_STATIC,15,184,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,38,186,297,12
+    PUSHBUTTON      "@B_OPTION",B_OPTION,113,203,120,15
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,228,337,72
+    ICON            ICO_MACHINE,IDC_STATIC,14,238,20,18
+    LTEXT           "@STATIC6",IDC_STATIC,38,239,297,12
+    PUSHBUTTON      "@B_NAT",B_NAT,75,255,97,15
+    PUSHBUTTON      "@B_DHCP",B_DHCP,186,255,97,15
+    PUSHBUTTON      "@B_STATUS",B_STATUS,75,275,97,15
+    PUSHBUTTON      "@B_INFO",B_INFO,186,275,97,15
+    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,7,305,97,15
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,109,305,71,15
+    PUSHBUTTON      "@B_ABOUT",B_ABOUT,192,305,71,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,279,305,65,15
 END
 
-D_NM_OPTION DIALOGEX 0, 0, 419, 325
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_OPTION DIALOGEX 0, 0, 419, 278
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_OPTION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_ROUTER,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,29,11,357,19
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,40,199,83
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,55,18,21
-    RTEXT           "@STATIC2",IDC_STATIC,39,60,59,12
-    EDITTEXT        E_MAC,102,59,81,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC3",IDC_STATIC,39,81,59,11
-    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,102,79,75,13
-    RTEXT           "@STATIC4",IDC_STATIC,39,102,59,10
-    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,102,100,75,13
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,130,199,89
-    CONTROL         "@R_USE_NAT",R_USE_NAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,146,157,10
-    RTEXT           "@STATIC6",IDC_STATIC,39,162,59,11
-    EDITTEXT        E_MTU,102,160,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC7",IDC_STATIC,145,162,52,10
-    RTEXT           "@STATIC8",IDC_STATIC,10,180,88,10
-    EDITTEXT        E_TCP,102,178,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC9",IDC_STATIC,145,180,47,10
-    RTEXT           "@STATIC10",IDC_STATIC,10,198,88,11
-    EDITTEXT        E_UDP,102,196,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC11",IDC_STATIC,145,198,51,10
-    GROUPBOX        "@S_1",S_1,7,227,199,72
-    ICON            ICO_PROTOCOL,IDC_STATIC,14,239,18,21
-    LTEXT           "@S_2",S_2,40,243,159,20
-    PUSHBUTTON      "@B_PUSH",B_PUSH,55,269,143,19
-    CONTROL         "@R_SAVE_LOG",R_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,308,190,10
-    GROUPBOX        "@STATIC12",IDC_STATIC,211,40,201,228
-    CONTROL         "@R_USE_DHCP",R_USE_DHCP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,56,161,10
-    RTEXT           "@STATIC13",IDC_STATIC,218,74,84,11
-    CONTROL         "",E_DHCP_START,"SysIPAddress32",WS_TABSTOP,306,72,75,13
-    LTEXT           "@STATIC14",IDC_STATIC,384,74,24,11
-    CONTROL         "",E_DHCP_END,"SysIPAddress32",WS_TABSTOP,306,92,75,13
-    LTEXT           "@STATIC15",IDC_STATIC,384,94,26,10
-    RTEXT           "@STATIC16",IDC_STATIC,218,114,84,11
-    CONTROL         "",E_DHCP_MASK,"SysIPAddress32",WS_TABSTOP,306,112,75,13
-    RTEXT           "@STATIC17",IDC_STATIC,218,136,84,10
-    EDITTEXT        E_EXPIRES,306,134,39,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC18",IDC_STATIC,349,136,54,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,218,154,185,1
-    LTEXT           "@STATIC19",IDC_STATIC,218,163,184,14
-    RTEXT           "@STATIC20",IDC_STATIC,218,182,84,20
-    CONTROL         "",E_GATEWAY,"SysIPAddress32",WS_TABSTOP,306,183,75,13
-    RTEXT           "@STATIC21",IDC_STATIC,213,207,89,14
-    CONTROL         "",E_DNS,"SysIPAddress32",WS_TABSTOP,306,205,75,13
-    RTEXT           "@STATIC23",IDC_STATIC,213,228,89,13
-    CONTROL         "",E_DNS2,"SysIPAddress32",WS_TABSTOP,306,226,75,13
-    RTEXT           "@STATIC22",IDC_STATIC,218,249,84,12
-    EDITTEXT        E_DOMAIN,306,247,98,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,274,299,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,348,299,64,19
+    ICON            ICO_ROUTER,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,29,9,357,17
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,34,199,72
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,14,47,18,18
+    RTEXT           "@STATIC2",IDC_STATIC,39,51,59,11
+    EDITTEXT        E_MAC,102,50,81,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC3",IDC_STATIC,39,69,59,10
+    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,102,67,75,12
+    RTEXT           "@STATIC4",IDC_STATIC,39,87,59,9
+    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,102,85,75,12
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,111,199,77
+    CONTROL         "@R_USE_NAT",R_USE_NAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,125,157,9
+    RTEXT           "@STATIC6",IDC_STATIC,39,138,59,10
+    EDITTEXT        E_MTU,102,137,39,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC7",IDC_STATIC,145,138,52,9
+    RTEXT           "@STATIC8",IDC_STATIC,10,154,88,9
+    EDITTEXT        E_TCP,102,152,39,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC9",IDC_STATIC,145,154,47,9
+    RTEXT           "@STATIC10",IDC_STATIC,10,169,88,10
+    EDITTEXT        E_UDP,102,167,39,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC11",IDC_STATIC,145,169,51,9
+    GROUPBOX        "@S_1",S_1,7,194,199,62
+    ICON            ICO_PROTOCOL,IDC_STATIC,14,204,18,18
+    LTEXT           "@S_2",S_2,40,208,159,18
+    PUSHBUTTON      "@B_PUSH",B_PUSH,55,230,143,17
+    CONTROL         "@R_SAVE_LOG",R_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,263,190,9
+    GROUPBOX        "@STATIC12",IDC_STATIC,211,34,201,196
+    CONTROL         "@R_USE_DHCP",R_USE_DHCP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,47,161,9
+    RTEXT           "@STATIC13",IDC_STATIC,218,63,84,10
+    CONTROL         "",E_DHCP_START,"SysIPAddress32",WS_TABSTOP,306,61,75,12
+    LTEXT           "@STATIC14",IDC_STATIC,384,63,24,10
+    CONTROL         "",E_DHCP_END,"SysIPAddress32",WS_TABSTOP,306,78,75,12
+    LTEXT           "@STATIC15",IDC_STATIC,384,80,26,9
+    RTEXT           "@STATIC16",IDC_STATIC,218,97,84,10
+    CONTROL         "",E_DHCP_MASK,"SysIPAddress32",WS_TABSTOP,306,95,75,12
+    RTEXT           "@STATIC17",IDC_STATIC,218,116,84,9
+    EDITTEXT        E_EXPIRES,306,114,39,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC18",IDC_STATIC,349,116,54,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,218,131,185,1
+    LTEXT           "@STATIC19",IDC_STATIC,218,139,184,12
+    RTEXT           "@STATIC20",IDC_STATIC,218,155,84,18
+    CONTROL         "",E_GATEWAY,"SysIPAddress32",WS_TABSTOP,306,156,75,12
+    RTEXT           "@STATIC21",IDC_STATIC,213,177,89,12
+    CONTROL         "",E_DNS,"SysIPAddress32",WS_TABSTOP,306,175,75,12
+    RTEXT           "@STATIC23",IDC_STATIC,213,195,89,12
+    CONTROL         "",E_DNS2,"SysIPAddress32",WS_TABSTOP,306,193,75,12
+    RTEXT           "@STATIC22",IDC_STATIC,218,213,84,11
+    EDITTEXT        E_DOMAIN,306,211,98,11,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,274,256,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,348,256,64,17
 END
 
-D_NM_NAT DIALOGEX 0, 0, 451, 337
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_NAT DIALOGEX 0, 0, 451, 288
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_NAT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PROTOCOL,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,35,7,409,21
-    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,437,265
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,312,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,312,51,18
+    ICON            ICO_PROTOCOL,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,35,5,409,18
+    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,437,228
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,267,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,267,51,16
 END
 
-D_NM_DHCP DIALOGEX 0, 0, 451, 337
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_DHCP DIALOGEX 0, 0, 451, 288
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_DHCP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INTERNET,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,35,7,409,21
-    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,37,437,265
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,312,82,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,312,51,18
+    ICON            ICO_INTERNET,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,35,5,409,18
+    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,31,437,228
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,301,267,82,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,393,267,51,16
 END
 
-D_NM_CHANGE_PASSWORD DIALOGEX 0, 0, 250, 112
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_CHANGE_PASSWORD DIALOGEX 0, 0, 250, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_CHANGE_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_USER_ADMIN,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,212,29
-    RTEXT           "@STATIC1",IDC_STATIC,7,41,65,10
-    EDITTEXT        E_PASSWORD1,78,39,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC2",IDC_STATIC,7,60,65,10
-    EDITTEXT        E_PASSWORD2,78,58,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,106,86,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,86,64,19
+    ICON            ICO_USER_ADMIN,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,212,25
+    RTEXT           "@STATIC1",IDC_STATIC,7,35,65,9
+    EDITTEXT        E_PASSWORD1,78,33,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC2",IDC_STATIC,7,51,65,9
+    EDITTEXT        E_PASSWORD2,78,49,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,106,73,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,73,64,17
 END
 
-D_SM_SNAT DIALOGEX 0, 0, 355, 318
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SNAT DIALOGEX 0, 0, 355, 272
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SNAT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_ROUTER,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,317,26
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,37,341,96
-    ICON            ICO_WARNING,IDC_STATIC,14,53,20,20
-    LTEXT           "@S_WARNING",S_WARNING,39,53,301,22
-    LTEXT           "@S_WARNING2",S_WARNING2,39,81,301,45
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,137,341,76
-    LTEXT           "@STATIC3",IDC_STATIC,15,151,325,12
-    PUSHBUTTON      "@B_ENABLE",B_ENABLE,19,167,102,18
-    PUSHBUTTON      "@B_DISABLE",B_DISABLE,125,167,102,18
-    PUSHBUTTON      "@B_CONFIG",B_CONFIG,232,167,102,18
-    LTEXT           "@STATIC4",IDC_STATIC,15,191,325,18
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,217,341,65
-    ICON            ICO_INFORMATION,IDC_STATIC,14,231,20,20
-    LTEXT           "@STATIC6",IDC_STATIC,43,235,230,14
-    PUSHBUTTON      "@B_NAT",B_NAT,17,255,100,18
-    PUSHBUTTON      "@B_DHCP",B_DHCP,122,255,100,18
-    PUSHBUTTON      "@B_STATUS",B_STATUS,226,255,112,18
-    CONTROL         179,S_TSUKUBA1,"Static",SS_BITMAP | NOT WS_VISIBLE,644,-9,68,26
-    LTEXT           "@S_TSUKUBA2",S_TSUKUBA2,78,293,204,18,NOT WS_VISIBLE
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,288,293,60,18
+    ICON            ICO_ROUTER,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,317,23
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,31,341,83
+    ICON            ICO_WARNING,IDC_STATIC,14,45,20,20
+    LTEXT           "@S_WARNING",S_WARNING,39,45,301,19
+    LTEXT           "@S_WARNING2",S_WARNING2,39,69,301,39
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,117,341,66
+    LTEXT           "@STATIC3",IDC_STATIC,15,129,325,11
+    PUSHBUTTON      "@B_ENABLE",B_ENABLE,19,143,102,16
+    PUSHBUTTON      "@B_DISABLE",B_DISABLE,125,143,102,16
+    PUSHBUTTON      "@B_CONFIG",B_CONFIG,232,143,102,16
+    LTEXT           "@STATIC4",IDC_STATIC,15,163,325,16
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,185,341,56
+    ICON            ICO_INFORMATION,IDC_STATIC,14,197,20,20
+    LTEXT           "@STATIC6",IDC_STATIC,43,201,230,12
+    PUSHBUTTON      "@B_NAT",B_NAT,17,218,100,16
+    PUSHBUTTON      "@B_DHCP",B_DHCP,122,218,100,16
+    PUSHBUTTON      "@B_STATUS",B_STATUS,226,218,112,16
+    CONTROL         179,S_TSUKUBA1,"Static",SS_BITMAP | NOT WS_VISIBLE,644,-7,68,23
+    LTEXT           "@S_TSUKUBA2",S_TSUKUBA2,78,251,204,16,NOT WS_VISIBLE
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,288,251,60,16
 END
 
-D_SM_BRIDGE DIALOGEX 0, 0, 367, 380
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_BRIDGE DIALOGEX 0, 0, 367, 325
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_BRIDGE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_BRIDGE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,327,43
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,55,353,99
-    PUSHBUTTON      "@B_VLAN",B_VLAN,7,159,130,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,267,159,93,17
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,181,353,158
-    ICON            ICO_HUB,IDC_STATIC,16,195,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,40,197,310,10
-    RTEXT           "@STATIC4",IDC_STATIC,40,213,53,10
-    COMBOBOX        E_HUBNAME,100,211,250,96,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,22,229,328,1
-    LTEXT           "@STATIC5",S_STATIC5,14,236,54,12
-    CONTROL         "@R_BRIDGE",R_BRIDGE,"Button",BS_AUTORADIOBUTTON,73,235,274,10
-    CONTROL         "@R_TAP",R_TAP,"Button",BS_AUTORADIOBUTTON,73,249,275,10
-    ICON            ICO_NIC_ONLINE,S_ICON,14,263,20,20
-    LTEXT           "--INFO--",S_INFO,38,262,311,12
-    RTEXT           "@S_ETH_1",S_ETH_1,38,279,53,11
-    COMBOBOX        E_NICNAME,100,276,251,96,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_TAP_1",S_TAP_1,14,295,77,10
-    EDITTEXT        E_TAPNAME,99,294,81,12,ES_AUTOHSCROLL
-    LTEXT           "@S_TAP_2",S_TAP_2,183,296,80,10
-    LTEXT           "@STATIC6",IDC_STATIC,14,308,236,29
-    DEFPUSHBUTTON   "@IDOK",IDOK,258,314,91,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,301,345,59,18
-    LTEXT           "@STATIC7",IDC_STATIC,7,345,286,28
+    ICON            ICO_BRIDGE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,327,37
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,47,353,85
+    PUSHBUTTON      "@B_VLAN",B_VLAN,7,136,130,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,267,136,93,15
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,155,353,136
+    ICON            ICO_HUB,IDC_STATIC,16,167,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,40,168,310,9
+    RTEXT           "@STATIC4",IDC_STATIC,40,182,53,9
+    COMBOBOX        E_HUBNAME,100,180,250,83,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,22,196,328,1
+    LTEXT           "@STATIC5",S_STATIC5,14,202,54,11
+    CONTROL         "@R_BRIDGE",R_BRIDGE,"Button",BS_AUTORADIOBUTTON,73,201,274,9
+    CONTROL         "@R_TAP",R_TAP,"Button",BS_AUTORADIOBUTTON,73,213,275,9
+    ICON            ICO_NIC_ONLINE,S_ICON,14,225,20,18
+    LTEXT           "--INFO--",S_INFO,38,224,311,11
+    RTEXT           "@S_ETH_1",S_ETH_1,38,239,53,10
+    COMBOBOX        E_NICNAME,100,236,251,83,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_TAP_1",S_TAP_1,14,252,77,9
+    EDITTEXT        E_TAPNAME,99,251,81,11,ES_AUTOHSCROLL
+    LTEXT           "@S_TAP_2",S_TAP_2,183,253,80,9
+    LTEXT           "@STATIC6",IDC_STATIC,14,263,236,25
+    DEFPUSHBUTTON   "@IDOK",IDOK,258,269,91,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,301,295,59,16
+    LTEXT           "@STATIC7",IDC_STATIC,7,295,286,24
 END
 
-D_WIN9X_REBOOT DIALOGEX 0, 0, 239, 104
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+D_WIN9X_REBOOT DIALOGEX 0, 0, 239, 89
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 EXSTYLE WS_EX_TOPMOST
 CAPTION "@D_WIN9X_REBOOT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,32,7,200,52
-    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,7,65,225,12
-    CTEXT           "-- COUNTER --",S_INFO,7,82,225,15
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,32,5,200,45
+    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,7,55,225,11
+    CTEXT           "-- COUNTER --",S_INFO,7,70,225,13
 END
 
-D_DEFAULT1 DIALOGEX 0, 0, 186, 90
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_DEFAULT1 DIALOGEX 0, 0, 186, 77
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PacketiX VPN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
 END
 
-D_EM_MAIN DIALOGEX 0, 0, 335, 211
-STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_MAIN DIALOGEX 0, 0, 335, 180
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_MAIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,-1,7,7,20,20
-    LTEXT           "@STATIC1",-1,31,7,297,43
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,55,321,120
-    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,7,186,60,18
-    PUSHBUTTON      "@B_LICENSE",B_LICENSE,72,186,50,18
-    PUSHBUTTON      "@B_ADD",B_ADD,127,186,47,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,178,186,47,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,229,186,47,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,281,186,47,18
+    ICON            ICO_NIC_ONLINE,-1,7,5,20,18
+    LTEXT           "@STATIC1",-1,31,5,297,37
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,47,321,103
+    PUSHBUTTON      "@B_PASSWORD",B_PASSWORD,7,159,60,16
+    PUSHBUTTON      "@B_LICENSE",B_LICENSE,72,159,50,16
+    PUSHBUTTON      "@B_ADD",B_ADD,127,159,47,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,178,159,47,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,229,159,47,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,281,159,47,16
 END
 
-D_EM_ADD DIALOGEX 0, 0, 279, 347
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_ADD DIALOGEX 0, 0, 279, 297
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_ADD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    GROUPBOX        "@STATIC1",-1,7,7,265,59
-    ICON            ICO_NIC_ONLINE,-1,14,21,20,20
-    COMBOBOX        C_DEVICE,37,26,226,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "@R_PROMISCUS",R_PROMISCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,44,223,12
-    GROUPBOX        "@STATIC2",-1,7,81,265,200
-    ICON            ICO_USER_ADMIN,-1,14,94,20,20
-    RTEXT           "@S_PACKET",S_PACKET,39,101,98,10
-    COMBOBOX        C_PACKET_SWITCH,142,99,121,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_PACKET_0",S_PACKET_0,14,129,58,12
-    CONTROL         "@B_PACKET_0_0",B_PACKET_0_0,"Button",BS_AUTORADIOBUTTON,79,127,42,10
-    CONTROL         "@B_PACKET_0_1",B_PACKET_0_1,"Button",BS_AUTORADIOBUTTON,125,127,57,10
-    CONTROL         "@B_PACKET_0_2",B_PACKET_0_2,"Button",BS_AUTORADIOBUTTON,187,127,66,10
-    RTEXT           "@S_PACKET_1",S_PACKET_1,14,147,58,11
-    CONTROL         "@B_PACKET_1_0",B_PACKET_1_0,"Button",BS_AUTORADIOBUTTON,79,145,42,10
-    CONTROL         "@B_PACKET_1_1",B_PACKET_1_1,"Button",BS_AUTORADIOBUTTON,125,145,57,10
-    CONTROL         "@B_PACKET_1_2",B_PACKET_1_2,"Button",BS_AUTORADIOBUTTON,187,145,66,10
-    RTEXT           "@S_PACKET_2",S_PACKET_2,14,165,58,12
-    CONTROL         "@B_PACKET_2_0",B_PACKET_2_0,"Button",BS_AUTORADIOBUTTON,79,163,42,10
-    CONTROL         "@B_PACKET_2_1",B_PACKET_2_1,"Button",BS_AUTORADIOBUTTON,125,163,57,10
-    CONTROL         "@B_PACKET_2_2",B_PACKET_2_2,"Button",BS_AUTORADIOBUTTON,187,163,66,10
-    RTEXT           "@S_PACKET_3",S_PACKET_3,14,181,58,11
-    CONTROL         "@B_PACKET_3_0",B_PACKET_3_0,"Button",BS_AUTORADIOBUTTON,79,179,42,10
-    CONTROL         "@B_PACKET_3_1",B_PACKET_3_1,"Button",BS_AUTORADIOBUTTON,125,179,57,10
-    CONTROL         "@B_PACKET_3_2",B_PACKET_3_2,"Button",BS_AUTORADIOBUTTON,187,179,66,10
-    RTEXT           "@S_PACKET_4",S_PACKET_4,14,199,58,10
-    CONTROL         "@B_PACKET_4_0",B_PACKET_4_0,"Button",BS_AUTORADIOBUTTON,79,197,42,10
-    CONTROL         "@B_PACKET_4_1",B_PACKET_4_1,"Button",BS_AUTORADIOBUTTON,125,197,57,10
-    CONTROL         "@B_PACKET_4_2",B_PACKET_4_2,"Button",BS_AUTORADIOBUTTON,187,197,66,10
-    RTEXT           "@S_PACKET_5",S_PACKET_5,14,217,58,12
-    CONTROL         "@B_PACKET_5_0",B_PACKET_5_0,"Button",BS_AUTORADIOBUTTON,79,215,42,10
-    CONTROL         "@B_PACKET_5_1",B_PACKET_5_1,"Button",BS_AUTORADIOBUTTON,125,215,57,10
-    CONTROL         "@B_PACKET_5_2",B_PACKET_5_2,"Button",BS_AUTORADIOBUTTON,187,215,66,10
-    RTEXT           "@S_PACKET_6",S_PACKET_6,14,231,58,10
-    CONTROL         "@B_PACKET_6_0",B_PACKET_6_0,"Button",BS_AUTORADIOBUTTON,79,231,42,10
-    CONTROL         "@B_PACKET_6_1",B_PACKET_6_1,"Button",BS_AUTORADIOBUTTON,125,231,57,10
-    CONTROL         "@B_PACKET_6_2",B_PACKET_6_2,"Button",BS_AUTORADIOBUTTON,187,231,66,10
-    RTEXT           "@S_PACKET_7",S_PACKET_7,14,247,58,19
-    CONTROL         "@B_PACKET_7_0",B_PACKET_7_0,"Button",BS_AUTORADIOBUTTON,79,249,42,10
-    CONTROL         "@B_PACKET_7_1",B_PACKET_7_1,"Button",BS_AUTORADIOBUTTON,125,249,57,10
-    CONTROL         "@B_PACKET_7_2",B_PACKET_7_2,"Button",BS_AUTORADIOBUTTON,187,249,66,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,135,321,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,321,64,19
-    ICON            ICO_WARNING,-1,7,288,20,20
-    LTEXT           "@STATIC3",-1,29,287,243,28
+    GROUPBOX        "@STATIC1",-1,7,5,265,51
+    ICON            ICO_NIC_ONLINE,-1,14,17,20,18
+    COMBOBOX        C_DEVICE,37,22,226,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "@R_PROMISCUS",R_PROMISCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,37,223,11
+    GROUPBOX        "@STATIC2",-1,7,69,265,172
+    ICON            ICO_USER_ADMIN,-1,14,80,20,18
+    RTEXT           "@S_PACKET",S_PACKET,39,86,98,9
+    COMBOBOX        C_PACKET_SWITCH,142,84,121,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_PACKET_0",S_PACKET_0,14,110,58,11
+    CONTROL         "@B_PACKET_0_0",B_PACKET_0_0,"Button",BS_AUTORADIOBUTTON,79,108,42,9
+    CONTROL         "@B_PACKET_0_1",B_PACKET_0_1,"Button",BS_AUTORADIOBUTTON,125,108,57,9
+    CONTROL         "@B_PACKET_0_2",B_PACKET_0_2,"Button",BS_AUTORADIOBUTTON,187,108,66,9
+    RTEXT           "@S_PACKET_1",S_PACKET_1,14,125,58,10
+    CONTROL         "@B_PACKET_1_0",B_PACKET_1_0,"Button",BS_AUTORADIOBUTTON,79,124,42,9
+    CONTROL         "@B_PACKET_1_1",B_PACKET_1_1,"Button",BS_AUTORADIOBUTTON,125,124,57,9
+    CONTROL         "@B_PACKET_1_2",B_PACKET_1_2,"Button",BS_AUTORADIOBUTTON,187,124,66,9
+    RTEXT           "@S_PACKET_2",S_PACKET_2,14,141,58,11
+    CONTROL         "@B_PACKET_2_0",B_PACKET_2_0,"Button",BS_AUTORADIOBUTTON,79,139,42,9
+    CONTROL         "@B_PACKET_2_1",B_PACKET_2_1,"Button",BS_AUTORADIOBUTTON,125,139,57,9
+    CONTROL         "@B_PACKET_2_2",B_PACKET_2_2,"Button",BS_AUTORADIOBUTTON,187,139,66,9
+    RTEXT           "@S_PACKET_3",S_PACKET_3,14,155,58,10
+    CONTROL         "@B_PACKET_3_0",B_PACKET_3_0,"Button",BS_AUTORADIOBUTTON,79,153,42,9
+    CONTROL         "@B_PACKET_3_1",B_PACKET_3_1,"Button",BS_AUTORADIOBUTTON,125,153,57,9
+    CONTROL         "@B_PACKET_3_2",B_PACKET_3_2,"Button",BS_AUTORADIOBUTTON,187,153,66,9
+    RTEXT           "@S_PACKET_4",S_PACKET_4,14,170,58,9
+    CONTROL         "@B_PACKET_4_0",B_PACKET_4_0,"Button",BS_AUTORADIOBUTTON,79,168,42,9
+    CONTROL         "@B_PACKET_4_1",B_PACKET_4_1,"Button",BS_AUTORADIOBUTTON,125,168,57,9
+    CONTROL         "@B_PACKET_4_2",B_PACKET_4_2,"Button",BS_AUTORADIOBUTTON,187,168,66,9
+    RTEXT           "@S_PACKET_5",S_PACKET_5,14,185,58,11
+    CONTROL         "@B_PACKET_5_0",B_PACKET_5_0,"Button",BS_AUTORADIOBUTTON,79,184,42,9
+    CONTROL         "@B_PACKET_5_1",B_PACKET_5_1,"Button",BS_AUTORADIOBUTTON,125,184,57,9
+    CONTROL         "@B_PACKET_5_2",B_PACKET_5_2,"Button",BS_AUTORADIOBUTTON,187,184,66,9
+    RTEXT           "@S_PACKET_6",S_PACKET_6,14,197,58,9
+    CONTROL         "@B_PACKET_6_0",B_PACKET_6_0,"Button",BS_AUTORADIOBUTTON,79,197,42,9
+    CONTROL         "@B_PACKET_6_1",B_PACKET_6_1,"Button",BS_AUTORADIOBUTTON,125,197,57,9
+    CONTROL         "@B_PACKET_6_2",B_PACKET_6_2,"Button",BS_AUTORADIOBUTTON,187,197,66,9
+    RTEXT           "@S_PACKET_7",S_PACKET_7,14,211,58,17
+    CONTROL         "@B_PACKET_7_0",B_PACKET_7_0,"Button",BS_AUTORADIOBUTTON,79,213,42,9
+    CONTROL         "@B_PACKET_7_1",B_PACKET_7_1,"Button",BS_AUTORADIOBUTTON,125,213,57,9
+    CONTROL         "@B_PACKET_7_2",B_PACKET_7_2,"Button",BS_AUTORADIOBUTTON,187,213,66,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,135,275,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,275,64,17
+    ICON            ICO_WARNING,-1,7,246,20,18
+    LTEXT           "@STATIC3",-1,29,245,243,24
 END
 
-D_EM_PASSWORD DIALOGEX 0, 0, 250, 112
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_PASSWORD DIALOGEX 0, 0, 250, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_PASSWORD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,212,20
-    RTEXT           "@STATIC1",IDC_STATIC,7,41,65,11
-    EDITTEXT        E_PASSWORD1,78,39,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC2",IDC_STATIC,7,60,65,11
-    EDITTEXT        E_PASSWORD2,78,58,130,12,ES_PASSWORD | ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,106,86,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,86,64,19
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,212,18
+    RTEXT           "@STATIC1",IDC_STATIC,7,35,65,10
+    EDITTEXT        E_PASSWORD1,78,33,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC2",IDC_STATIC,7,51,65,10
+    EDITTEXT        E_PASSWORD2,78,49,130,11,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,106,73,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,179,73,64,17
 END
 
-D_SM_CONFIG DIALOGEX 0, 0, 383, 368
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CONFIG DIALOGEX 0, 0, 383, 315
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CONFIG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@IDC_INFO",IDC_INFO,36,12,340,24
-    EDITTEXT        E_CONFIG,7,44,369,257,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
-    PUSHBUTTON      "@B_FACTORY",B_FACTORY,7,342,112,19
-    PUSHBUTTON      "@B_EXPORT",B_EXPORT,127,342,74,19
-    PUSHBUTTON      "@B_IMPORT",B_IMPORT,206,342,112,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,323,342,53,19
-    ICON            ICO_WARNING,IDC_STATIC,7,307,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,30,303,346,38
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@IDC_INFO",IDC_INFO,36,10,340,21
+    EDITTEXT        E_CONFIG,7,37,369,221,ES_MULTILINE | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+    PUSHBUTTON      "@B_FACTORY",B_FACTORY,7,293,112,17
+    PUSHBUTTON      "@B_EXPORT",B_EXPORT,127,293,74,17
+    PUSHBUTTON      "@B_IMPORT",B_IMPORT,206,293,112,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,323,293,53,17
+    ICON            ICO_WARNING,IDC_STATIC,7,263,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,30,259,346,33
 END
 
-D_SM_ADMIN_OPTION DIALOGEX 0, 0, 310, 359
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_ADMIN_OPTION DIALOGEX 0, 0, 310, 307
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_ADMIN_OPTION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_USER_ADMIN,S_ICON,7,7,20,20
-    LTEXT           "@S_INFO",S_INFO,31,15,272,17
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,37,224,158
-    PUSHBUTTON      "@B_EDIT",B_EDIT,239,37,64,17
-    PUSHBUTTON      "@B_ADD",B_ADD,239,111,64,17,NOT WS_VISIBLE
-    PUSHBUTTON      "@B_DELETE",B_DELETE,239,140,64,17,NOT WS_VISIBLE
-    LTEXT           "@S_BOLD",S_BOLD,7,198,223,8
-    EDITTEXT        E_HELP,7,209,296,44,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
-    ICON            ICO_INFORMATION,IDC_STATIC,7,257,20,20
-    LTEXT           "@STATIC1",S_STATIC1,31,259,272,18
-    LTEXT           "@STATIC2",S_STATIC2,31,277,272,55
-    DEFPUSHBUTTON   "@IDOK",IDOK,182,335,56,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,247,335,56,17
+    ICON            ICO_USER_ADMIN,S_ICON,7,5,20,18
+    LTEXT           "@S_INFO",S_INFO,31,12,272,15
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,31,224,136
+    PUSHBUTTON      "@B_EDIT",B_EDIT,239,31,64,15
+    PUSHBUTTON      "@B_ADD",B_ADD,239,95,64,15,NOT WS_VISIBLE
+    PUSHBUTTON      "@B_DELETE",B_DELETE,239,119,64,15,NOT WS_VISIBLE
+    LTEXT           "@S_BOLD",S_BOLD,7,169,223,7
+    EDITTEXT        E_HELP,7,179,296,38,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+    ICON            ICO_INFORMATION,IDC_STATIC,7,220,20,18
+    LTEXT           "@STATIC1",S_STATIC1,31,221,272,16
+    LTEXT           "@STATIC2",S_STATIC2,31,237,272,48
+    DEFPUSHBUTTON   "@IDOK",IDOK,182,287,56,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,247,287,56,15
 END
 
-D_SM_AO_VALUE DIALOGEX 0, 0, 206, 80
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_AO_VALUE DIALOGEX 0, 0, 206, 68
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_AO_VALUE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    RTEXT           "@STATIC1",IDC_STATIC,7,17,37,11
-    COMBOBOX        C_NAME,47,15,145,168,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@STATIC2",IDC_STATIC,7,37,37,10
-    EDITTEXT        E_VALUE,47,35,67,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC3",IDC_STATIC,118,37,37,13
-    DEFPUSHBUTTON   "@IDOK",IDOK,80,57,56,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,143,57,56,16
+    RTEXT           "@STATIC1",IDC_STATIC,7,14,37,10
+    COMBOBOX        C_NAME,47,12,145,144,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@STATIC2",IDC_STATIC,7,31,37,9
+    EDITTEXT        E_VALUE,47,29,67,11,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC3",IDC_STATIC,118,31,37,12
+    DEFPUSHBUTTON   "@IDOK",IDOK,80,48,56,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,143,48,56,14
 END
 
-D_SM_L3 DIALOGEX 0, 0, 291, 298
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_L3 DIALOGEX 0, 0, 291, 255
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_L3"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,253,22
-    ICON            ICO_WARNING,IDC_STATIC,11,49,20,20
-    LTEXT           "@STATIC2",IDC_STATIC,35,45,244,58
-    GROUPBOX        "@STATIC3",IDC_STATIC,7,35,277,71
-    LTEXT           "@S_BOLD",S_BOLD,7,114,183,12
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,129,277,113
-    PUSHBUTTON      "@B_ADD",B_ADD,7,248,48,18
-    PUSHBUTTON      "@B_START",B_START,64,248,48,18
-    PUSHBUTTON      "@B_STOP",B_STOP,121,248,48,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,178,248,48,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,235,248,48,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,226,273,58,18
+    ICON            ICO_SWITCH,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,253,19
+    ICON            ICO_WARNING,IDC_STATIC,11,41,20,18
+    LTEXT           "@STATIC2",IDC_STATIC,35,38,244,50
+    GROUPBOX        "@STATIC3",IDC_STATIC,7,29,277,61
+    LTEXT           "@S_BOLD",S_BOLD,7,97,183,11
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,110,277,97
+    PUSHBUTTON      "@B_ADD",B_ADD,7,212,48,16
+    PUSHBUTTON      "@B_START",B_START,64,212,48,16
+    PUSHBUTTON      "@B_STOP",B_STOP,121,212,48,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,178,212,48,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,235,212,48,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,226,233,58,16
 END
 
-D_SM_L3_ADD DIALOGEX 0, 0, 234, 105
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_L3_ADD DIALOGEX 0, 0, 234, 89
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_L3_ADD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,32,7,195,50
-    RTEXT           "@STATIC2",IDC_STATIC,7,60,35,12
-    EDITTEXT        E_NAME,46,58,173,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,99,81,61,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,166,81,61,17
+    ICON            ICO_SWITCH,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,32,5,195,43
+    RTEXT           "@STATIC2",IDC_STATIC,7,51,35,11
+    EDITTEXT        E_NAME,46,49,173,11,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,99,69,61,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,166,69,61,15
 END
 
-D_SM_L3_SW DIALOGEX 0, 0, 298, 374
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_L3_SW DIALOGEX 0, 0, 298, 320
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_L3_SW"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH_OFFLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,260,20
-    LTEXT           "@STATIC2",IDC_STATIC,31,27,260,55
-    LTEXT           "@S_BOLD1",S_BOLD1,7,82,183,12
-    CONTROL         "",L_IF,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,95,284,94
-    PUSHBUTTON      "@B_ADD_IF",B_ADD_IF,46,195,119,18
-    PUSHBUTTON      "@B_DEL_IF",B_DEL_IF,170,195,121,18
-    LTEXT           "@S_BOLD2",S_BOLD2,7,218,183,12
-    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,232,284,88
-    PUSHBUTTON      "@B_ADD_TABLE",B_ADD_TABLE,46,323,119,18
-    PUSHBUTTON      "@B_DEL_TABLE",B_DEL_TABLE,170,323,121,18
-    PUSHBUTTON      "@B_START",B_START,7,349,58,18
-    PUSHBUTTON      "@B_STOP",B_STOP,72,349,58,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,233,349,58,18
+    ICON            ICO_SWITCH_OFFLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,260,18
+    LTEXT           "@STATIC2",IDC_STATIC,31,23,260,48
+    LTEXT           "@S_BOLD1",S_BOLD1,7,70,183,11
+    CONTROL         "",L_IF,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,81,284,81
+    PUSHBUTTON      "@B_ADD_IF",B_ADD_IF,46,167,119,16
+    PUSHBUTTON      "@B_DEL_IF",B_DEL_IF,170,167,121,16
+    LTEXT           "@S_BOLD2",S_BOLD2,7,186,183,11
+    CONTROL         "",L_TABLE,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,198,284,76
+    PUSHBUTTON      "@B_ADD_TABLE",B_ADD_TABLE,46,276,119,16
+    PUSHBUTTON      "@B_DEL_TABLE",B_DEL_TABLE,170,276,121,16
+    PUSHBUTTON      "@B_START",B_START,7,299,58,16
+    PUSHBUTTON      "@B_STOP",B_STOP,72,299,58,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,233,299,58,16
 END
 
-D_SM_L3_SW_IF DIALOGEX 0, 0, 259, 289
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_L3_SW_IF DIALOGEX 0, 0, 259, 247
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_L3_SW_IF"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,219,55
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,68,245,62
-    ICON            ICO_HUB,IDC_STATIC,12,82,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,35,83,210,18
-    RTEXT           "@STATIC4",IDC_STATIC,26,107,53,11
-    COMBOBOX        E_HUBNAME,86,105,159,150,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,135,245,118
-    ICON            ICO_PROTOCOL,IDC_STATIC,12,152,20,20
-    LTEXT           "@STATIC6",IDC_STATIC,35,147,210,59
-    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,31,212,51,11
-    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,86,210,75,13
-    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,15,230,67,11
-    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,86,228,75,13
-    DEFPUSHBUTTON   "@IDOK",IDOK,115,263,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,263,64,19
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,219,48
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,58,245,54
+    ICON            ICO_HUB,IDC_STATIC,12,70,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,35,71,210,16
+    RTEXT           "@STATIC4",IDC_STATIC,26,91,53,10
+    COMBOBOX        E_HUBNAME,86,89,159,129,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,115,245,102
+    ICON            ICO_PROTOCOL,IDC_STATIC,12,130,20,18
+    LTEXT           "@STATIC6",IDC_STATIC,35,125,210,51
+    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,31,181,51,10
+    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,86,179,75,12
+    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,15,197,67,10
+    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,86,195,75,12
+    DEFPUSHBUTTON   "@IDOK",IDOK,115,225,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,225,64,17
 END
 
-D_SM_L3_SW_TABLE DIALOGEX 0, 0, 259, 262
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_L3_SW_TABLE DIALOGEX 0, 0, 259, 224
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_L3_SW_TABLE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,219,57
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,65,245,158
-    ICON            ICO_PROTOCOL,IDC_STATIC,12,82,20,20
-    LTEXT           "@STATIC3",IDC_STATIC,35,78,210,60
-    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,15,142,67,11
-    CONTROL         "",E_NETWORK,"SysIPAddress32",WS_TABSTOP,86,140,75,13
-    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,15,160,67,10
-    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,86,158,75,13
-    RTEXT           "@S_SRC_IP_3",S_SRC_IP_3,15,178,67,11
-    CONTROL         "",E_GATEWAY,"SysIPAddress32",WS_TABSTOP,86,176,75,13
-    RTEXT           "@S_SRC_IP_4",S_SRC_IP_4,15,196,67,11
-    EDITTEXT        E_METRIC,86,194,40,14,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC4",IDC_STATIC,166,165,79,54
-    DEFPUSHBUTTON   "@IDOK",IDOK,115,236,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,236,64,19
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,219,49
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,55,245,136
+    ICON            ICO_PROTOCOL,IDC_STATIC,12,70,20,18
+    LTEXT           "@STATIC3",IDC_STATIC,35,66,210,52
+    RTEXT           "@S_SRC_IP_1",S_SRC_IP_1,15,121,67,10
+    CONTROL         "",E_NETWORK,"SysIPAddress32",WS_TABSTOP,86,119,75,12
+    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,15,137,67,9
+    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,86,135,75,12
+    RTEXT           "@S_SRC_IP_3",S_SRC_IP_3,15,152,67,10
+    CONTROL         "",E_GATEWAY,"SysIPAddress32",WS_TABSTOP,86,150,75,12
+    RTEXT           "@S_SRC_IP_4",S_SRC_IP_4,15,167,67,10
+    EDITTEXT        E_METRIC,86,166,40,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC4",IDC_STATIC,166,141,79,47
+    DEFPUSHBUTTON   "@IDOK",IDOK,115,202,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,188,202,64,17
 END
 
-D_CM_SELECT_SECURE DIALOGEX 0, 0, 295, 250
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_SELECT_SECURE DIALOGEX 0, 0, 295, 214
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_SELECT_SECURE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SECURE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,257,78
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,90,281,126
-    DEFPUSHBUTTON   "@IDOK",IDOK,154,226,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,224,226,64,17
+    ICON            ICO_SECURE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,257,67
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,77,281,108
+    DEFPUSHBUTTON   "@IDOK",IDOK,154,193,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,224,193,64,15
 END
 
-D_CM_SECURE_MANAGER DIALOGEX 0, 0, 295, 267
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_SECURE_MANAGER DIALOGEX 0, 0, 295, 228
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_SECURE_MANAGER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SECURE,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_INFO",S_INFO,31,7,257,27
-    LTEXT           "@B_BOLD",B_BOLD,7,43,141,13
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,58,187,202
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,198,57,90,17
-    PUSHBUTTON      "@B_IMPORT",B_IMPORT,198,80,90,17
-    PUSHBUTTON      "@B_EXPORT",B_EXPORT,198,103,90,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,198,126,90,17
-    PUSHBUTTON      "@B_NEW_CERT",B_NEW_CERT,198,149,90,29,BS_MULTILINE
-    ICON            ICO_KEY,IDC_STATIC,199,214,20,20
-    PUSHBUTTON      "@B_PIN",B_PIN,220,215,68,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,198,243,90,17
+    ICON            ICO_SECURE,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_INFO",S_INFO,31,5,257,24
+    LTEXT           "@B_BOLD",B_BOLD,7,36,141,12
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,49,187,174
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,198,48,90,15
+    PUSHBUTTON      "@B_IMPORT",B_IMPORT,198,68,90,15
+    PUSHBUTTON      "@B_EXPORT",B_EXPORT,198,88,90,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,198,107,90,15
+    PUSHBUTTON      "@B_NEW_CERT",B_NEW_CERT,198,127,90,25,BS_MULTILINE
+    ICON            ICO_KEY,IDC_STATIC,199,183,20,18
+    PUSHBUTTON      "@B_PIN",B_PIN,220,184,68,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,198,208,90,15
 END
 
-D_CM_SECURE_TYPE DIALOGEX 0, 0, 195, 126
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_SECURE_TYPE DIALOGEX 0, 0, 195, 107
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_SECURE_TYPE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@STATIC",IDC_STATIC,7,7,149,20
-    CONTROL         "@R_CERT",R_CERT,"Button",BS_AUTORADIOBUTTON,28,35,46,10
-    CONTROL         "@R_KEY",R_KEY,"Button",BS_AUTORADIOBUTTON,28,57,45,10
-    CONTROL         "@R_DATA",R_DATA,"Button",BS_AUTORADIOBUTTON,28,79,61,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,51,102,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,124,102,64,17
+    LTEXT           "@STATIC",IDC_STATIC,7,5,149,18
+    CONTROL         "@R_CERT",R_CERT,"Button",BS_AUTORADIOBUTTON,28,29,46,9
+    CONTROL         "@R_KEY",R_KEY,"Button",BS_AUTORADIOBUTTON,28,48,45,9
+    CONTROL         "@R_DATA",R_DATA,"Button",BS_AUTORADIOBUTTON,28,67,61,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,51,87,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,124,87,64,15
 END
 
-D_STRING DIALOGEX 0, 0, 266, 122
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_STRING DIALOGEX 0, 0, 266, 104
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_STRING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            "",S_ICON,7,6,18,21
-    LTEXT           "[INFO]",S_INFO,30,6,229,61
-    EDITTEXT        E_STRING,30,69,221,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,144,98,55,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,204,98,55,17
+    ICON            "",S_ICON,7,5,18,18
+    LTEXT           "[INFO]",S_INFO,30,5,229,53
+    EDITTEXT        E_STRING,30,59,221,11,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,144,83,55,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,204,83,55,15
 END
 
-D_SM_SELECT_KEYPAIR DIALOGEX 0, 0, 201, 283
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SELECT_KEYPAIR DIALOGEX 0, 0, 201, 242
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SELECT_KEYPAIR"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SECURE,-1,7,7,18,21
-    LTEXT           "@S_INFO",S_INFO,31,7,163,33
-    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,56,187,83
-    LTEXT           "@B_BOLD1",B_BOLD1,7,43,187,11
-    DEFPUSHBUTTON   "@IDOK",IDOK,61,257,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,130,257,64,19
-    CONTROL         "",L_KEY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,162,187,83
-    LTEXT           "@B_BOLD2",B_BOLD2,7,149,187,11
+    ICON            ICO_SECURE,-1,7,5,18,18
+    LTEXT           "@S_INFO",S_INFO,31,5,163,29
+    CONTROL         "",L_CERT,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,47,187,72
+    LTEXT           "@B_BOLD1",B_BOLD1,7,36,187,10
+    DEFPUSHBUTTON   "@IDOK",IDOK,61,220,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,130,220,64,17
+    CONTROL         "",L_KEY,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,138,187,72
+    LTEXT           "@B_BOLD2",B_BOLD2,7,127,187,10
 END
 
-D_CM_LOAD_X DIALOGEX 0, 0, 239, 209
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_LOAD_X DIALOGEX 0, 0, 239, 179
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_LOAD_X"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@STATIC1",IDC_STATIC,7,7,225,15
-    CONTROL         "@R_FROM_FILE",R_FROM_FILE,"Button",BS_AUTORADIOBUTTON,14,27,133,10
-    CONTROL         "@R_FROM_SECURE",R_FROM_SECURE,"Button",BS_AUTORADIOBUTTON,14,85,138,10
-    ICON            ICO_CERT,IDC_STATIC,25,45,20,20
-    LTEXT           "@S_FILE",S_FILE,50,48,182,26
-    ICON            ICO_SECURE,IDC_STATIC,25,104,20,20
-    LTEXT           "@S_CERT",S_CERT,50,106,182,26
-    PUSHBUTTON      "@B_SELECT",B_SELECT,50,131,110,20
-    LTEXT           "",S_INFO,45,155,187,26
-    DEFPUSHBUTTON   "@IDOK",IDOK,122,184,52,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,180,184,52,18
+    LTEXT           "@STATIC1",IDC_STATIC,7,5,225,13
+    CONTROL         "@R_FROM_FILE",R_FROM_FILE,"Button",BS_AUTORADIOBUTTON,14,23,133,9
+    CONTROL         "@R_FROM_SECURE",R_FROM_SECURE,"Button",BS_AUTORADIOBUTTON,14,72,138,9
+    ICON            ICO_CERT,IDC_STATIC,25,38,20,18
+    LTEXT           "@S_FILE",S_FILE,50,41,182,23
+    ICON            ICO_SECURE,IDC_STATIC,25,89,20,18
+    LTEXT           "@S_CERT",S_CERT,50,90,182,23
+    PUSHBUTTON      "@B_SELECT",B_SELECT,50,112,110,18
+    LTEXT           "",S_INFO,45,132,187,23
+    DEFPUSHBUTTON   "@IDOK",IDOK,122,157,52,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,180,157,52,16
 END
 
-D_CM_SECURE_PIN DIALOGEX 0, 0, 263, 221
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_SECURE_PIN DIALOGEX 0, 0, 263, 189
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_SECURE_PIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,30,7,227,40
-    RTEXT           "@STATIC2",IDC_STATIC,7,55,70,10
-    EDITTEXT        E_PIN1,81,53,144,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC3",IDC_STATIC,7,75,70,10
-    EDITTEXT        E_PIN2,81,73,144,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,7,95,70,10
-    EDITTEXT        E_PIN3,81,93,144,12,ES_PASSWORD | ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,119,249,49
-    ICON            ICO_WARNING,IDC_STATIC,14,133,20,20
-    LTEXT           "@STATIC6",IDC_STATIC,40,133,208,19
-    LTEXT           "@STATIC7",IDC_STATIC,7,177,249,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,123,197,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,192,197,64,17
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,30,5,227,35
+    RTEXT           "@STATIC2",IDC_STATIC,7,47,70,9
+    EDITTEXT        E_PIN1,81,45,144,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC3",IDC_STATIC,7,64,70,9
+    EDITTEXT        E_PIN2,81,62,144,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,7,81,70,9
+    EDITTEXT        E_PIN3,81,79,144,11,ES_PASSWORD | ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,101,249,42
+    ICON            ICO_WARNING,IDC_STATIC,14,113,20,18
+    LTEXT           "@STATIC6",IDC_STATIC,40,113,208,17
+    LTEXT           "@STATIC7",IDC_STATIC,7,151,249,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,123,168,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,192,168,64,15
 END
 
-D_SM_CRL DIALOGEX 0, 0, 335, 228
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_CRL DIALOGEX 0, 0, 335, 195
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_CRL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT_X,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,295,35
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,50,321,144
-    PUSHBUTTON      "@B_ADD",B_ADD,85,203,55,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,209,203,58,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,273,203,55,17
-    PUSHBUTTON      "@B_DELETE",B_DELETE,147,203,54,17
+    ICON            ICO_CERT_X,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,295,30
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,42,321,124
+    PUSHBUTTON      "@B_ADD",B_ADD,85,173,55,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,209,173,58,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,273,173,55,15
+    PUSHBUTTON      "@B_DELETE",B_DELETE,147,173,54,15
 END
 
-D_SM_EDIT_CRL DIALOGEX 0, 0, 351, 365
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_CRL DIALOGEX 0, 0, 351, 312
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_CRL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT_X,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,313,35
-    LTEXT           "@S_BOLD",S_BOLD,7,44,337,13
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,58,337,121
-    CONTROL         "@R_CN",R_CN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,70,76,10
-    EDITTEXT        E_CN,96,69,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_O",R_O,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,87,60,10
-    EDITTEXT        E_O,96,86,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_OU",R_OU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,80,10
-    EDITTEXT        E_OU,96,104,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_C",R_C,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,123,53,10
-    EDITTEXT        E_C,96,122,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_ST",R_ST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,141,62,10
-    EDITTEXT        E_ST,96,140,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_L",R_L,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,160,51,10
-    EDITTEXT        E_L,96,158,241,12,ES_AUTOHSCROLL
-    GROUPBOX        "@STATIC3",IDC_STATIC,7,183,337,95
-    CONTROL         "@R_SERI",R_SERI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,197,85,10
-    EDITTEXT        E_SERI,96,195,241,12,ES_AUTOHSCROLL
-    CONTROL         "@R_MD5_HASH",R_MD5_HASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,125,10
-    EDITTEXT        E_MD5_HASH,142,211,195,12,ES_AUTOHSCROLL
-    CONTROL         "@R_SHA1_HASH",R_SHA1_HASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,231,124,10
-    EDITTEXT        E_SHA1_HASH,142,229,195,12,ES_AUTOHSCROLL
-    ICON            ICO_INFORMATION,IDC_STATIC,15,246,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,39,248,298,27
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,283,337,52
-    LTEXT           "@STATIC6",IDC_STATIC,39,295,216,35
-    ICON            ICO_CERT,IDC_STATIC,14,295,20,20
-    PUSHBUTTON      "@B_LOAD",B_LOAD,257,297,79,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,225,342,56,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,288,342,56,16
+    ICON            ICO_CERT_X,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,313,30
+    LTEXT           "@S_BOLD",S_BOLD,7,37,337,12
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,49,337,104
+    CONTROL         "@R_CN",R_CN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,59,76,9
+    EDITTEXT        E_CN,96,59,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_O",R_O,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,74,60,9
+    EDITTEXT        E_O,96,73,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_OU",R_OU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,88,80,9
+    EDITTEXT        E_OU,96,89,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_C",R_C,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,105,53,9
+    EDITTEXT        E_C,96,104,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_ST",R_ST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,62,9
+    EDITTEXT        E_ST,96,119,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_L",R_L,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,137,51,9
+    EDITTEXT        E_L,96,135,241,11,ES_AUTOHSCROLL
+    GROUPBOX        "@STATIC3",IDC_STATIC,7,156,337,82
+    CONTROL         "@R_SERI",R_SERI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,168,85,9
+    EDITTEXT        E_SERI,96,167,241,11,ES_AUTOHSCROLL
+    CONTROL         "@R_MD5_HASH",R_MD5_HASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,183,125,9
+    EDITTEXT        E_MD5_HASH,142,180,195,11,ES_AUTOHSCROLL
+    CONTROL         "@R_SHA1_HASH",R_SHA1_HASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,197,124,9
+    EDITTEXT        E_SHA1_HASH,142,196,195,11,ES_AUTOHSCROLL
+    ICON            ICO_INFORMATION,IDC_STATIC,15,210,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,39,212,298,24
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,242,337,45
+    LTEXT           "@STATIC6",IDC_STATIC,39,252,216,30
+    ICON            ICO_CERT,IDC_STATIC,14,252,20,18
+    PUSHBUTTON      "@B_LOAD",B_LOAD,257,254,79,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,225,293,56,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,288,293,56,14
 END
 
-D_SM_AC_LIST DIALOGEX 0, 0, 309, 230
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_AC_LIST DIALOGEX 0, 0, 309, 197
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_AC_LIST"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INTERNET,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,7,269,26
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,38,222,158
-    PUSHBUTTON      "@B_ADD",B_ADD,234,39,68,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,234,61,68,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,234,83,68,18
-    PUSHBUTTON      "@B_SAVE",B_SAVE,234,178,68,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,234,205,68,18
-    LTEXT           "@STATIC1",IDC_STATIC,235,110,67,28
-    ICON            ICO_INFORMATION,IDC_STATIC,7,202,20,20
-    LTEXT           "@STATIC2",IDC_STATIC,28,203,205,20
+    ICON            ICO_INTERNET,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,5,269,23
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,32,222,136
+    PUSHBUTTON      "@B_ADD",B_ADD,234,33,68,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,234,52,68,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,234,71,68,16
+    PUSHBUTTON      "@B_SAVE",B_SAVE,234,152,68,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,234,175,68,16
+    LTEXT           "@STATIC1",IDC_STATIC,235,94,67,24
+    ICON            ICO_INFORMATION,IDC_STATIC,7,173,20,18
+    LTEXT           "@STATIC2",IDC_STATIC,28,173,205,18
 END
 
-D_SM_AC DIALOGEX 0, 0, 310, 311
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_AC DIALOGEX 0, 0, 310, 266
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_AC"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INTERNET,S_ICON,7,6,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,33,6,270,29
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,38,296,130
-    LTEXT           "@STATIC3",IDC_STATIC,14,52,281,12
-    CONTROL         "IPv&4",R_IPV4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,110,68,38,10
-    CONTROL         "IPv&6",R_IPV6,"Button",BS_AUTORADIOBUTTON,155,68,91,10
-    RTEXT           "@STATIC9",IDC_STATIC,14,69,87,12
-    CONTROL         "@R_SINGLE",R_SINGLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,87,274,13
-    CONTROL         "@R_MASKED",R_MASKED,"Button",BS_AUTORADIOBUTTON,21,105,275,13
-    RTEXT           "@STATIC4",IDC_STATIC,21,126,80,11
-    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,110,123,81,13
-    RTEXT           "@S_MASK",S_MASK,21,146,80,11
-    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,110,144,81,13
-    GROUPBOX        "@STATIC5",IDC_STATIC,7,182,296,37
-    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,198,87,10
-    CONTROL         "@R_DENY",R_DENY,"Button",BS_AUTORADIOBUTTON,112,198,91,10
-    GROUPBOX        "@STATIC6",IDC_STATIC,7,227,296,53
-    RTEXT           "@STATIC7",IDC_STATIC,16,249,47,11
-    EDITTEXT        E_PRIORITY,69,247,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC8",IDC_STATIC,112,249,181,13
-    DEFPUSHBUTTON   "@IDOK",IDOK,168,285,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,239,285,64,19
-    EDITTEXT        E_IPV6,110,123,186,13,ES_AUTOHSCROLL
-    EDITTEXT        E_MASKV6,110,143,186,13,ES_AUTOHSCROLL
+    ICON            ICO_INTERNET,S_ICON,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,270,25
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,32,296,112
+    LTEXT           "@STATIC3",IDC_STATIC,14,44,281,11
+    CONTROL         "IPv&4",R_IPV4,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,110,58,38,9
+    CONTROL         "IPv&6",R_IPV6,"Button",BS_AUTORADIOBUTTON,155,58,91,9
+    RTEXT           "@STATIC9",IDC_STATIC,14,59,87,11
+    CONTROL         "@R_SINGLE",R_SINGLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,74,274,12
+    CONTROL         "@R_MASKED",R_MASKED,"Button",BS_AUTORADIOBUTTON,21,89,275,12
+    RTEXT           "@STATIC4",IDC_STATIC,21,107,80,10
+    CONTROL         "",E_IP,"SysIPAddress32",WS_TABSTOP,110,105,81,12
+    RTEXT           "@S_MASK",S_MASK,21,125,80,10
+    CONTROL         "",E_MASK,"SysIPAddress32",WS_TABSTOP,110,123,81,12
+    GROUPBOX        "@STATIC5",IDC_STATIC,7,155,296,32
+    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,21,169,87,9
+    CONTROL         "@R_DENY",R_DENY,"Button",BS_AUTORADIOBUTTON,112,169,91,9
+    GROUPBOX        "@STATIC6",IDC_STATIC,7,194,296,46
+    RTEXT           "@STATIC7",IDC_STATIC,16,213,47,10
+    EDITTEXT        E_PRIORITY,69,211,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC8",IDC_STATIC,112,213,181,12
+    DEFPUSHBUTTON   "@IDOK",IDOK,168,244,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,239,244,64,17
+    EDITTEXT        E_IPV6,110,105,186,12,ES_AUTOHSCROLL
+    EDITTEXT        E_MASKV6,110,122,186,12,ES_AUTOHSCROLL
 END
 
-D_SM_LOG_FILE DIALOGEX 0, 0, 398, 340
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_LOG_FILE DIALOGEX 0, 0, 398, 291
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_LOG_FILE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_LOG2,IDC_STATIC,7,7,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,26,7,365,37
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,49,384,257
-    DEFPUSHBUTTON   "@IDOK",IDOK,7,314,80,19
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,99,314,80,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,311,314,80,19
+    ICON            ICO_LOG2,IDC_STATIC,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,26,5,365,32
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,7,41,384,221
+    DEFPUSHBUTTON   "@IDOK",IDOK,7,269,80,17
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,99,269,80,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,311,269,80,17
 END
 
-D_SM_READ_LOG_FILE DIALOGEX 0, 0, 287, 111
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_READ_LOG_FILE DIALOGEX 0, 0, 287, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_READ_LOG_FILE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_INFO2",S_INFO2,7,7,273,31
-    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER | WS_TABSTOP,7,40,273,14
-    CTEXT           "--",S_INFO,7,61,273,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,102,86,83,18
+    LTEXT           "@S_INFO2",S_INFO2,7,5,273,27
+    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER | WS_TABSTOP,7,34,273,12
+    CTEXT           "--",S_INFO,7,52,273,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,102,73,83,16
 END
 
-D_SM_SAVE_LOG DIALOGEX 0, 0, 271, 82
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SAVE_LOG DIALOGEX 0, 0, 271, 70
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SAVE_LOG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_LOG2,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_INFO",S_INFO,27,7,237,36
-    DEFPUSHBUTTON   "@IDOK",IDOK,58,58,65,17
-    PUSHBUTTON      "@B_SAVE",B_SAVE,129,58,65,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,199,58,65,17
+    ICON            ICO_LOG2,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_INFO",S_INFO,27,5,237,31
+    DEFPUSHBUTTON   "@IDOK",IDOK,58,49,65,15
+    PUSHBUTTON      "@B_SAVE",B_SAVE,129,49,65,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,199,49,65,15
 END
 
-D_TCP DIALOGEX 0, 0, 331, 316
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_TCP DIALOGEX 0, 0, 331, 270
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_TCP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SETUP,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,269,53
-    LTEXT           "@STATIC2",IDC_STATIC,33,64,269,34
-    GROUPBOX        "@STATIC3",IDC_STATIC,33,101,269,151
-    ICON            ICO_PROTOCOL,IDC_STATIC,40,110,20,20
-    LTEXT           "@STATIC4",IDC_STATIC,65,112,174,11
-    CONTROL         "@R_RECV_DISABLE",R_RECV_DISABLE,"Button",BS_AUTORADIOBUTTON,73,123,175,10
-    CONTROL         "@R_RECV_ENABLE",R_RECV_ENABLE,"Button",BS_AUTORADIOBUTTON,73,138,183,10
-    EDITTEXT        E_RECV,84,153,48,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_RECV",S_RECV,137,155,33,11
-    PUSHBUTTON      "@B_RECV",B_RECV,177,149,67,17
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,54,177,194,1
-    LTEXT           "@STATIC5",IDC_STATIC,65,184,115,8
-    CONTROL         "@R_SEND_DISABLE",R_SEND_DISABLE,"Button",BS_AUTORADIOBUTTON,73,198,166,10
-    CONTROL         "@R_SEND_ENABLE",R_SEND_ENABLE,"Button",BS_AUTORADIOBUTTON,73,213,172,10
-    EDITTEXT        E_SEND,84,229,48,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_SEND",S_SEND,137,231,33,11
-    PUSHBUTTON      "@B_SEND",B_SEND,177,225,66,17
-    ICON            ICO_WARNING,IDC_STATIC,16,258,20,20
-    LTEXT           "@STATIC6",IDC_STATIC,42,259,270,29
-    PUSHBUTTON      "@B_DELETE",B_DELETE,7,290,170,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,188,290,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,260,290,64,19
+    ICON            ICO_SETUP,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,269,46
+    LTEXT           "@STATIC2",IDC_STATIC,33,54,269,30
+    GROUPBOX        "@STATIC3",IDC_STATIC,33,86,269,130
+    ICON            ICO_PROTOCOL,IDC_STATIC,40,94,20,18
+    LTEXT           "@STATIC4",IDC_STATIC,65,95,174,10
+    CONTROL         "@R_RECV_DISABLE",R_RECV_DISABLE,"Button",BS_AUTORADIOBUTTON,73,105,175,9
+    CONTROL         "@R_RECV_ENABLE",R_RECV_ENABLE,"Button",BS_AUTORADIOBUTTON,73,118,183,9
+    EDITTEXT        E_RECV,84,131,48,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_RECV",S_RECV,137,132,33,10
+    PUSHBUTTON      "@B_RECV",B_RECV,177,127,67,15
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,54,151,194,1
+    LTEXT           "@STATIC5",IDC_STATIC,65,157,115,7
+    CONTROL         "@R_SEND_DISABLE",R_SEND_DISABLE,"Button",BS_AUTORADIOBUTTON,73,169,166,9
+    CONTROL         "@R_SEND_ENABLE",R_SEND_ENABLE,"Button",BS_AUTORADIOBUTTON,73,182,172,9
+    EDITTEXT        E_SEND,84,196,48,11,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_SEND",S_SEND,137,197,33,10
+    PUSHBUTTON      "@B_SEND",B_SEND,177,192,66,15
+    ICON            ICO_WARNING,IDC_STATIC,16,221,20,18
+    LTEXT           "@STATIC6",IDC_STATIC,42,221,270,25
+    PUSHBUTTON      "@B_DELETE",B_DELETE,7,248,170,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,188,248,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,260,248,64,17
 END
 
-D_TCP_MSG DIALOGEX 0, 0, 247, 207
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
+D_TCP_MSG DIALOGEX 0, 0, 247, 177
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "@D_TCP_MSG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SETUP,IDC_STATIC,7,7,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,209,50
-    ICON            ICO_WARNING,IDC_STATIC,7,171,18,21
-    LTEXT           "@STATIC2",IDC_STATIC,32,171,208,37
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,162,233,1
-    CONTROL         "@R_OPTIMIZE",R_OPTIMIZE,"Button",BS_AUTORADIOBUTTON,31,62,209,16
-    CONTROL         "@R_MANUAL",R_MANUAL,"Button",BS_AUTORADIOBUTTON,31,85,209,15
-    CONTROL         "@R_NO",R_NO,"Button",BS_AUTORADIOBUTTON,31,107,209,16
-    DEFPUSHBUTTON   "@IDOK",IDOK,174,134,66,18
-    PUSHBUTTON      "@IDOK3",IDOK3,105,134,66,18,WS_DISABLED
+    ICON            ICO_SETUP,IDC_STATIC,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,209,43
+    ICON            ICO_WARNING,IDC_STATIC,7,146,18,18
+    LTEXT           "@STATIC2",IDC_STATIC,32,146,208,32
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,138,233,1
+    CONTROL         "@R_OPTIMIZE",R_OPTIMIZE,"Button",BS_AUTORADIOBUTTON,31,53,209,14
+    CONTROL         "@R_MANUAL",R_MANUAL,"Button",BS_AUTORADIOBUTTON,31,72,209,13
+    CONTROL         "@R_NO",R_NO,"Button",BS_AUTORADIOBUTTON,31,91,209,14
+    DEFPUSHBUTTON   "@IDOK",IDOK,174,114,66,16
+    PUSHBUTTON      "@IDOK3",IDOK3,105,114,66,16,WS_DISABLED
 END
 
-D_CM_PKCSEULA DIALOGEX 0, 0, 267, 158
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_PKCSEULA DIALOGEX 0, 0, 267, 135
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_PKCSEULA"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INFORMATION,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_INFO_1",S_INFO_1,32,7,228,27
-    LTEXT           "@S_INFO_2",S_INFO_2,32,41,228,58
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,31,103,229,1
-    LTEXT           "@S_INFO_3",S_INFO_3,32,110,228,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,146,134,55,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,205,134,55,17
+    ICON            ICO_INFORMATION,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_INFO_1",S_INFO_1,32,5,228,24
+    LTEXT           "@S_INFO_2",S_INFO_2,32,35,228,50
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,31,88,229,1
+    LTEXT           "@S_INFO_3",S_INFO_3,32,94,228,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,146,114,55,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,205,114,55,15
 END
 
-D_CM_KAKUSHI DIALOGEX 0, 0, 365, 273
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_SYSMENU
+D_CM_KAKUSHI DIALOGEX 0, 0, 365, 233
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
 EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,19,57,18,21
-    LTEXT           "STRING HERE !!",S_INFO,56,61,302,132
-    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,7,201,351,16
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,19,48,18,18
+    LTEXT           "STRING HERE !!",S_INFO,56,52,302,114
+    CONTROL         "",P_PROGRESS,"msctls_progress32",WS_BORDER,7,172,351,14
 END
 
-D_CM_TRAFFIC DIALOGEX 0, 0, 395, 360
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_TRAFFIC DIALOGEX 0, 0, 395, 308
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_TRAFFIC"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,30,7,342,39
-    LTEXT           "@STATIC2",IDC_STATIC,30,46,342,32
-    GROUPBOX        "@S_1",S_1,30,74,342,254
-    LTEXT           "@S_3",S_3,61,86,301,14
-    CONTROL         "@R_SERVER",R_SERVER,"Button",BS_AUTORADIOBUTTON,109,99,72,10
-    CONTROL         "@R_CLIENT",R_CLIENT,"Button",BS_AUTORADIOBUTTON,196,99,72,10
-    ICON            ICO_TOWER,IDC_STATIC,38,85,20,20
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,41,114,319,1
-    ICON            ICO_PROTOCOL,IDC_STATIC,38,119,20,20
-    LTEXT           "@S_4",S_4,61,120,301,29
-    RTEXT           "@S_5",S_5,34,152,117,10
-    COMBOBOX        C_HOST,157,149,147,121,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_6",S_6,35,170,116,11
-    COMBOBOX        C_PORT,157,168,40,121,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "@S_7",S_7,202,170,51,10
-    LTEXT           "@S_8",S_8,61,184,301,14
-    GROUPBOX        "@S_9",S_9,68,199,287,56
-    CONTROL         "@R_DOWNLOAD",R_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,75,210,256,10
-    CONTROL         "@R_UPLOAD",R_UPLOAD,"Button",BS_AUTORADIOBUTTON,75,225,256,10
-    CONTROL         "@R_FULL",R_FULL,"Button",BS_AUTORADIOBUTTON,75,240,256,10
-    GROUPBOX        "@S_10",S_10,68,258,287,62
-    RTEXT           "@S_11",S_11,75,272,168,9
-    COMBOBOX        C_NUM,246,269,40,110,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_12",S_12,75,289,168,10
-    EDITTEXT        E_SPAN,246,287,40,12,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_13",S_13,289,288,58,10
-    CONTROL         "@R_ETHERNET",R_ETHERNET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,304,165,10
-    CONTROL         "@R_DOUBLE",R_DOUBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,304,105,10
-    LTEXT           "@S_14",S_14,289,271,54,10
-    DEFPUSHBUTTON   "@IDOK",IDOK,255,336,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,323,336,64,17
-    LTEXT           "@S_15",S_15,7,329,244,24
+    ICON            ICO_SWITCH,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,30,5,342,34
+    LTEXT           "@STATIC2",IDC_STATIC,30,39,342,28
+    GROUPBOX        "@S_1",S_1,30,63,342,218
+    LTEXT           "@S_3",S_3,61,73,301,12
+    CONTROL         "@R_SERVER",R_SERVER,"Button",BS_AUTORADIOBUTTON,109,84,72,9
+    CONTROL         "@R_CLIENT",R_CLIENT,"Button",BS_AUTORADIOBUTTON,196,84,72,9
+    ICON            ICO_TOWER,IDC_STATIC,38,72,20,18
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,41,97,319,1
+    ICON            ICO_PROTOCOL,IDC_STATIC,38,101,20,18
+    LTEXT           "@S_4",S_4,61,102,301,25
+    RTEXT           "@S_5",S_5,34,130,117,9
+    COMBOBOX        C_HOST,157,127,147,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_6",S_6,35,145,116,10
+    COMBOBOX        C_PORT,157,143,40,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "@S_7",S_7,202,145,51,9
+    LTEXT           "@S_8",S_8,61,157,301,12
+    GROUPBOX        "@S_9",S_9,68,170,287,48
+    CONTROL         "@R_DOWNLOAD",R_DOWNLOAD,"Button",BS_AUTORADIOBUTTON,75,179,256,9
+    CONTROL         "@R_UPLOAD",R_UPLOAD,"Button",BS_AUTORADIOBUTTON,75,192,256,9
+    CONTROL         "@R_FULL",R_FULL,"Button",BS_AUTORADIOBUTTON,75,205,256,9
+    GROUPBOX        "@S_10",S_10,68,221,287,54
+    RTEXT           "@S_11",S_11,75,233,168,8
+    COMBOBOX        C_NUM,246,230,40,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_12",S_12,75,247,168,9
+    EDITTEXT        E_SPAN,246,245,40,11,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_13",S_13,289,246,58,9
+    CONTROL         "@R_ETHERNET",R_ETHERNET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,260,165,9
+    CONTROL         "@R_DOUBLE",R_DOUBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,260,105,9
+    LTEXT           "@S_14",S_14,289,232,54,9
+    DEFPUSHBUTTON   "@IDOK",IDOK,255,287,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,323,287,64,15
+    LTEXT           "@S_15",S_15,7,281,244,21
 END
 
-D_CM_TRAFFIC_RUN DIALOGEX 0, 0, 359, 302
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_TRAFFIC_RUN DIALOGEX 0, 0, 359, 258
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_TRAFFIC_RUN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_INFO",S_INFO,30,7,322,25
-    EDITTEXT        E_EDIT,7,35,345,207,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
-    LTEXT           "@STATIC1",IDC_STATIC,7,274,274,21
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,288,278,64,17
+    ICON            ICO_SWITCH,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_INFO",S_INFO,30,5,322,22
+    EDITTEXT        E_EDIT,7,29,345,178,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+    LTEXT           "@STATIC1",IDC_STATIC,7,234,274,18
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,288,238,64,15
 END
 
-D_CM_TRAFFIC_RESULT DIALOGEX 0, 0, 330, 228
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_TRAFFIC_RESULT DIALOGEX 0, 0, 330, 195
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_TRAFFIC_RESULT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SWITCH,IDC_STATIC,7,7,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,29,7,220,20
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,35,316,164
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,259,204,64,17
+    ICON            ICO_SWITCH,IDC_STATIC,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,29,5,220,18
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,29,316,141
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,259,174,64,15
 END
 
-D_SM_LICENSE DIALOGEX 0, 0, 427, 367
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_LICENSE DIALOGEX 0, 0, 427, 314
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_LICENSE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,389,29
-    LTEXT           "@S_BOLD",S_BOLD,7,39,159,12
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,54,413,80
-    PUSHBUTTON      "@B_OBTAIN",B_OBTAIN,7,141,109,19
-    LTEXT           "@STATIC2",IDC_STATIC,7,167,141,28
-    PUSHBUTTON      "@B_ADD",B_ADD,162,141,105,19
-    PUSHBUTTON      "@B_DEL",B_DEL,273,141,48,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,327,141,93,19
-    LTEXT           "@STATIC3",IDC_STATIC,163,167,257,29
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,197,411,1
-    LTEXT           "@S_BOLD2",S_BOLD2,7,203,198,12
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,219,346,141
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,360,342,60,18
+    ICON            ICO_CERT,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,389,25
+    LTEXT           "@S_BOLD",S_BOLD,7,33,159,11
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,46,413,69
+    PUSHBUTTON      "@B_OBTAIN",B_OBTAIN,7,120,109,17
+    LTEXT           "@STATIC2",IDC_STATIC,7,143,141,24
+    PUSHBUTTON      "@B_ADD",B_ADD,162,120,105,17
+    PUSHBUTTON      "@B_DEL",B_DEL,273,120,48,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,327,120,93,17
+    LTEXT           "@STATIC3",IDC_STATIC,163,143,257,25
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,168,411,1
+    LTEXT           "@S_BOLD2",S_BOLD2,7,173,198,11
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,187,346,121
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,360,293,60,16
 END
 
-D_SM_LICENSE_ADD DIALOGEX 0, 0, 359, 268
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_LICENSE_ADD DIALOGEX 0, 0, 359, 229
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_LICENSE_ADD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_INFO",S_INFO,33,6,319,26
-    LTEXT           "@STATIC1",IDC_STATIC,33,28,319,73
-    GROUPBOX        "@STATIC2",IDC_STATIC,21,101,320,81
-    LTEXT           "@STATIC3",IDC_STATIC,31,120,301,20
-    EDITTEXT        B_KEY1,30,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY2,83,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY3,135,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY4,187,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY5,239,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY6,291,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    CTEXT           "-",IDC_STATIC,74,150,8,8
-    CTEXT           "-",IDC_STATIC,126,150,8,8
-    CTEXT           "-",IDC_STATIC,178,150,8,8
-    CTEXT           "-",IDC_STATIC,230,150,8,8
-    CTEXT           "-",IDC_STATIC,282,150,8,8
-    LTEXT           "@B_INFO2",B_INFO2,35,195,317,42
-    ICON            ICO_WARNING,IDC_STATIC,13,196,20,20
-    DEFPUSHBUTTON   "@IDOK",IDOK,229,242,58,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,294,242,58,18
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_INFO",S_INFO,33,5,319,23
+    LTEXT           "@STATIC1",IDC_STATIC,33,23,319,63
+    GROUPBOX        "@STATIC2",IDC_STATIC,21,86,320,70
+    LTEXT           "@STATIC3",IDC_STATIC,31,102,301,18
+    EDITTEXT        B_KEY1,30,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY2,83,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY3,135,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY4,187,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY5,239,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY6,291,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    CTEXT           "-",IDC_STATIC,74,128,8,7
+    CTEXT           "-",IDC_STATIC,126,128,8,7
+    CTEXT           "-",IDC_STATIC,178,128,8,7
+    CTEXT           "-",IDC_STATIC,230,128,8,7
+    CTEXT           "-",IDC_STATIC,282,128,8,7
+    LTEXT           "@B_INFO2",B_INFO2,35,167,317,36
+    ICON            ICO_WARNING,IDC_STATIC,13,167,20,18
+    DEFPUSHBUTTON   "@IDOK",IDOK,229,207,58,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,294,207,58,16
 END
 
-D_FREEINFO DIALOGEX 0, 0, 323, 242
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_FREEINFO DIALOGEX 0, 0, 323, 207
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_FREEINFO"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INFORMATION,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_INFO_1",S_INFO_1,32,7,284,34
-    LTEXT           "@S_INFO_2",S_INFO_2,7,45,309,35
-    LTEXT           "@S_INFO_3",S_INFO_3,14,85,302,29
-    LTEXT           "@S_INFO_4",S_INFO_4,7,118,309,98
-    CONTROL         "@B_HIDE",B_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,218,148,17
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,257,218,59,17
+    ICON            ICO_INFORMATION,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_INFO_1",S_INFO_1,32,5,284,30
+    LTEXT           "@S_INFO_2",S_INFO_2,7,38,309,30
+    LTEXT           "@S_INFO_3",S_INFO_3,14,72,302,25
+    LTEXT           "@S_INFO_4",S_INFO_4,7,101,309,84
+    CONTROL         "@B_HIDE",B_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,186,148,15
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,257,186,59,15
 END
 
-D_EM_LICENSE_ADD DIALOGEX 0, 0, 359, 268
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_LICENSE_ADD DIALOGEX 0, 0, 359, 229
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_LICENSE_ADD"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_INFO",S_INFO,33,7,319,26
-    LTEXT           "@STATIC1",IDC_STATIC,33,36,319,57
-    GROUPBOX        "@STATIC2",IDC_STATIC,21,101,320,81
-    LTEXT           "@STATIC3",IDC_STATIC,31,120,301,20
-    EDITTEXT        B_KEY1,30,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY2,83,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY3,135,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY4,187,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY5,239,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    EDITTEXT        B_KEY6,291,145,43,17,ES_UPPERCASE | ES_AUTOHSCROLL
-    CTEXT           "-",IDC_STATIC,74,150,8,8
-    CTEXT           "-",IDC_STATIC,126,150,8,8
-    CTEXT           "-",IDC_STATIC,178,150,8,8
-    CTEXT           "-",IDC_STATIC,230,150,8,8
-    CTEXT           "-",IDC_STATIC,282,150,8,8
-    LTEXT           "@B_INFO2",B_INFO2,35,195,317,42
-    ICON            ICO_WARNING,IDC_STATIC,13,196,20,20
-    DEFPUSHBUTTON   "@IDOK",IDOK,229,242,58,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,294,242,58,18
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_INFO",S_INFO,33,5,319,23
+    LTEXT           "@STATIC1",IDC_STATIC,33,30,319,49
+    GROUPBOX        "@STATIC2",IDC_STATIC,21,86,320,70
+    LTEXT           "@STATIC3",IDC_STATIC,31,102,301,18
+    EDITTEXT        B_KEY1,30,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY2,83,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY3,135,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY4,187,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY5,239,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    EDITTEXT        B_KEY6,291,124,43,15,ES_UPPERCASE | ES_AUTOHSCROLL
+    CTEXT           "-",IDC_STATIC,74,128,8,7
+    CTEXT           "-",IDC_STATIC,126,128,8,7
+    CTEXT           "-",IDC_STATIC,178,128,8,7
+    CTEXT           "-",IDC_STATIC,230,128,8,7
+    CTEXT           "-",IDC_STATIC,282,128,8,7
+    LTEXT           "@B_INFO2",B_INFO2,35,167,317,36
+    ICON            ICO_WARNING,IDC_STATIC,13,167,20,18
+    DEFPUSHBUTTON   "@IDOK",IDOK,229,207,58,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,294,207,58,16
 END
 
-D_EM_LICENSE DIALOGEX 0, 0, 427, 362
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_LICENSE DIALOGEX 0, 0, 427, 310
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_LICENSE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_CERT,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,389,29
-    LTEXT           "@S_BOLD",S_BOLD,7,39,159,12
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,54,413,158
-    PUSHBUTTON      "@B_OBTAIN",B_OBTAIN,7,218,82,19
-    LTEXT           "@STATIC2",IDC_STATIC,7,243,141,28
-    PUSHBUTTON      "@B_ADD",B_ADD,162,218,105,19
-    PUSHBUTTON      "@B_DEL",B_DEL,273,218,48,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,327,218,93,19
-    LTEXT           "@STATIC3",IDC_STATIC,163,243,257,21
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,274,413,1
-    LTEXT           "@S_BOLD2",S_BOLD2,7,279,198,12
-    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,291,306,64
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,356,337,64,18
+    ICON            ICO_CERT,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,389,25
+    LTEXT           "@S_BOLD",S_BOLD,7,33,159,11
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,46,413,136
+    PUSHBUTTON      "@B_OBTAIN",B_OBTAIN,7,186,82,17
+    LTEXT           "@STATIC2",IDC_STATIC,7,208,141,24
+    PUSHBUTTON      "@B_ADD",B_ADD,162,186,105,17
+    PUSHBUTTON      "@B_DEL",B_DEL,273,186,48,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,327,186,93,17
+    LTEXT           "@STATIC3",IDC_STATIC,163,208,257,18
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,234,413,1
+    LTEXT           "@S_BOLD2",S_BOLD2,7,239,198,11
+    CONTROL         "",L_STATUS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,249,306,55
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,356,288,64,16
 END
 
-D_EM_REMOTE DIALOGEX 0, 0, 275, 175
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_EM_REMOTE DIALOGEX 0, 0, 275, 149
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_EM_REMOTE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TEST,S_ICON,7,7,20,20
-    LTEXT           "S_TITLE",S_TITLE,31,7,237,64
-    GROUPBOX        "@STATIC1",-1,26,78,222,61
-    CONTROL         "@R_LOCAL",R_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,92,200,17
-    RTEXT           "@S_HOSTNAME",S_HOSTNAME,33,115,49,11
-    COMBOBOX        C_HOSTNAME,86,113,150,106,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "@B_ABOUT",B_ABOUT,14,152,50,16
-    DEFPUSHBUTTON   "@IDOK",IDOK,158,152,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,152,52,16
+    ICON            ICO_TEST,S_ICON,7,5,20,18
+    LTEXT           "S_TITLE",S_TITLE,31,5,237,55
+    GROUPBOX        "@STATIC1",-1,26,66,222,53
+    CONTROL         "@R_LOCAL",R_LOCAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,78,200,15
+    RTEXT           "@S_HOSTNAME",S_HOSTNAME,33,98,49,10
+    COMBOBOX        C_HOSTNAME,86,96,150,91,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "@B_ABOUT",B_ABOUT,14,130,50,14
+    DEFPUSHBUTTON   "@IDOK",IDOK,158,130,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,216,130,52,14
 END
 
-D_CM_SETTING DIALOGEX 0, 0, 283, 339
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_SETTING DIALOGEX 0, 0, 283, 290
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_SETTING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_VPN,IDC_STATIC,7,7,18,21
-    LTEXT           "@STATIC1",IDC_STATIC,33,7,243,23
-    CONTROL         "@R_NORMAL",R_NORMAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,39,201,10
-    CONTROL         "@R_EASY",R_EASY,"Button",BS_AUTORADIOBUTTON,15,86,201,10
-    LTEXT           "@STATIC2",IDC_STATIC,25,56,250,28
-    LTEXT           "@STATIC3",IDC_STATIC,25,101,250,30
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,136,269,1
-    LTEXT           "@STATIC4",IDC_STATIC,26,146,250,35
-    CONTROL         "@R_LOCK",R_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,185,135,10
-    LTEXT           "@S_PASSWORD1",S_PASSWORD1,26,200,250,19
-    RTEXT           "@S_PASSWORD2",S_PASSWORD2,26,227,50,12
-    EDITTEXT        E_PASSWORD1,81,225,140,12,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "@S_PASSWORD3",S_PASSWORD3,26,245,50,11
-    EDITTEXT        E_PASSWORD2,81,243,140,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "",S_VGS1,"Static",SS_ETCHEDHORZ,7,267,268,1
-    ICON            ICO_RESEARCH,S_VGS3,7,275,18,21
-    LTEXT           "@S_VGS2",S_VGS2,33,277,186,11
-    PUSHBUTTON      "@B_VGS",B_VGS,32,291,97,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,143,315,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,315,64,17
+    ICON            ICO_VPN,IDC_STATIC,7,5,18,18
+    LTEXT           "@STATIC1",IDC_STATIC,33,5,243,20
+    CONTROL         "@R_NORMAL",R_NORMAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,33,201,9
+    CONTROL         "@R_EASY",R_EASY,"Button",BS_AUTORADIOBUTTON,15,73,201,9
+    LTEXT           "@STATIC2",IDC_STATIC,25,47,250,24
+    LTEXT           "@STATIC3",IDC_STATIC,25,86,250,26
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,116,269,1
+    LTEXT           "@STATIC4",IDC_STATIC,26,125,250,30
+    CONTROL         "@R_LOCK",R_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,158,135,9
+    LTEXT           "@S_PASSWORD1",S_PASSWORD1,26,171,250,17
+    RTEXT           "@S_PASSWORD2",S_PASSWORD2,26,194,50,11
+    EDITTEXT        E_PASSWORD1,81,192,140,11,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "@S_PASSWORD3",S_PASSWORD3,26,209,50,10
+    EDITTEXT        E_PASSWORD2,81,208,140,11,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "",S_VGS1,"Static",SS_ETCHEDHORZ,7,228,268,1
+    ICON            ICO_RESEARCH,S_VGS3,7,235,18,18
+    LTEXT           "@S_VGS2",S_VGS2,33,237,186,10
+    PUSHBUTTON      "@B_VGS",B_VGS,32,249,97,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,143,269,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,212,269,64,15
 END
 
-D_CM_EASY DIALOGEX 0, 0, 307, 261
-STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CM_EASY DIALOGEX 0, 0, 307, 223
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CM_EASY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         ICO_TRAY1,IDC_STATIC,"Static",SS_BITMAP,0,0,308,53
-    LTEXT           "@S_TITLE",S_TITLE,32,61,267,19
-    ICON            ICO_VPN,IDC_STATIC,7,60,20,20
-    CONTROL         "",L_ACCOUNT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,103,293,95
-    PUSHBUTTON      "--BUTTON--",IDOK,92,203,123,24
-    LTEXT           "--INFO--",S_INFO,12,85,288,16
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,232,294,1
-    PUSHBUTTON      "@B_MODE",B_MODE,7,237,84,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,247,237,53,18
-    PUSHBUTTON      "@B_STATUS",B_STATUS,216,206,84,18
-    PUSHBUTTON      "@B_VGC",B_VGC,112,237,84,18
+    CONTROL         ICO_TRAY1,IDC_STATIC,"Static",SS_BITMAP,0,0,308,46
+    LTEXT           "@S_TITLE",S_TITLE,32,52,267,17
+    ICON            ICO_VPN,IDC_STATIC,7,51,20,18
+    CONTROL         "",L_ACCOUNT,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_EDITLABELS | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,88,293,82
+    PUSHBUTTON      "--BUTTON--",IDOK,92,173,123,21
+    LTEXT           "--INFO--",S_INFO,12,72,288,14
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,198,294,1
+    PUSHBUTTON      "@B_MODE",B_MODE,7,203,84,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,247,203,53,16
+    PUSHBUTTON      "@B_STATUS",B_STATUS,216,176,84,16
+    PUSHBUTTON      "@B_VGC",B_VGC,112,203,84,16
 END
 
-D_SM_SETUP DIALOGEX 0, 0, 447, 364
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SETUP DIALOGEX 0, 0, 447, 311
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CLIENTEDGE
 CAPTION "@D_SM_SETUP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SETUP,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_TITLE",S_TITLE,31,7,409,19
-    LTEXT           "@IDC_STATIC_1",IDC_STATIC,7,31,433,27
-    LTEXT           "@S_BOLD",S_BOLD,7,60,433,24
-    CONTROL         "@C_REMOTE",C_REMOTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,84,226,13
-    CONTROL         ICO_TRAY3,IDC_STATIC,"Static",SS_BITMAP,291,86,70,72
-    LTEXT           "@S_REMOTE_1",S_REMOTE_1,22,101,262,51
-    CONTROL         ICO_TRAY2,IDC_STATIC,"Static",SS_BITMAP,291,176,149,91
-    CONTROL         "@C_SITE",C_SITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,170,244,13
-    LTEXT           "@S_SITE_1",S_SITE_1,22,188,262,46
-    LTEXT           "@S_SITE_2",S_SITE_2,22,237,228,11
-    CONTROL         "@C_CENTER",C_CENTER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,29,252,255,12
-    CONTROL         "@C_EDGE",C_EDGE,"Button",BS_AUTORADIOBUTTON,29,267,252,12
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,163,426,1
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,284,426,1
-    CONTROL         "@C_OTHER",C_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,291,244,13
-    LTEXT           "@S_OTHER",S_OTHER,22,309,418,25
-    DEFPUSHBUTTON   "@IDOK",IDOK,322,340,57,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,383,340,57,17
-    LTEXT           "--INFO--",S_INFO,7,336,310,21
+    ICON            ICO_SETUP,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,409,17
+    LTEXT           "@IDC_STATIC_1",IDC_STATIC,7,26,433,24
+    LTEXT           "@S_BOLD",S_BOLD,7,51,433,21
+    CONTROL         "@C_REMOTE",C_REMOTE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,226,12
+    CONTROL         ICO_TRAY3,IDC_STATIC,"Static",SS_BITMAP,291,73,70,62
+    LTEXT           "@S_REMOTE_1",S_REMOTE_1,22,86,262,44
+    CONTROL         ICO_TRAY2,IDC_STATIC,"Static",SS_BITMAP,291,150,149,78
+    CONTROL         "@C_SITE",C_SITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,145,244,12
+    LTEXT           "@S_SITE_1",S_SITE_1,22,161,262,40
+    LTEXT           "@S_SITE_2",S_SITE_2,22,203,228,10
+    CONTROL         "@C_CENTER",C_CENTER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,29,215,255,11
+    CONTROL         "@C_EDGE",C_EDGE,"Button",BS_AUTORADIOBUTTON,29,228,252,11
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,139,426,1
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,243,426,1
+    CONTROL         "@C_OTHER",C_OTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,249,244,12
+    LTEXT           "@S_OTHER",S_OTHER,22,264,418,22
+    DEFPUSHBUTTON   "@IDOK",IDOK,322,291,57,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,383,291,57,15
+    LTEXT           "--INFO--",S_INFO,7,287,310,18
 END
 
-D_SM_SETUP_HUB DIALOGEX 0, 0, 229, 101
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SETUP_HUB DIALOGEX 0, 0, 229, 86
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SETUP_HUB"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_HUB,IDC_STATIC,7,7,20,20
-    LTEXT           "@IDC_STATIC_1",IDC_STATIC,31,7,191,29
-    RTEXT           "@IDC_STATIC_2",IDC_STATIC,7,47,62,13
-    EDITTEXT        E_HUBNAME,74,45,140,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "@IDOK",IDOK,89,75,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,157,75,64,19
+    ICON            ICO_HUB,IDC_STATIC,7,5,20,18
+    LTEXT           "@IDC_STATIC_1",IDC_STATIC,31,5,191,25
+    RTEXT           "@IDC_STATIC_2",IDC_STATIC,7,40,62,12
+    EDITTEXT        E_HUBNAME,74,38,140,11,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "@IDOK",IDOK,89,64,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,157,64,64,17
 END
 
-D_SM_SETUP_STEP DIALOGEX 0, 0, 329, 351
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SETUP_STEP DIALOGEX 0, 0, 329, 300
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CLIENTEDGE
 CAPTION "@D_SM_SETUP_STEP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,7,20,20,WS_TABSTOP
-    LTEXT           "@IDC_STATIC_1",IDC_STATIC,29,7,293,23
-    LTEXT           "@S_1_1",S_1_1,7,45,315,13
-    ICON            ICO_USER,IDC_STATIC,14,63,20,20
-    LTEXT           "@S_1_2",S_1_2,37,63,285,33
-    PUSHBUTTON      "@B_USER",B_USER,37,99,87,17
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,38,315,1
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,126,315,1
-    LTEXT           "@S_2_1",S_2_1,7,137,315,13
-    ICON            ICO_CASCADE,IDC_STATIC,14,151,20,20
-    LTEXT           "@S_2_2",S_2_2,37,152,285,33
-    PUSHBUTTON      "@B_CASCADE",B_CASCADE,37,189,155,17
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,215,315,1
-    LTEXT           "@S_3_1",S_3_1,7,227,315,13
-    ICON            ICO_NIC_ONLINE,S_ICON,14,242,20,20
-    LTEXT           "@S_3_2",S_3_2,37,243,285,38
-    COMBOBOX        C_DEVICE,37,283,285,163,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,307,314,1
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,263,326,59,18
-    LTEXT           "@IDC_STATIC_8",IDC_STATIC,14,318,245,26
-    PUSHBUTTON      "@B_SECURENAT",B_SECURENAT,37,282,155,17
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@IDC_STATIC_1",IDC_STATIC,29,5,293,20
+    LTEXT           "@S_1_1",S_1_1,7,38,315,12
+    ICON            ICO_USER,IDC_STATIC,14,53,20,18
+    LTEXT           "@S_1_2",S_1_2,37,53,285,29
+    PUSHBUTTON      "@B_USER",B_USER,37,84,87,15
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,32,315,1
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,107,315,1
+    LTEXT           "@S_2_1",S_2_1,7,117,315,12
+    ICON            ICO_CASCADE,IDC_STATIC,14,129,20,18
+    LTEXT           "@S_2_2",S_2_2,37,130,285,29
+    PUSHBUTTON      "@B_CASCADE",B_CASCADE,37,161,155,15
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,184,315,1
+    LTEXT           "@S_3_1",S_3_1,7,194,315,12
+    ICON            ICO_NIC_ONLINE,S_ICON,14,207,20,18
+    LTEXT           "@S_3_2",S_3_2,37,208,285,33
+    COMBOBOX        C_DEVICE,37,242,285,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,263,314,1
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,263,279,59,16
+    LTEXT           "@IDC_STATIC_8",IDC_STATIC,14,272,245,23
+    PUSHBUTTON      "@B_SECURENAT",B_SECURENAT,37,241,155,15
 END
 
-D_CPU64_WARNING DIALOGEX 0, 0, 299, 180
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CPU64_WARNING DIALOGEX 0, 0, 299, 154
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOPMOST
 CAPTION "@D_CPU64_WARNING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_WARNING,IDC_STATIC,7,7,18,21
-    LTEXT           "@S_BOLD",S_BOLD,29,7,263,29
-    LTEXT           "@S_INFO",S_INFO,29,41,263,107
-    DEFPUSHBUTTON   "@IDOK",IDOK,119,155,61,17
+    ICON            ICO_WARNING,IDC_STATIC,7,5,18,18
+    LTEXT           "@S_BOLD",S_BOLD,29,5,263,25
+    LTEXT           "@S_INFO",S_INFO,29,35,263,92
+    DEFPUSHBUTTON   "@IDOK",IDOK,119,132,61,15
 END
 
-D_ONCEMSG DIALOGEX 0, 0, 251, 188
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_ONCEMSG DIALOGEX 0, 0, 251, 161
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_ONCEMSG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    EDITTEXT        E_TEXT,7,7,237,140,ES_MULTILINE | ES_READONLY | WS_VSCROLL
-    CONTROL         "@C_DONTSHOWAGAIN",C_DONTSHOWAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,237,12
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,94,164,64,17
+    EDITTEXT        E_TEXT,7,5,237,120,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+    CONTROL         "@C_DONTSHOWAGAIN",C_DONTSHOWAGAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,237,11
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,94,140,64,15
 END
 
-D_CONNECT DIALOGEX 0, 0, 189, 79
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_CONNECT DIALOGEX 0, 0, 189, 67
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_CONNECT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "String",S_INFO,30,9,152,27
-    ICON            ICO_TEST,S_ICON,7,7,20,20
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,69,56,50,16
-    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",0x0,7,41,175,10
+    LTEXT           "String",S_INFO,30,7,152,24
+    ICON            ICO_TEST,S_ICON,7,5,20,18
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,69,47,50,14
+    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",0x0,7,35,175,9
 END
 
-D_SM_SIMULATION DIALOGEX 0, 0, 281, 259
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SIMULATION DIALOGEX 0, 0, 281, 221
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SIMULATION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_FARM,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,30,7,244,60
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,73,267,148
-    CONTROL         "@C_DELAY",C_DELAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,88,248,11
-    RTEXT           "@S_DELAY",S_DELAY,14,108,122,15
-    EDITTEXT        E_DELAY,139,106,51,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_DELAY2",S_DELAY2,194,108,73,16
-    CONTROL         "@C_JITTER",C_JITTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,131,248,11
-    RTEXT           "@S_JITTER",S_JITTER,14,151,122,16
-    EDITTEXT        E_JITTER,139,149,51,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_JITTER2",S_JITTER2,194,151,73,16
-    CONTROL         "@C_LOSS",C_LOSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,175,248,11
-    RTEXT           "@S_LOSS",S_LOSS,14,195,122,15
-    EDITTEXT        E_LOSS,139,193,51,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_LOSS2",S_LOSS2,194,195,73,16
-    DEFPUSHBUTTON   "@IDOK",IDOK,142,233,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,210,233,64,19
+    ICON            ICO_FARM,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,30,5,244,52
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,62,267,127
+    CONTROL         "@C_DELAY",C_DELAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,75,248,10
+    RTEXT           "@S_DELAY",S_DELAY,14,92,122,13
+    EDITTEXT        E_DELAY,139,90,51,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_DELAY2",S_DELAY2,194,92,73,14
+    CONTROL         "@C_JITTER",C_JITTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,112,248,10
+    RTEXT           "@S_JITTER",S_JITTER,14,129,122,14
+    EDITTEXT        E_JITTER,139,127,51,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_JITTER2",S_JITTER2,194,129,73,14
+    CONTROL         "@C_LOSS",C_LOSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,149,248,10
+    RTEXT           "@S_LOSS",S_LOSS,14,167,122,13
+    EDITTEXT        E_LOSS,139,165,51,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_LOSS2",S_LOSS2,194,167,73,14
+    DEFPUSHBUTTON   "@IDOK",IDOK,142,199,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,210,199,64,17
 END
 
-D_SM_EDIT_ACCESS_V6 DIALOGEX 0, 0, 459, 411
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_EDIT_ACCESS_V6 DIALOGEX 0, 0, 459, 352
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_EDIT_ACCESS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PASS,S_ICON,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,31,7,421,19
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,34,217,71
-    RTEXT           "@STATIC3",IDC_STATIC,14,51,71,11
-    EDITTEXT        E_NOTE,91,49,115,12,ES_AUTOHSCROLL
-    RTEXT           "@STATIC4",IDC_STATIC,14,69,71,9
-    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON,91,64,47,18
-    CONTROL         "@R_DISCARD",R_DISCARD,"Button",BS_AUTORADIOBUTTON,142,64,51,18
-    RTEXT           "@STATIC5",IDC_STATIC,14,88,71,10
-    EDITTEXT        E_PRIORITY,91,86,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@STATIC6",IDC_STATIC,134,85,73,18
-    GROUPBOX        "@STATIC11",S_STATIC11,7,108,217,112
-    ICON            ICO_USER,IDC_STATIC,11,119,20,20
-    LTEXT           "@STATIC12",S_STATIC12,34,121,177,28
-    RTEXT           "@STATIC13",S_STATIC13,12,155,73,12
-    EDITTEXT        E_USERNAME1,89,153,84,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_USER1",B_USER1,179,151,41,18
-    RTEXT           "@STATIC14",S_STATIC14,13,178,72,12
-    EDITTEXT        E_USERNAME2,89,176,84,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_USER2",B_USER2,179,174,41,18
-    LTEXT           "@STATIC15",S_STATIC15,56,196,156,21
-    GROUPBOX        "@STATIC16",IDC_STATIC,7,223,217,152
-    RTEXT           "@S_CHECK_SRC_MAC",S_CHECK_SRC_MAC,14,235,71,10
-    CONTROL         "@R_CHECK_SRC_MAC",R_CHECK_SRC_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,233,121,10
-    RTEXT           "@S_SRC_MAC",S_SRC_MAC,14,250,108,10
-    EDITTEXT        E_SRC_MAC,128,248,78,12,ES_AUTOHSCROLL
-    RTEXT           "@S_SRC_MAC_MASK",S_SRC_MAC_MASK,14,267,108,10
-    EDITTEXT        E_SRC_MAC_MASK,128,265,78,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,18,283,193,1
-    RTEXT           "@S_CHECK_DST_MAC",S_CHECK_DST_MAC,13,289,71,10
-    CONTROL         "@R_CHECK_DST_MAC",R_CHECK_DST_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,287,121,10
-    RTEXT           "@S_DST_MAC",S_DST_MAC,14,304,108,10
-    EDITTEXT        E_DST_MAC,128,302,78,12,ES_AUTOHSCROLL
-    RTEXT           "@S_DST_MAC_MASK",S_DST_MAC_MASK,14,322,108,10
-    EDITTEXT        E_DST_MAC_MASK,128,320,78,12,ES_AUTOHSCROLL
-    LTEXT           "@S_MAC_NOTE",S_MAC_NOTE,18,337,197,30
-    GROUPBOX        "@STATIC7",IDC_STATIC,232,34,220,211
-    RTEXT           "@S_ACCESS_SRC_ALL",S_ACCESS_SRC_ALL,237,50,71,10
-    CONTROL         "@R_SRC_ALL",R_SRC_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,48,121,10
-    RTEXT           "@S_SRC_IP_1_V6",S_SRC_IP_1,237,64,54,10
-    EDITTEXT        E_SRC_IP_V6,298,62,147,12,ES_AUTOHSCROLL
-    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,237,82,54,9
-    EDITTEXT        E_SRC_MASK_V6,298,80,147,12,ES_AUTOHSCROLL
-    RTEXT           "@S_SRC_IP_3_V6",S_SRC_IP_3,237,102,208,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,118,208,1
-    RTEXT           "@S_ACCESS_DST_ALL",S_ACCESS_DST_ALL,237,128,71,10
-    CONTROL         "@R_DST_ALL",R_DST_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,126,121,10
-    RTEXT           "@S_IP_DST_1_V6",S_IP_DST_1,237,142,54,10
-    EDITTEXT        E_DST_IP_V6,298,140,147,12,ES_AUTOHSCROLL
-    RTEXT           "@S_IP_DST_2",S_IP_DST_2,237,160,54,10
-    EDITTEXT        E_DST_MASK_V6,298,158,146,12,ES_AUTOHSCROLL
-    RTEXT           "@S_IP_DST_3_V6",S_IP_DST_3,237,178,207,11
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,196,208,1
-    RTEXT           "@STATIC9",IDC_STATIC,237,206,71,12
-    COMBOBOX        C_PROTOCOL,313,204,110,87,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S_PROTOID",S_PROTOID,237,226,71,10
-    EDITTEXT        E_IP_PROTO,313,224,37,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        "@STATIC10",IDC_STATIC,232,247,220,129
-    LTEXT           "@S_TCP_1",S_TCP_1,318,259,31,10
-    LTEXT           "@S_TCP_2",S_TCP_2,370,259,31,10
-    RTEXT           "@S_TCP_3",S_TCP_3,234,273,71,10
-    EDITTEXT        E_SRC_PORT_1,311,271,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "-",S_TCP_4,356,273,8,8
-    EDITTEXT        E_SRC_PORT_2,365,271,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    RTEXT           "@S_TCP_5",S_TCP_5,234,291,71,10
-    EDITTEXT        E_DST_PORT_1,311,289,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "-",S_TCP_6,356,291,8,8
-    EDITTEXT        E_DST_PORT_2,365,289,38,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "@S_TCP_7",S_TCP_7,240,308,204,25
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,340,208,1
-    CONTROL         "@R_CHECK_TCP_STATE",R_CHECK_TCP_STATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,346,158,10
-    CONTROL         "@R_ESTABLISHED",R_ESTABLISHED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,268,360,71,10
-    CONTROL         "@R_UNESTABLISHED",R_UNESTABLISHED,"Button",BS_AUTORADIOBUTTON,351,360,80,10
-    CONTROL         "@R_REDIRECT",R_REDIRECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,383,113,21
-    PUSHBUTTON      "@B_REDIRECT",B_REDIRECT,122,385,78,19
-    PUSHBUTTON      "@B_SIMULATION",B_SIMULATION,207,385,103,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,320,385,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,388,385,64,19
+    ICON            ICO_PASS,S_ICON,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,31,5,421,17
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,29,217,61
+    RTEXT           "@STATIC3",IDC_STATIC,14,43,71,10
+    EDITTEXT        E_NOTE,91,41,115,11,ES_AUTOHSCROLL
+    RTEXT           "@STATIC4",IDC_STATIC,14,59,71,8
+    CONTROL         "@R_PASS",R_PASS,"Button",BS_AUTORADIOBUTTON,91,54,47,16
+    CONTROL         "@R_DISCARD",R_DISCARD,"Button",BS_AUTORADIOBUTTON,142,54,51,16
+    RTEXT           "@STATIC5",IDC_STATIC,14,75,71,9
+    EDITTEXT        E_PRIORITY,91,73,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@STATIC6",IDC_STATIC,134,72,73,16
+    GROUPBOX        "@STATIC11",S_STATIC11,7,92,217,96
+    ICON            ICO_USER,IDC_STATIC,11,101,20,18
+    LTEXT           "@STATIC12",S_STATIC12,34,103,177,24
+    RTEXT           "@STATIC13",S_STATIC13,12,132,73,11
+    EDITTEXT        E_USERNAME1,89,131,84,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_USER1",B_USER1,179,129,41,16
+    RTEXT           "@STATIC14",S_STATIC14,13,152,72,11
+    EDITTEXT        E_USERNAME2,89,150,84,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_USER2",B_USER2,179,149,41,16
+    LTEXT           "@STATIC15",S_STATIC15,56,167,156,18
+    GROUPBOX        "@STATIC16",IDC_STATIC,7,191,217,131
+    RTEXT           "@S_CHECK_SRC_MAC",S_CHECK_SRC_MAC,14,201,71,9
+    CONTROL         "@R_CHECK_SRC_MAC",R_CHECK_SRC_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,199,121,9
+    RTEXT           "@S_SRC_MAC",S_SRC_MAC,14,214,108,9
+    EDITTEXT        E_SRC_MAC,128,212,78,11,ES_AUTOHSCROLL
+    RTEXT           "@S_SRC_MAC_MASK",S_SRC_MAC_MASK,14,228,108,9
+    EDITTEXT        E_SRC_MAC_MASK,128,227,78,11,ES_AUTOHSCROLL
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,18,242,193,1
+    RTEXT           "@S_CHECK_DST_MAC",S_CHECK_DST_MAC,13,247,71,9
+    CONTROL         "@R_CHECK_DST_MAC",R_CHECK_DST_MAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,245,121,9
+    RTEXT           "@S_DST_MAC",S_DST_MAC,14,260,108,9
+    EDITTEXT        E_DST_MAC,128,258,78,11,ES_AUTOHSCROLL
+    RTEXT           "@S_DST_MAC_MASK",S_DST_MAC_MASK,14,275,108,9
+    EDITTEXT        E_DST_MAC_MASK,128,274,78,11,ES_AUTOHSCROLL
+    LTEXT           "@S_MAC_NOTE",S_MAC_NOTE,18,288,197,26
+    GROUPBOX        "@STATIC7",IDC_STATIC,232,29,220,181
+    RTEXT           "@S_ACCESS_SRC_ALL",S_ACCESS_SRC_ALL,237,42,71,9
+    CONTROL         "@R_SRC_ALL",R_SRC_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,41,121,9
+    RTEXT           "@S_SRC_IP_1_V6",S_SRC_IP_1,237,54,54,9
+    EDITTEXT        E_SRC_IP_V6,298,53,147,11,ES_AUTOHSCROLL
+    RTEXT           "@S_SRC_IP_2",S_SRC_IP_2,237,70,54,8
+    EDITTEXT        E_SRC_MASK_V6,298,68,147,11,ES_AUTOHSCROLL
+    RTEXT           "@S_SRC_IP_3_V6",S_SRC_IP_3,237,87,208,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,101,208,1
+    RTEXT           "@S_ACCESS_DST_ALL",S_ACCESS_DST_ALL,237,109,71,9
+    CONTROL         "@R_DST_ALL",R_DST_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,311,107,121,9
+    RTEXT           "@S_IP_DST_1_V6",S_IP_DST_1,237,121,54,9
+    EDITTEXT        E_DST_IP_V6,298,119,147,11,ES_AUTOHSCROLL
+    RTEXT           "@S_IP_DST_2",S_IP_DST_2,237,137,54,9
+    EDITTEXT        E_DST_MASK_V6,298,135,146,11,ES_AUTOHSCROLL
+    RTEXT           "@S_IP_DST_3_V6",S_IP_DST_3,237,152,207,10
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,167,208,1
+    RTEXT           "@STATIC9",IDC_STATIC,237,176,71,11
+    COMBOBOX        C_PROTOCOL,313,174,110,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S_PROTOID",S_PROTOID,237,193,71,9
+    EDITTEXT        E_IP_PROTO,313,191,37,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "@STATIC10",IDC_STATIC,232,211,220,111
+    LTEXT           "@S_TCP_1",S_TCP_1,318,221,31,9
+    LTEXT           "@S_TCP_2",S_TCP_2,370,221,31,9
+    RTEXT           "@S_TCP_3",S_TCP_3,234,233,71,9
+    EDITTEXT        E_SRC_PORT_1,311,232,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "-",S_TCP_4,356,233,8,7
+    EDITTEXT        E_SRC_PORT_2,365,232,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    RTEXT           "@S_TCP_5",S_TCP_5,234,249,71,9
+    EDITTEXT        E_DST_PORT_1,311,247,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "-",S_TCP_6,356,249,8,7
+    EDITTEXT        E_DST_PORT_2,365,247,38,11,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "@S_TCP_7",S_TCP_7,240,263,204,22
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,238,291,208,1
+    CONTROL         "@R_CHECK_TCP_STATE",R_CHECK_TCP_STATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,296,158,9
+    CONTROL         "@R_ESTABLISHED",R_ESTABLISHED,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,268,308,71,9
+    CONTROL         "@R_UNESTABLISHED",R_UNESTABLISHED,"Button",BS_AUTORADIOBUTTON,351,308,80,9
+    CONTROL         "@R_REDIRECT",R_REDIRECT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,7,328,113,18
+    PUSHBUTTON      "@B_REDIRECT",B_REDIRECT,122,329,78,17
+    PUSHBUTTON      "@B_SIMULATION",B_SIMULATION,207,329,103,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,320,329,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,388,329,64,17
 END
 
-D_SM_VLAN DIALOGEX 0, 0, 315, 327
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_VLAN DIALOGEX 0, 0, 315, 280
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_VLAN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC1",IDC_STATIC,29,7,279,61
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,69,301,84
-    PUSHBUTTON      "@B_ENABLE",B_ENABLE,7,160,209,18
-    PUSHBUTTON      "@B_DISABLE",B_DISABLE,223,160,85,18
-    GROUPBOX        "@STATIC2",IDC_STATIC,7,187,301,109
-    ICON            ICO_INFORMATION,IDC_STATIC,14,200,20,20
-    LTEXT           "@S_WARNING",S_WARNING,38,200,262,27
-    LTEXT           "@S_WARNING2",S_WARNING2,38,230,262,60
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,249,302,59,18
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC1",IDC_STATIC,29,5,279,53
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,59,301,72
+    PUSHBUTTON      "@B_ENABLE",B_ENABLE,7,137,209,16
+    PUSHBUTTON      "@B_DISABLE",B_DISABLE,223,137,85,16
+    GROUPBOX        "@STATIC2",IDC_STATIC,7,160,301,94
+    ICON            ICO_INFORMATION,IDC_STATIC,14,171,20,18
+    LTEXT           "@S_WARNING",S_WARNING,38,171,262,24
+    LTEXT           "@S_WARNING2",S_WARNING2,38,197,262,52
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,249,258,59,16
 END
 
-D_SM_MSG DIALOGEX 0, 0, 275, 323
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_MSG DIALOGEX 0, 0, 275, 276
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_MSG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_LOG2,S_ACL_5,7,7,20,20
-    LTEXT           "@S_MSG_2",S_MSG_2,31,7,237,36
-    CONTROL         "@C_USEMSG",C_USEMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,51,253,15
-    EDITTEXT        E_TEXT,20,72,237,140,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
-    GROUPBOX        "@STATIC1",IDC_STATIC,7,217,261,71
-    ICON            ICO_INFORMATION,IDC_STATIC,14,230,20,20
-    LTEXT           "@S_INFO",S_INFO,39,232,222,52
-    DEFPUSHBUTTON   "@IDOK",IDOK,131,297,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,203,297,64,19
+    ICON            ICO_LOG2,S_ACL_5,7,5,20,18
+    LTEXT           "@S_MSG_2",S_MSG_2,31,5,237,31
+    CONTROL         "@C_USEMSG",C_USEMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,43,253,13
+    EDITTEXT        E_TEXT,20,61,237,120,ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL
+    GROUPBOX        "@STATIC1",IDC_STATIC,7,185,261,61
+    ICON            ICO_INFORMATION,IDC_STATIC,14,197,20,18
+    LTEXT           "@S_INFO",S_INFO,39,198,222,45
+    DEFPUSHBUTTON   "@IDOK",IDOK,131,254,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,203,254,64,17
 END
 
-D_NICINFO DIALOGEX 0, 0, 221, 107
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NICINFO DIALOGEX 0, 0, 221, 91
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "@D_NICINFO"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_NIC_OFFLINE,S_ICON,7,7,18,21
-    LTEXT           "Status1",S_STATUS1,31,12,183,17
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,84,84,50,16
-    LTEXT           "Status2",S_STATUS2,31,32,183,37
-    CONTROL         "",P_BAR,"msctls_progress32",0x0,7,71,207,8
+    ICON            ICO_NIC_OFFLINE,S_ICON,7,5,18,18
+    LTEXT           "Status1",S_STATUS1,31,10,183,15
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,84,71,50,14
+    LTEXT           "Status2",S_STATUS2,31,27,183,32
+    CONTROL         "",P_BAR,"msctls_progress32",0x0,7,60,207,7
 END
 
-D_SM_IPSEC DIALOGEX 0, 0, 423, 359
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_IPSEC DIALOGEX 0, 0, 423, 307
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_IPSEC"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_TITLE",S_TITLE,31,7,385,18
-    LTEXT           "@S_3",S_3,31,26,385,26
-    ICON            ICO_IPSEC,IDC_STATIC,7,7,20,20
-    GROUPBOX        "@S01",IDC_STATIC,7,56,409,165
-    LTEXT           "@S02",IDC_STATIC,14,68,267,26
-    CONTROL         197,IDC_STATIC,"Static",SS_BITMAP,288,66,121,38
-    CONTROL         "@R_L2TP_OVER_IPSEC",R_L2TP_OVER_IPSEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,96,269,10
-    LTEXT           "@S03",IDC_STATIC,31,111,286,15
-    CONTROL         "@R_L2TP_RAW",R_L2TP_RAW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,130,269,10
-    LTEXT           "@S04",IDC_STATIC,31,146,378,14
-    RTEXT           "@S_1",S_1,16,200,270,14
-    COMBOBOX        L_HUBNAME,291,197,114,148,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "@S_2",S_2,48,167,361,26
-    GROUPBOX        "@S05",IDC_STATIC,7,227,409,56
-    LTEXT           "@S06",IDC_STATIC,16,238,294,19
-    CONTROL         195,IDC_STATIC,"Static",SS_BITMAP,314,236,94,43,WS_EX_STATICEDGE
-    CONTROL         "@R_ETHERIP",R_ETHERIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,262,184,10
-    PUSHBUTTON      "@B_DETAIL",B_DETAIL,204,259,103,17
-    GROUPBOX        "@S07",IDC_STATIC,7,291,261,59
-    RTEXT           "@S_PSK",S_PSK,14,306,78,14
-    EDITTEXT        E_SECRET,98,302,159,15,ES_AUTOHSCROLL
-    LTEXT           "@S_PSK2",S_PSK2,14,326,248,19
-    DEFPUSHBUTTON   "@IDOK",IDOK,307,336,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,364,336,52,16
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,160,395,1
-    ICON            ICO_INFORMATION,IDC_STATIC,24,164,20,20
-    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,318,104,90,38
+    LTEXT           "@S_TITLE",S_TITLE,31,5,385,16
+    LTEXT           "@S_3",S_3,31,22,385,23
+    ICON            ICO_IPSEC,IDC_STATIC,7,5,20,18
+    GROUPBOX        "@S01",IDC_STATIC,7,47,409,142
+    LTEXT           "@S02",IDC_STATIC,14,58,267,23
+    CONTROL         197,IDC_STATIC,"Static",SS_BITMAP,288,56,121,33
+    CONTROL         "@R_L2TP_OVER_IPSEC",R_L2TP_OVER_IPSEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,82,269,9
+    LTEXT           "@S03",IDC_STATIC,31,95,286,13
+    CONTROL         "@R_L2TP_RAW",R_L2TP_RAW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,111,269,9
+    LTEXT           "@S04",IDC_STATIC,31,125,378,12
+    RTEXT           "@S_1",S_1,16,171,270,12
+    COMBOBOX        L_HUBNAME,291,168,114,127,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "@S_2",S_2,48,143,361,23
+    GROUPBOX        "@S05",IDC_STATIC,7,194,409,48
+    LTEXT           "@S06",IDC_STATIC,16,203,294,17
+    CONTROL         195,IDC_STATIC,"Static",SS_BITMAP,314,202,94,37,WS_EX_STATICEDGE
+    CONTROL         "@R_ETHERIP",R_ETHERIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,224,184,9
+    PUSHBUTTON      "@B_DETAIL",B_DETAIL,204,221,103,15
+    GROUPBOX        "@S07",IDC_STATIC,7,249,261,51
+    RTEXT           "@S_PSK",S_PSK,14,262,78,12
+    EDITTEXT        E_SECRET,98,258,159,13,ES_AUTOHSCROLL
+    LTEXT           "@S_PSK2",S_PSK2,14,279,248,17
+    DEFPUSHBUTTON   "@IDOK",IDOK,307,287,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,364,287,52,14
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,137,395,1
+    ICON            ICO_INFORMATION,IDC_STATIC,24,140,20,18
+    CONTROL         227,IDC_STATIC,"Static",SS_BITMAP,318,89,90,33
 END
 
-D_SM_ETHERIP DIALOGEX 0, 0, 411, 285
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_ETHERIP DIALOGEX 0, 0, 411, 244
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_ETHERIP"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_MACHINE,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,198,18
-    LTEXT           "@S01",IDC_STATIC,7,38,221,47
-    LTEXT           "@S02",IDC_STATIC,7,87,222,33
-    LTEXT           "@S_BOLD",S_BOLD,7,126,222,11
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,140,311,138
-    CONTROL         202,IDC_STATIC,"Static",SS_BITMAP,233,7,171,125,WS_EX_DLGMODALFRAME
-    PUSHBUTTON      "@B_ADD",B_ADD,326,155,78,18
-    DEFPUSHBUTTON   "@IDOK",IDOK,326,176,78,18
-    PUSHBUTTON      "@B_DELETE",B_DELETE,326,198,78,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,326,260,78,18
-    RTEXT           "@S03",IDC_STATIC,320,135,84,10,NOT WS_VISIBLE
+    ICON            ICO_MACHINE,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,198,16
+    LTEXT           "@S01",IDC_STATIC,7,32,221,41
+    LTEXT           "@S02",IDC_STATIC,7,74,222,29
+    LTEXT           "@S_BOLD",S_BOLD,7,107,222,10
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,119,311,119
+    CONTROL         202,IDC_STATIC,"Static",SS_BITMAP,233,5,171,108,WS_EX_DLGMODALFRAME
+    PUSHBUTTON      "@B_ADD",B_ADD,326,132,78,16
+    DEFPUSHBUTTON   "@IDOK",IDOK,326,150,78,16
+    PUSHBUTTON      "@B_DELETE",B_DELETE,326,169,78,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,326,222,78,16
+    RTEXT           "@S03",IDC_STATIC,320,115,84,9,NOT WS_VISIBLE
 END
 
-D_SM_ETHERIP_ID DIALOGEX 0, 0, 267, 265
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_ETHERIP_ID DIALOGEX 0, 0, 267, 227
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_ETHERIP_ID"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_KEY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S01",IDC_STATIC,29,7,231,35
-    RTEXT           "@S02",IDC_STATIC,7,47,76,14
-    EDITTEXT        E_ID,88,45,153,12,ES_AUTOHSCROLL
-    RTEXT           "@S03",IDC_STATIC,7,128,76,12
-    COMBOBOX        L_HUBNAME,88,125,153,148,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "@S04",IDC_STATIC,7,150,76,14
-    EDITTEXT        E_USERNAME,88,148,153,12,ES_AUTOHSCROLL
-    RTEXT           "@S05",IDC_STATIC,7,172,76,16
-    EDITTEXT        E_PASSWORD,88,170,153,12,ES_PASSWORD | ES_AUTOHSCROLL
-    ICON            ICO_INFORMATION,IDC_STATIC,7,197,20,20
-    LTEXT           "@S06",IDC_STATIC,30,198,230,38
-    DEFPUSHBUTTON   "@IDOK",IDOK,151,242,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,242,52,16
-    LTEXT           "@S07",IDC_STATIC,88,60,154,64
+    ICON            ICO_KEY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S01",IDC_STATIC,29,5,231,30
+    RTEXT           "@S02",IDC_STATIC,7,40,76,12
+    EDITTEXT        E_ID,88,38,153,11,ES_AUTOHSCROLL
+    RTEXT           "@S03",IDC_STATIC,7,109,76,11
+    COMBOBOX        L_HUBNAME,88,107,153,127,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "@S04",IDC_STATIC,7,128,76,12
+    EDITTEXT        E_USERNAME,88,126,153,11,ES_AUTOHSCROLL
+    RTEXT           "@S05",IDC_STATIC,7,147,76,14
+    EDITTEXT        E_PASSWORD,88,145,153,11,ES_PASSWORD | ES_AUTOHSCROLL
+    ICON            ICO_INFORMATION,IDC_STATIC,7,168,20,18
+    LTEXT           "@S06",IDC_STATIC,30,169,230,33
+    DEFPUSHBUTTON   "@IDOK",IDOK,151,207,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,208,207,52,14
+    LTEXT           "@S07",IDC_STATIC,88,51,154,55
 END
 
-D_SM_OPENVPN DIALOGEX 0, 0, 427, 387
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_OPENVPN DIALOGEX 0, 0, 427, 331
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_OPENVPN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_OPENVPN,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,32,8,385,18
-    GROUPBOX        "@S_13",IDC_STATIC,8,31,409,201
-    LTEXT           "@S_1",IDC_STATIC,15,43,195,43
-    CONTROL         205,IDC_STATIC,"Static",SS_BITMAP,217,41,194,87
-    CONTROL         "@R_OPENVPN",R_OPENVPN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,88,194,10
-    LTEXT           "@S_UDP",S_UDP,25,102,186,10
-    EDITTEXT        E_UDP,25,113,127,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_DEFAULT",B_DEFAULT,159,112,52,17
-    LTEXT           "@S_UDP2",S_UDP2,26,133,383,28
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,162,395,1
-    LTEXT           "@S_TOOL",S_TOOL,15,168,392,14
-    LTEXT           "@S_TOOL2",S_TOOL2,24,184,385,25
-    PUSHBUTTON      "@B_CONFIG",B_CONFIG,120,207,189,17
-    GROUPBOX        "@S_2",IDC_STATIC,7,236,409,114
-    LTEXT           "@S_3",IDC_STATIC,14,248,195,43
-    CONTROL         206,IDC_STATIC,"Static",SS_BITMAP,215,245,194,99
-    CONTROL         "@R_SSTP",R_SSTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,295,194,10
-    LTEXT           "@S_SSTP",S_SSTP,21,310,188,38
-    LTEXT           "@S_4",IDC_STATIC,7,353,186,27
-    PUSHBUTTON      "@B_IPSEC",B_IPSEC,195,363,93,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,311,364,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,368,364,52,16
+    ICON            ICO_OPENVPN,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,32,6,385,16
+    GROUPBOX        "@S_13",IDC_STATIC,8,26,409,173
+    LTEXT           "@S_1",IDC_STATIC,15,36,195,37
+    CONTROL         205,IDC_STATIC,"Static",SS_BITMAP,217,35,194,75
+    CONTROL         "@R_OPENVPN",R_OPENVPN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,75,194,9
+    LTEXT           "@S_UDP",S_UDP,25,87,186,9
+    EDITTEXT        E_UDP,25,96,127,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_DEFAULT",B_DEFAULT,159,95,52,15
+    LTEXT           "@S_UDP2",S_UDP2,26,113,383,24
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,138,395,1
+    LTEXT           "@S_TOOL",S_TOOL,15,143,392,12
+    LTEXT           "@S_TOOL2",S_TOOL2,24,157,385,22
+    PUSHBUTTON      "@B_CONFIG",B_CONFIG,120,177,189,15
+    GROUPBOX        "@S_2",IDC_STATIC,7,202,409,98
+    LTEXT           "@S_3",IDC_STATIC,14,212,195,37
+    CONTROL         206,IDC_STATIC,"Static",SS_BITMAP,215,209,194,85
+    CONTROL         "@R_SSTP",R_SSTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,252,194,9
+    LTEXT           "@S_SSTP",S_SSTP,21,265,188,33
+    LTEXT           "@S_4",IDC_STATIC,7,302,186,24
+    PUSHBUTTON      "@B_IPSEC",B_IPSEC,195,311,93,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,311,311,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,368,311,52,14
 END
 
-D_SM_DDNS DIALOGEX 0, 0, 415, 335
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_DDNS DIALOGEX 0, 0, 415, 287
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_DDNS"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_DISPLAY,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,31,7,377,18
-    LTEXT           "@S_BOLD",S_BOLD,7,37,401,13
-    LTEXT           "@S_1",IDC_STATIC,7,55,401,32
-    LTEXT           "@S_22",IDC_STATIC,7,89,401,34
-    LTEXT           "@S_3",IDC_STATIC,7,125,401,25
-    GROUPBOX        "@S_4",IDC_STATIC,7,153,194,123
-    LTEXT           "@S_STATUS3",S_STATUS3,14,165,182,11
-    EDITTEXT        E_HOST,17,178,155,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    PUSHBUTTON      "@B_HINT",B_HINT,174,176,24,17
-    LTEXT           "@S_STATUS4",S_STATUS4,14,197,171,11
-    EDITTEXT        E_IPV4,17,209,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "@S_STATUS5",S_STATUS5,14,228,171,10
-    EDITTEXT        E_IPV6,17,240,172,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    LTEXT           "@S_STATUS8",S_STATUS8,14,258,31,11
-    EDITTEXT        E_KEY,41,258,131,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    PUSHBUTTON      "@B_HINT2",B_HINT2,174,255,24,17
-    GROUPBOX        "@S_5",IDC_STATIC,206,153,202,123
-    LTEXT           "@S_STATUS6",S_STATUS6,212,170,189,11
-    EDITTEXT        E_NEWHOST,215,184,86,15,ES_AUTOHSCROLL
-    LTEXT           "",S_SUFFIX,303,186,98,12
-    LTEXT           "@S_STATUS7",S_STATUS7,219,201,182,34
-    DEFPUSHBUTTON   "@IDOK",IDOK,218,240,119,18
-    PUSHBUTTON      "@B_RESTORE",B_RESTORE,341,240,60,18
-    ICON            ICO_INFORMATION,IDC_STATIC,7,282,20,20
-    LTEXT           "@S_2",S_2,30,281,378,25
-    PUSHBUTTON      "@B_DISABLE",B_DISABLE,7,310,145,18
-    PUSHBUTTON      "@B_PROXY",B_PROXY,218,310,110,18
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,335,310,73,18
+    ICON            ICO_DISPLAY,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,31,5,377,16
+    LTEXT           "@S_BOLD",S_BOLD,7,31,401,12
+    LTEXT           "@S_1",IDC_STATIC,7,47,401,28
+    LTEXT           "@S_22",IDC_STATIC,7,76,401,30
+    LTEXT           "@S_3",IDC_STATIC,7,107,401,22
+    GROUPBOX        "@S_4",IDC_STATIC,7,131,194,106
+    LTEXT           "@S_STATUS3",S_STATUS3,14,141,182,10
+    EDITTEXT        E_HOST,17,152,155,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    PUSHBUTTON      "@B_HINT",B_HINT,174,150,24,15
+    LTEXT           "@S_STATUS4",S_STATUS4,14,168,171,10
+    EDITTEXT        E_IPV4,17,179,172,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "@S_STATUS5",S_STATUS5,14,195,171,9
+    EDITTEXT        E_IPV6,17,205,172,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    LTEXT           "@S_STATUS8",S_STATUS8,14,221,31,10
+    EDITTEXT        E_KEY,41,221,131,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    PUSHBUTTON      "@B_HINT2",B_HINT2,174,218,24,15
+    GROUPBOX        "@S_5",IDC_STATIC,206,131,202,106
+    LTEXT           "@S_STATUS6",S_STATUS6,212,145,189,10
+    EDITTEXT        E_NEWHOST,215,157,86,13,ES_AUTOHSCROLL
+    LTEXT           "",S_SUFFIX,303,159,98,11
+    LTEXT           "@S_STATUS7",S_STATUS7,219,172,182,30
+    DEFPUSHBUTTON   "@IDOK",IDOK,218,205,119,16
+    PUSHBUTTON      "@B_RESTORE",B_RESTORE,341,205,60,16
+    ICON            ICO_INFORMATION,IDC_STATIC,7,241,20,18
+    LTEXT           "@S_2",S_2,30,240,378,22
+    PUSHBUTTON      "@B_DISABLE",B_DISABLE,7,265,145,16
+    PUSHBUTTON      "@B_PROXY",B_PROXY,218,265,110,16
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,335,265,73,16
 END
 
-D_SM_SPECIALLISTENER DIALOGEX 0, 0, 357, 373
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_SPECIALLISTENER DIALOGEX 0, 0, 357, 319
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_SPECIALLISTENER"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SPECIALLISTENER,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,32,8,260,18
-    CONTROL         208,IDC_STATIC,"Static",SS_BITMAP,36,131,286,185
-    GROUPBOX        "@S_1",S_1,7,36,343,92
-    LTEXT           "@S_2",IDC_STATIC,14,50,329,36
-    CONTROL         "@R_OVER_ICMP",R_OVER_ICMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,86,272,14
-    CONTROL         "@R_OVER_DNS",R_OVER_DNS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,106,272,13
-    DEFPUSHBUTTON   "@IDOK",IDOK,241,350,52,16
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,298,350,52,16
-    LTEXT           "@S_3",IDC_STATIC,7,352,224,20
-    LTEXT           "@S_4",IDC_STATIC,7,321,343,27
+    ICON            ICO_SPECIALLISTENER,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,32,6,260,16
+    CONTROL         208,IDC_STATIC,"Static",SS_BITMAP,36,112,286,159
+    GROUPBOX        "@S_1",S_1,7,30,343,79
+    LTEXT           "@S_2",IDC_STATIC,14,42,329,31
+    CONTROL         "@R_OVER_ICMP",R_OVER_ICMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,73,272,12
+    CONTROL         "@R_OVER_DNS",R_OVER_DNS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,29,90,272,12
+    DEFPUSHBUTTON   "@IDOK",IDOK,241,299,52,14
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,298,299,52,14
+    LTEXT           "@S_3",IDC_STATIC,7,301,224,18
+    LTEXT           "@S_4",IDC_STATIC,7,275,343,24
 END
 
-D_SM_REDIRECT DIALOGEX 0, 0, 358, 363
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_REDIRECT DIALOGEX 0, 0, 358, 311
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_REDIRECT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INTERNET,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_1",IDC_STATIC,31,7,320,53
-    GROUPBOX        "@S_2",IDC_STATIC,7,63,344,111
-    RTEXT           "@S_BOLD2",S_BOLD2,10,82,71,11
-    EDITTEXT        E_URL,86,78,257,17,ES_AUTOHSCROLL
-    RTEXT           "@S_3",IDC_STATIC,14,103,52,12
-    RTEXT           "@S_4",IDC_STATIC,23,118,102,13
-    EDITTEXT        E_SAMPLE1,128,117,215,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    RTEXT           "@S_5",IDC_STATIC,23,136,102,14
-    EDITTEXT        E_SAMPLE2,128,135,215,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    PUSHBUTTON      "@B_HINT",B_HINT,197,150,146,19
-    GROUPBOX        "@S_6",IDC_STATIC,7,182,344,148
-    ICON            ICO_WARNING,IDC_STATIC,11,195,20,20
-    LTEXT           "@S_BOLD",S_BOLD,35,197,308,20
-    LTEXT           "@S_7",IDC_STATIC,35,224,308,20
-    LTEXT           "@S_8",IDC_STATIC,35,249,308,12
-    LTEXT           "@S_9",IDC_STATIC,35,267,308,26
-    LTEXT           "@S_10",IDC_STATIC,35,293,308,33
-    DEFPUSHBUTTON   "@IDOK",IDOK,219,337,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,287,337,64,19
-    LTEXT           "@S_11",IDC_STATIC,15,151,175,21
+    ICON            ICO_INTERNET,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_1",IDC_STATIC,31,5,320,46
+    GROUPBOX        "@S_2",IDC_STATIC,7,53,344,96
+    RTEXT           "@S_BOLD2",S_BOLD2,10,70,71,10
+    EDITTEXT        E_URL,86,66,257,15,ES_AUTOHSCROLL
+    RTEXT           "@S_3",IDC_STATIC,14,88,52,11
+    RTEXT           "@S_4",IDC_STATIC,23,101,102,12
+    EDITTEXT        E_SAMPLE1,128,100,215,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    RTEXT           "@S_5",IDC_STATIC,23,116,102,12
+    EDITTEXT        E_SAMPLE2,128,115,215,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    PUSHBUTTON      "@B_HINT",B_HINT,197,128,146,17
+    GROUPBOX        "@S_6",IDC_STATIC,7,155,344,127
+    ICON            ICO_WARNING,IDC_STATIC,11,167,20,18
+    LTEXT           "@S_BOLD",S_BOLD,35,168,308,18
+    LTEXT           "@S_7",IDC_STATIC,35,191,308,18
+    LTEXT           "@S_8",IDC_STATIC,35,213,308,11
+    LTEXT           "@S_9",IDC_STATIC,35,228,308,23
+    LTEXT           "@S_10",IDC_STATIC,35,251,308,29
+    DEFPUSHBUTTON   "@IDOK",IDOK,219,288,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,287,288,64,17
+    LTEXT           "@S_11",IDC_STATIC,15,129,175,18
 END
 
-D_SW_TEST1 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_TEST1 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "AAA"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    PUSHBUTTON      "Button1",IDC_BUTTON1,266,128,50,14
-    LTEXT           "HAMNEKO",IDC_STATIC,36,6,50,12
-    PUSHBUTTON      "Button2",IDC_BUTTON2,266,145,50,14
-    PUSHBUTTON      "Button3",IDC_BUTTON3,266,108,50,14
-    PUSHBUTTON      "Button4",IDC_BUTTON4,266,161,50,14
-    ICON            ICO_INSTALLER,IDC_STATIC,7,6,18,21
+    PUSHBUTTON      "Button1",IDC_BUTTON1,266,109,50,12
+    LTEXT           "HAMNEKO",IDC_STATIC,36,5,50,11
+    PUSHBUTTON      "Button2",IDC_BUTTON2,266,124,50,12
+    PUSHBUTTON      "Button3",IDC_BUTTON3,266,92,50,12
+    PUSHBUTTON      "Button4",IDC_BUTTON4,266,137,50,12
+    ICON            ICO_INSTALLER,IDC_STATIC,7,5,18,18
 END
 
-D_DUMMY DIALOGEX 0, 0, 186, 90
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_DUMMY DIALOGEX 0, 0, 186, 77
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dummy"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    PUSHBUTTON      "B_WIZ_NEXT",B_WIZ_NEXT,7,6,50,14
-    PUSHBUTTON      "B_WIZ_PREV",B_WIZ_PREV,7,23,50,14
+    PUSHBUTTON      "B_WIZ_NEXT",B_WIZ_NEXT,7,5,50,12
+    PUSHBUTTON      "B_WIZ_PREV",B_WIZ_PREV,7,19,50,12
 END
 
-D_SW_TEST2 DIALOGEX 0, 0, 175, 99
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_TEST2 DIALOGEX 0, 0, 175, 84
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Testkko"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    PUSHBUTTON      "Button1",IDC_BUTTON1,7,7,50,14
-    LTEXT           "Hanyu",IDC_STATIC,26,44,50,12
-    PUSHBUTTON      "Button2",IDC_BUTTON2,118,7,50,14
-    PUSHBUTTON      "Button3",IDC_BUTTON3,7,78,50,14
-    PUSHBUTTON      "Button4",IDC_BUTTON4,118,78,50,14
+    PUSHBUTTON      "Button1",IDC_BUTTON1,7,5,50,12
+    LTEXT           "Hanyu",IDC_STATIC,26,37,50,11
+    PUSHBUTTON      "Button2",IDC_BUTTON2,118,5,50,12
+    PUSHBUTTON      "Button3",IDC_BUTTON3,7,66,50,12
+    PUSHBUTTON      "Button4",IDC_BUTTON4,118,66,50,12
 END
 
-D_SW_DEFAULT DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_DEFAULT DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_DEFAULT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
 END
 
-D_SW_WELCOME DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_WELCOME DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_WELCOME"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INSTALLER,IDC_STATIC,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_WELCOME",S_WELCOME,39,22,277,50
-    LTEXT           "@S_TITLE",S_TITLE,39,6,277,11
-    CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,54,74,245,107
+    ICON            ICO_INSTALLER,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_WELCOME",S_WELCOME,39,18,277,43
+    LTEXT           "@S_TITLE",S_TITLE,39,5,277,10
+    CONTROL         223,IDC_STATIC,"Static",SS_BITMAP,54,63,245,92
 END
 
-D_SW_MODE DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_MODE DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_MODE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         "@R_SYSTEM",R_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,56,75,242,12
-    CONTROL         "@R_USER",R_USER,"Button",BS_AUTORADIOBUTTON,56,122,242,12
-    LTEXT           "@S_1",IDC_STATIC,68,91,241,27
-    LTEXT           "@S_USER",S_USER,68,137,241,27
-    ICON            ICO_TOWER,IDC_STATIC,20,75,20,20
-    ICON            ICO_USER,IDC_STATIC,20,122,20,20
-    LTEXT           "@S_2",IDC_STATIC,7,6,309,63
-    ICON            ICO_TEST,S_UAC,42,75,20,20
+    CONTROL         "@R_SYSTEM",R_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,56,64,242,11
+    CONTROL         "@R_USER",R_USER,"Button",BS_AUTORADIOBUTTON,56,104,242,11
+    LTEXT           "@S_1",IDC_STATIC,68,77,241,24
+    LTEXT           "@S_USER",S_USER,68,117,241,24
+    ICON            ICO_TOWER,IDC_STATIC,20,64,20,18
+    ICON            ICO_USER,IDC_STATIC,20,104,20,18
+    LTEXT           "@S_2",IDC_STATIC,7,5,309,54
+    ICON            ICO_TEST,S_UAC,42,64,20,18
 END
 
-D_SW_NOT_ADMIN DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_NOT_ADMIN DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_NOT_ADMIN"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INFORMATION,IDC_STATIC,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_INFO",S_INFO,39,6,277,55
-    LTEXT           "@S_INFO6",S_INFO6,39,162,277,13
-    LTEXT           "@S_INFO2",S_INFO2,39,72,277,32
+    ICON            ICO_INFORMATION,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_INFO",S_INFO,39,5,277,48
+    LTEXT           "@S_INFO6",S_INFO6,39,138,277,12
+    LTEXT           "@S_INFO2",S_INFO2,39,61,277,28
 END
 
-D_SW_COMPONENTS DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_COMPONENTS DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_DEFAULT"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,4,309,98
-    LTEXT           "INFO",S_TITLE,7,114,309,16
-    LTEXT           "Static",S_DESCRIPTION,44,135,272,44
-    ICON            ICO_TEST,S_ICON,19,134,18,21
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,3,309,84
+    LTEXT           "INFO",S_TITLE,7,97,309,14
+    LTEXT           "Static",S_DESCRIPTION,44,115,272,38
+    ICON            ICO_TEST,S_ICON,19,114,18,18
 END
 
-D_SW_EULA DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_EULA DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_EULA"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_1",IDC_STATIC,7,2,309,12,WS_TABSTOP
-    EDITTEXT        E_TEXT,7,19,309,111,ES_MULTILINE | ES_READONLY | WS_VSCROLL
-    CONTROL         "@B_AGREE",B_AGREE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,297,12
+    LTEXT           "@S_1",IDC_STATIC,7,1,309,11,WS_TABSTOP
+    EDITTEXT        E_TEXT,7,16,309,96,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+    CONTROL         "@B_AGREE",B_AGREE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,118,297,11
 END
 
-D_SW_WARNING DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_WARNING DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_WARNING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_1",IDC_STATIC,22,2,294,19,WS_TABSTOP
-    EDITTEXT        E_TEXT,7,27,309,115,ES_MULTILINE | ES_READONLY | WS_VSCROLL
-    ICON            ICO_INFORMATION,IDC_STATIC,0,0,20,20
+    LTEXT           "@S_1",IDC_STATIC,22,1,294,17,WS_TABSTOP
+    EDITTEXT        E_TEXT,7,23,309,99,ES_MULTILINE | ES_READONLY | WS_VSCROLL
+    ICON            ICO_INFORMATION,IDC_STATIC,0,0,20,18
 END
 
-D_SW_DIR DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_DIR DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_DIR"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TEST,S_ICON,2,1,20,20,WS_TABSTOP
-    LTEXT           "@S_INFO",S_INFO,29,6,287,21
-    CONTROL         "dest_dir",R_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,33,30,283,12
-    CONTROL         "@R_CUSTOM",R_CUSTOM,"Button",BS_AUTORADIOBUTTON,33,47,283,12
-    RTEXT           "@S_DEST",S_DEST,7,69,72,12
-    EDITTEXT        E_DIR,82,67,179,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "@B_BROWSE",B_BROWSE,269,65,46,15
-    CONTROL         "@R_SHOWCUSTOM",R_SHOWCUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,105,283,10
-    CONTROL         "@R_FOR_SYSTEM",R_FOR_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,46,122,263,10
-    CONTROL         "@R_FOR_USER",R_FOR_USER,"Button",BS_AUTORADIOBUTTON,46,137,263,10
-    ICON            ICO_WARNING,S_WARNING2,36,154,20,20
-    LTEXT           "@S_WARNING",S_WARNING,60,155,256,26
+    ICON            ICO_TEST,S_ICON,2,0,20,18,WS_TABSTOP
+    LTEXT           "@S_INFO",S_INFO,29,5,287,18
+    CONTROL         "dest_dir",R_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,33,25,283,11
+    CONTROL         "@R_CUSTOM",R_CUSTOM,"Button",BS_AUTORADIOBUTTON,33,40,283,11
+    RTEXT           "@S_DEST",S_DEST,7,59,72,11
+    EDITTEXT        E_DIR,82,57,179,11,ES_AUTOHSCROLL
+    PUSHBUTTON      "@B_BROWSE",B_BROWSE,269,55,46,13
+    CONTROL         "@R_SHOWCUSTOM",R_SHOWCUSTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,89,283,9
+    CONTROL         "@R_FOR_SYSTEM",R_FOR_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,46,104,263,9
+    CONTROL         "@R_FOR_USER",R_FOR_USER,"Button",BS_AUTORADIOBUTTON,46,117,263,9
+    ICON            ICO_WARNING,S_WARNING2,36,131,20,18
+    LTEXT           "@S_WARNING",S_WARNING,60,132,256,23
 END
 
-D_SW_READY DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_READY DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_READY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INSTALLER,S_ICON,2,1,20,20,WS_TABSTOP
-    LTEXT           "@S_INFO",S_INFO,29,6,287,21
-    LTEXT           "@S_INFO7",S_INFO7,29,29,287,21
+    ICON            ICO_INSTALLER,S_ICON,2,0,20,18,WS_TABSTOP
+    LTEXT           "@S_INFO",S_INFO,29,5,287,18
+    LTEXT           "@S_INFO7",S_INFO7,29,24,287,18
 END
 
-D_SW_PERFORM DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_PERFORM DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_PERFORM"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TEST,S_ICON,0,76,20,20
-    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",0x0,7,142,309,15
-    LTEXT           "@S_INFO",S_INFO,32,77,284,22
-    LTEXT           "STATUS",S_STATUS,7,116,309,24
-    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,3,0,319,76
+    ICON            ICO_TEST,S_ICON,0,65,20,18
+    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",0x0,7,121,309,13
+    LTEXT           "@S_INFO",S_INFO,32,65,284,19
+    LTEXT           "STATUS",S_STATUS,7,99,309,21
+    CONTROL         224,IDC_STATIC,"Static",SS_BITMAP,3,0,319,66
 END
 
-D_SW_ERROR DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_ERROR DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_ERROR"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_STOP,S_ICON,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_INFO",S_INFO,38,6,278,104
+    ICON            ICO_STOP,S_ICON,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_INFO",S_INFO,38,5,278,90
 END
 
-D_SW_FINISH DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_FINISH DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_FINISH"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TEST,S_ICON,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_INFO",S_INFO,38,6,278,75
-    CONTROL         "RUN_TEXT",B_RUN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,86,271,14
-    LTEXT           "@S_INFO8",S_INFO8,65,132,251,48
-    ICON            ICO_GROUP,S_ICON2,43,130,18,21,WS_TABSTOP
+    ICON            ICO_TEST,S_ICON,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_INFO",S_INFO,38,5,278,65
+    CONTROL         "RUN_TEXT",B_RUN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,73,271,12
+    LTEXT           "@S_INFO8",S_INFO8,65,113,251,42
+    ICON            ICO_GROUP,S_ICON2,43,111,18,18,WS_TABSTOP
 END
 
-D_SW_UNINST1 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_UNINST1 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_UNINST1"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INSTALLER,-1,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_WELCOME",S_WELCOME,39,26,277,55
-    LTEXT           "@S_TITLE",S_TITLE,39,6,277,11
+    ICON            ICO_INSTALLER,-1,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_WELCOME",S_WELCOME,39,22,277,48
+    LTEXT           "@S_TITLE",S_TITLE,39,5,277,10
 END
 
-D_SW_LANG1 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_LANG1 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "D_SW_LANG1"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,65,309,69
-    ICON            ICO_LANGUAGE,IDC_STATIC,7,0,20,20
-    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,57,0,113,24
-    CONTROL         216,IDC_STATIC,"Static",SS_BITMAP,7,27,307,35
-    CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,7,136,307,35
-    EDITTEXT        E_CURRENT,173,4,143,17,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,55,309,60
+    ICON            ICO_LANGUAGE,IDC_STATIC,7,0,20,18
+    CONTROL         218,IDC_STATIC,"Static",SS_BITMAP,57,0,113,21
+    CONTROL         216,IDC_STATIC,"Static",SS_BITMAP,7,23,307,30
+    CONTROL         217,IDC_STATIC,"Static",SS_BITMAP,7,116,307,30
+    EDITTEXT        E_CURRENT,173,3,143,15,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY
 END
 
-D_SW_EASY1 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_EASY1 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_EASY1"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_EASYINSTALLER,IDC_STATIC,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_WELCOME",S_WELCOME,39,31,277,36
-    LTEXT           "@S_TITLE",S_TITLE,39,6,277,11
-    LTEXT           "@S_WELCOME2",S_WELCOME2,39,72,277,36
-    LTEXT           "@S_WELCOME3",S_WELCOME3,39,114,277,36
+    ICON            ICO_EASYINSTALLER,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_WELCOME",S_WELCOME,39,26,277,31
+    LTEXT           "@S_TITLE",S_TITLE,39,5,277,10
+    LTEXT           "@S_WELCOME2",S_WELCOME2,39,61,277,31
+    LTEXT           "@S_WELCOME3",S_WELCOME3,39,97,277,31
 END
 
-D_SW_EASY2 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_EASY2 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_EASY2"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SETUP,IDC_STATIC,7,6,18,21,WS_TABSTOP
-    LTEXT           "@S_BOLD1",S_BOLD1,35,6,281,13
-    LTEXT           "@S_1",S_1,44,26,272,32
-    RTEXT           "@S_18",S_18,7,61,79,13
-    EDITTEXT        E_SETTING,88,59,177,12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "@B_BROWSE_SETTING",B_BROWSE_SETTING,270,57,46,15
-    CONTROL         "@B_DELETE_SENSITIVE",B_DELETE_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,77,227,12
-    LTEXT           "@S_BOLD2",S_BOLD2,35,95,281,13
-    LTEXT           "@S_3",S_3,44,115,272,25
-    RTEXT           "@S_19",S_19,7,148,79,13
-    EDITTEXT        E_OUT,88,146,177,12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "@B_BROWSE_OUT",B_BROWSE_OUT,270,144,46,15
-    CONTROL         "@B_EASYMODE",B_EASYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,163,227,12
+    ICON            ICO_SETUP,IDC_STATIC,7,5,18,18,WS_TABSTOP
+    LTEXT           "@S_BOLD1",S_BOLD1,35,5,281,12
+    LTEXT           "@S_1",S_1,44,22,272,28
+    RTEXT           "@S_18",S_18,7,52,79,12
+    EDITTEXT        E_SETTING,88,50,177,11,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "@B_BROWSE_SETTING",B_BROWSE_SETTING,270,48,46,13
+    CONTROL         "@B_DELETE_SENSITIVE",B_DELETE_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,65,227,11
+    LTEXT           "@S_BOLD2",S_BOLD2,35,81,281,12
+    LTEXT           "@S_3",S_3,44,98,272,22
+    RTEXT           "@S_19",S_19,7,126,79,12
+    EDITTEXT        E_OUT,88,125,177,11,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "@B_BROWSE_OUT",B_BROWSE_OUT,270,123,46,13
+    CONTROL         "@B_EASYMODE",B_EASYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,139,227,11
 END
 
-D_SW_WEB1 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_WEB1 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_WEB1"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_INTERNET,IDC_STATIC,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_WELCOME",S_WELCOME,39,31,277,36
-    LTEXT           "@S_TITLE",S_TITLE,39,6,277,11
-    LTEXT           "@S_WELCOME2",S_WELCOME2,39,72,277,36
-    LTEXT           "@S_WELCOME3",S_WELCOME3,39,114,277,36
+    ICON            ICO_INTERNET,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_WELCOME",S_WELCOME,39,26,277,31
+    LTEXT           "@S_TITLE",S_TITLE,39,5,277,10
+    LTEXT           "@S_WELCOME2",S_WELCOME2,39,61,277,31
+    LTEXT           "@S_WELCOME3",S_WELCOME3,39,97,277,31
 END
 
-D_SW_WEB2 DIALOGEX 0, 0, 323, 181
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SW_WEB2 DIALOGEX 0, 0, 323, 155
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SW_WEB2"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_SETUP,IDC_STATIC,7,6,20,20,WS_TABSTOP
-    LTEXT           "@S_BOLD1",S_BOLD1,35,6,281,13
-    LTEXT           "@S_1",S_1,44,26,272,32
-    RTEXT           "@S_18",S_18,7,61,79,13
-    EDITTEXT        E_SETTING,88,59,177,12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "@B_BROWSE_SETTING",B_BROWSE_SETTING,270,57,46,15
-    CONTROL         "@B_DELETE_SENSITIVE",B_DELETE_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,77,227,12
-    LTEXT           "@S_BOLD2",S_BOLD2,35,95,281,13
-    LTEXT           "@S_3",S_3,44,115,272,25
-    RTEXT           "@S_19",S_19,7,148,79,13
-    EDITTEXT        E_OUT,88,146,177,12,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "@B_BROWSE_OUT",B_BROWSE_OUT,270,144,46,15
-    CONTROL         "@B_EASYMODE",B_EASYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,163,227,12
+    ICON            ICO_SETUP,IDC_STATIC,7,5,20,18,WS_TABSTOP
+    LTEXT           "@S_BOLD1",S_BOLD1,35,5,281,12
+    LTEXT           "@S_1",S_1,44,22,272,28
+    RTEXT           "@S_18",S_18,7,52,79,12
+    EDITTEXT        E_SETTING,88,50,177,11,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "@B_BROWSE_SETTING",B_BROWSE_SETTING,270,48,46,13
+    CONTROL         "@B_DELETE_SENSITIVE",B_DELETE_SENSITIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,65,227,11
+    LTEXT           "@S_BOLD2",S_BOLD2,35,81,281,12
+    LTEXT           "@S_3",S_3,44,98,272,22
+    RTEXT           "@S_19",S_19,7,126,79,12
+    EDITTEXT        E_OUT,88,125,177,11,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "@B_BROWSE_OUT",B_BROWSE_OUT,270,123,46,13
+    CONTROL         "@B_EASYMODE",B_EASYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,139,227,11
 END
 
-D_UPDATE_NOTICE DIALOGEX 0, 0, 259, 239
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_UPDATE_NOTICE DIALOGEX 0, 0, 259, 204
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOPMOST
 CAPTION "@D_UPDATE_NOTICE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         225,IDC_STATIC,"Static",SS_BITMAP | WS_TABSTOP,2,2,254,79
-    DEFPUSHBUTTON   "@IDOK",IDOK,7,213,117,19
-    PUSHBUTTON      "@B_CONFIG",B_CONFIG,162,112,90,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,135,213,117,19
-    LTEXT           "@S_INFO",S_INFO,7,82,245,28
-    RTEXT           "@S_PRODUCT",S_PRODUCT,7,141,77,17
-    LTEXT           "TITLE",S_PRODUCT_STR,90,139,162,18
-    RTEXT           "@S_CURRENT",S_CURRENT,7,164,77,18
-    LTEXT           "@S_CURRENT_STR",S_CURRENT_STR,90,162,162,18
-    RTEXT           "@S_LATEST",S_LATEST,7,188,77,18
-    LTEXT           "@S_LATEST_STR",S_LATEST_STR,90,186,162,19
+    CONTROL         225,IDC_STATIC,"Static",SS_BITMAP | WS_TABSTOP,2,1,254,68
+    DEFPUSHBUTTON   "@IDOK",IDOK,7,182,117,17
+    PUSHBUTTON      "@B_CONFIG",B_CONFIG,162,95,90,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,135,182,117,17
+    LTEXT           "@S_INFO",S_INFO,7,70,245,24
+    RTEXT           "@S_PRODUCT",S_PRODUCT,7,120,77,15
+    LTEXT           "TITLE",S_PRODUCT_STR,90,119,162,16
+    RTEXT           "@S_CURRENT",S_CURRENT,7,140,77,16
+    LTEXT           "@S_CURRENT_STR",S_CURRENT_STR,90,138,162,16
+    RTEXT           "@S_LATEST",S_LATEST,7,161,77,16
+    LTEXT           "@S_LATEST_STR",S_LATEST_STR,90,159,162,17
 END
 
-D_UPDATE_CONFIG DIALOGEX 0, 0, 307, 155
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_UPDATE_CONFIG DIALOGEX 0, 0, 307, 132
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOPMOST
 CAPTION "@D_UPDATE_CONFIG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_INFO",S_INFO,7,32,293,54
-    LTEXT           "@S_TITLE",S_TITLE,7,7,293,24
-    CONTROL         "@S_ENABLE",S_ENABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,48,94,157,13
-    CONTROL         "@S_DISBLE",S_DISBLE,"Button",BS_AUTORADIOBUTTON,48,113,157,13
-    ICON            ICO_MACHINE,IDC_STATIC,16,93,20,20
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,236,131,64,17
+    LTEXT           "@S_INFO",S_INFO,7,27,293,47
+    LTEXT           "@S_TITLE",S_TITLE,7,5,293,21
+    CONTROL         "@S_ENABLE",S_ENABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,48,80,157,12
+    CONTROL         "@S_DISBLE",S_DISBLE,"Button",BS_AUTORADIOBUTTON,48,96,157,12
+    ICON            ICO_MACHINE,IDC_STATIC,16,79,20,18
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,236,112,64,15
 END
 
-D_SM_VMBRIDGE DIALOGEX 0, 0, 311, 315
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_VMBRIDGE DIALOGEX 0, 0, 311, 269
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_VMBRIDGE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         228,IDC_STATIC,"Static",SS_BITMAP,12,76,286,85
-    ICON            ICO_NIC_ONLINE,IDC_STATIC,6,5,18,21
-    LTEXT           "@S_TITLE",S_TITLE,32,7,272,22
-    LTEXT           "@S_1",IDC_STATIC,7,31,297,27
-    LTEXT           "@S_2",IDC_STATIC,14,168,282,105
-    GROUPBOX        "@S_BOLD",S_BOLD,7,61,297,219
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,248,290,56,18
+    CONTROL         228,IDC_STATIC,"Static",SS_BITMAP,12,65,286,73
+    ICON            ICO_NIC_ONLINE,IDC_STATIC,6,4,18,18
+    LTEXT           "@S_TITLE",S_TITLE,32,5,272,19
+    LTEXT           "@S_1",IDC_STATIC,7,26,297,24
+    LTEXT           "@S_2",IDC_STATIC,14,143,282,90
+    GROUPBOX        "@S_BOLD",S_BOLD,7,52,297,188
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,248,248,56,16
 END
 
-D_SM_AZURE DIALOGEX 0, 0, 411, 371
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_AZURE DIALOGEX 0, 0, 411, 317
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_AZURE"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         229,S_BMP_EN,"Static",SS_BITMAP,7,0,397,201
-    LTEXT           "@S_TITLE",S_TITLE,7,207,397,18
-    LTEXT           "@S_1",IDC_STATIC,7,227,397,27
-    LTEXT           "@S_2",IDC_STATIC,7,254,397,27
-    LTEXT           "@S_3",IDC_STATIC,30,281,374,24
-    GROUPBOX        "@B_BOLD",B_BOLD,7,309,112,55
-    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,319,102,14
-    CONTROL         "@R_DISABLE",R_DISABLE,"Button",BS_AUTORADIOBUTTON,13,347,101,14
-    GROUPBOX        "@S_HOSTNAME_BORDER",S_HOSTNAME_BORDER,123,309,204,55
-    LTEXT           "@S_HOSTNAME_INFO",S_HOSTNAME_INFO,129,321,191,22
-    EDITTEXT        E_HOST,129,345,118,15,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
-    PUSHBUTTON      "@B_CHANGE",B_CHANGE,252,343,67,17
-    PUSHBUTTON      "@B_WEB",B_WEB,332,305,72,35,BS_MULTILINE
-    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,331,346,73,18
-    CONTROL         230,S_BMP_JA,"Static",SS_BITMAP,7,0,397,201
-    ICON            ICO_AZURE,IDC_STATIC,7,280,20,20
-    LTEXT           "STATUS_STRING",S_STATUS,22,336,95,10
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,204,415,1
-    CONTROL         232,S_BMP_CN,"Static",SS_BITMAP,7,0,397,201
+    CONTROL         229,S_BMP_EN,"Static",SS_BITMAP,7,0,397,173
+    LTEXT           "@S_TITLE",S_TITLE,7,177,397,16
+    LTEXT           "@S_1",IDC_STATIC,7,194,397,24
+    LTEXT           "@S_2",IDC_STATIC,7,217,397,24
+    LTEXT           "@S_3",IDC_STATIC,30,240,374,21
+    GROUPBOX        "@B_BOLD",B_BOLD,7,264,112,48
+    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,273,102,12
+    CONTROL         "@R_DISABLE",R_DISABLE,"Button",BS_AUTORADIOBUTTON,13,297,101,12
+    GROUPBOX        "@S_HOSTNAME_BORDER",S_HOSTNAME_BORDER,123,264,204,48
+    LTEXT           "@S_HOSTNAME_INFO",S_HOSTNAME_INFO,129,275,191,19
+    EDITTEXT        E_HOST,129,295,118,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
+    PUSHBUTTON      "@B_CHANGE",B_CHANGE,252,293,67,15
+    PUSHBUTTON      "@B_WEB",B_WEB,332,261,72,30,BS_MULTILINE
+    DEFPUSHBUTTON   "@IDCANCEL",IDCANCEL,331,296,73,16
+    CONTROL         230,S_BMP_JA,"Static",SS_BITMAP,7,0,397,173
+    ICON            ICO_AZURE,IDC_STATIC,7,239,20,18
+    LTEXT           "STATUS_STRING",S_STATUS,22,287,95,9
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,174,415,1
+    CONTROL         232,S_BMP_CN,"Static",SS_BITMAP,7,0,397,173
 END
 
-D_SM_PROXY DIALOGEX 0, 0, 227, 167
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_SM_PROXY DIALOGEX 0, 0, 227, 143
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_SM_PROXY"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_TOWER,IDC_STATIC,7,7,20,20
-    LTEXT           "@STATIC9",IDC_STATIC,33,7,187,19
-    RTEXT           "@STATIC10",IDC_STATIC,7,46,54,11
-    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,65,44,135,11
-    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,65,56,135,11
-    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,65,68,135,11
-    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,67,92,114,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,87,143,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,156,143,64,17
+    ICON            ICO_TOWER,IDC_STATIC,7,5,20,18
+    LTEXT           "@STATIC9",IDC_STATIC,33,5,187,17
+    RTEXT           "@STATIC10",IDC_STATIC,7,39,54,10
+    CONTROL         "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,65,37,135,10
+    CONTROL         "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,65,47,135,10
+    CONTROL         "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,65,58,135,10
+    PUSHBUTTON      "@B_PROXY_CONFIG",B_PROXY_CONFIG,67,78,114,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,87,122,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,156,122,64,15
 END
 
-D_VGC_LIST DIALOGEX 0, 0, 446, 354
-STYLE DS_SETFONT | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+D_VGC_LIST DIALOGEX 0, 0, 446, 303
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "@D_VGC_LIST"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_RESEARCH,IDC_STATIC,7,9,20,20
-    LTEXT           "@S_TITLE",S_TITLE,30,7,186,17
-    LTEXT           "@S_INFO1",S_INFO1,30,28,331,25
-    LTEXT           "STATIC",S_BOLD,8,65,352,11
-    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,80,432,211
-    DEFPUSHBUTTON   "@IDOK",IDOK,276,321,163,25
-    PUSHBUTTON      "@B_PROXY",B_PROXY,7,320,62,18
-    RTEXT           "@S_VLAN",S_VLAN,69,324,81,15
-    COMBOBOX        C_VLAN,153,322,87,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "@B_WEB",B_WEB,369,22,70,26,BS_MULTILINE
-    PUSHBUTTON      "@B_REFRESH",B_REFRESH,369,55,70,18
-    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE,372,62,63,10
-    LTEXT           "@S_REFRESH",S_REFRESH,375,51,71,9,NOT WS_VISIBLE
-    LTEXT           "Implemented as a plug-in for SoftEther VPN. (c) VPN Gate Project at University of Tsukuba, Japan.",S_COPYRIGHT,7,343,268,8
-    CONTROL         240,S_TSUKUBA,"Static",SS_BITMAP,397,3,44,15
-    RTEXT           "@S_RESEARCH",S_RESEARCH,219,6,174,12
-    LTEXT           "@S_INFO9",S_INFO9,7,294,432,26
+    ICON            ICO_RESEARCH,IDC_STATIC,7,7,20,18
+    LTEXT           "@S_TITLE",S_TITLE,30,5,186,15
+    LTEXT           "@S_INFO1",S_INFO1,30,23,331,22
+    LTEXT           "STATIC",S_BOLD,8,55,352,10
+    CONTROL         "",L_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,68,432,181
+    DEFPUSHBUTTON   "@IDOK",IDOK,276,275,163,22
+    PUSHBUTTON      "@B_PROXY",B_PROXY,7,274,62,16
+    RTEXT           "@S_VLAN",S_VLAN,69,277,81,13
+    COMBOBOX        C_VLAN,153,275,87,87,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "@B_WEB",B_WEB,369,18,70,23,BS_MULTILINE
+    PUSHBUTTON      "@B_REFRESH",B_REFRESH,369,47,70,16
+    CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE,372,53,63,9
+    LTEXT           "@S_REFRESH",S_REFRESH,375,43,71,8,NOT WS_VISIBLE
+    LTEXT           "Implemented as a plug-in for SoftEther VPN. (c) VPN Gate Project at University of Tsukuba, Japan.",S_COPYRIGHT,7,293,268,7
+    CONTROL         240,S_TSUKUBA,"Static",SS_BITMAP,397,2,44,13
+    RTEXT           "@S_RESEARCH",S_RESEARCH,219,5,174,11
+    LTEXT           "@S_INFO9",S_INFO9,7,251,432,23
 END
 
-D_VGC_PROTOCOL DIALOGEX 0, 0, 283, 173
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_VGC_PROTOCOL DIALOGEX 0, 0, 283, 148
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_VGC_PROTOCOL"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    LTEXT           "@S_TITLE",S_TITLE,34,7,240,33
-    LTEXT           "@S_INFO",S_INFO,34,45,240,43
-    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,50,93,198,17
-    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,50,113,198,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,136,147,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,204,147,64,19
-    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,7,20,20
+    LTEXT           "@S_TITLE",S_TITLE,34,5,240,29
+    LTEXT           "@S_INFO",S_INFO,34,38,240,37
+    CONTROL         "@R_TCP",R_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,50,79,198,15
+    CONTROL         "@R_UDP",R_UDP,"Button",BS_AUTORADIOBUTTON,50,96,198,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,136,125,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,204,125,64,17
+    ICON            ICO_SERVER_ONLINE,IDC_STATIC,7,5,20,18
 END
 
-D_VGS_CONFIG DIALOGEX 0, 0, 370, 363
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_VGS_CONFIG DIALOGEX 0, 0, 370, 311
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_VGS_CONFIG"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,265,330,15
-    CONTROL         238,S_VPNGATEJA,"Static",SS_BITMAP,0,0,370,158
-    ICON            ICO_RESEARCH,IDC_STATIC,7,167,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,170,195,17
-    LTEXT           "@S_INFO1",S_INFO1,33,191,330,36
-    LTEXT           "@S_INFO9",S_INFO9,33,228,330,36
-    ICON            ICO_INFORMATION,IDC_STATIC,42,286,20,20
-    LTEXT           "@S_WARNING",S_WARNING,66,286,297,52
-    PUSHBUTTON      "@B_OPTION",B_OPTION,7,339,137,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,230,339,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,299,339,64,17
-    PUSHBUTTON      "@B_WEB",B_WEB,228,168,135,17
-    CONTROL         237,S_VPNGATEEN,"Static",SS_BITMAP,0,0,370,158
+    CONTROL         "@R_ENABLE",R_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,227,330,13
+    CONTROL         238,S_VPNGATEJA,"Static",SS_BITMAP,0,0,370,136
+    ICON            ICO_RESEARCH,IDC_STATIC,7,143,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,145,195,15
+    LTEXT           "@S_INFO1",S_INFO1,33,163,330,31
+    LTEXT           "@S_INFO9",S_INFO9,33,195,330,31
+    ICON            ICO_INFORMATION,IDC_STATIC,42,245,20,18
+    LTEXT           "@S_WARNING",S_WARNING,66,245,297,45
+    PUSHBUTTON      "@B_OPTION",B_OPTION,7,290,137,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,230,290,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,299,290,64,15
+    PUSHBUTTON      "@B_WEB",B_WEB,228,143,135,15
+    CONTROL         237,S_VPNGATEEN,"Static",SS_BITMAP,0,0,370,136
 END
 
-D_VGS_OPTION DIALOGEX 0, 0, 355, 345
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_VGS_OPTION DIALOGEX 0, 0, 355, 295
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_VGS_OPTION"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_RESEARCH,IDC_STATIC,7,7,20,20
-    LTEXT           "@S_TITLE",S_TITLE,33,7,315,22
-    GROUPBOX        "@S_2",S_2,7,35,341,149
-    LTEXT           "@S_1",S_1,41,48,293,34
-    RTEXT           "@S_3",S_3,14,87,114,11
-    EDITTEXT        E_OWNER,132,85,150,12,ES_AUTOHSCROLL
-    LTEXT           "@S_19",S_19,287,87,56,12
-    RTEXT           "@S_20",S_20,14,104,114,18
-    EDITTEXT        E_ABUSE,132,109,150,12,ES_AUTOHSCROLL
-    LTEXT           "@S_21",S_21,287,111,59,15
-    ICON            ICO_GROUP,IDC_STATIC,14,47,20,20
-    RTEXT           "@S_22",S_22,14,129,114,31
-    EDITTEXT        E_MSG,132,128,207,31,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL
-    LTEXT           "@S_23",S_23,132,163,208,18
-    GROUPBOX        "@S_24",S_24,7,187,341,130
-    ICON            ICO_MACHINE,IDC_STATIC,14,201,20,20
-    CONTROL         "@R_LOG",R_LOG,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,46,202,293,10
-    CONTROL         "@R_2WEEKS",R_2WEEKS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,56,219,284,10
-    CONTROL         "@R_PERMANENT",R_PERMANENT,"Button",BS_AUTORADIOBUTTON,56,234,284,10
-    CONTROL         "@R_L2TP",R_L2TP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,253,293,10
-    LTEXT           "@S_25",S_25,55,269,285,12
-    PUSHBUTTON      "@B_MESSAGE",B_MESSAGE,45,286,268,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,215,321,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,284,321,64,17
+    ICON            ICO_RESEARCH,IDC_STATIC,7,5,20,18
+    LTEXT           "@S_TITLE",S_TITLE,33,5,315,19
+    GROUPBOX        "@S_2",S_2,7,29,341,128
+    LTEXT           "@S_1",S_1,41,41,293,30
+    RTEXT           "@S_3",S_3,14,74,114,10
+    EDITTEXT        E_OWNER,132,72,150,11,ES_AUTOHSCROLL
+    LTEXT           "@S_19",S_19,287,74,56,11
+    RTEXT           "@S_20",S_20,14,89,114,16
+    EDITTEXT        E_ABUSE,132,93,150,11,ES_AUTOHSCROLL
+    LTEXT           "@S_21",S_21,287,95,59,13
+    ICON            ICO_GROUP,IDC_STATIC,14,40,20,18
+    RTEXT           "@S_22",S_22,14,110,114,27
+    EDITTEXT        E_MSG,132,109,207,27,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL
+    LTEXT           "@S_23",S_23,132,139,208,16
+    GROUPBOX        "@S_24",S_24,7,160,341,112
+    ICON            ICO_MACHINE,IDC_STATIC,14,172,20,18
+    CONTROL         "@R_LOG",R_LOG,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,46,173,293,9
+    CONTROL         "@R_2WEEKS",R_2WEEKS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,56,187,284,9
+    CONTROL         "@R_PERMANENT",R_PERMANENT,"Button",BS_AUTORADIOBUTTON,56,200,284,9
+    CONTROL         "@R_L2TP",R_L2TP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,216,293,9
+    LTEXT           "@S_25",S_25,55,230,285,11
+    PUSHBUTTON      "@B_MESSAGE",B_MESSAGE,45,245,268,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,215,275,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,284,275,64,15
 END
 
-D_VGS_WARNING DIALOGEX 0, 0, 349, 291
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_VGS_WARNING DIALOGEX 0, 0, 349, 249
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_VGS_WARNING"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_POLICE,IDC_STATIC,7,7,20,20
-    LTEXT           "@S1",S1,32,41,310,32
-    LTEXT           "@S2",S2,32,75,310,46
-    LTEXT           "@S3",S3,32,121,310,34
-    LTEXT           "@S4",S4,32,156,310,27
-    LTEXT           "@S5",S5,32,185,310,55
-    CONTROL         "@R_NEVER",R_NEVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,246,297,13
-    PUSHBUTTON      "@B_WEB",B_WEB,7,267,123,17
-    DEFPUSHBUTTON   "@IDOK",IDOK,209,267,64,17
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,278,267,64,17
-    LTEXT           "@S_BOLD",S_BOLD,32,7,310,31
-    ICON            ICO_RESEARCH,IDC_STATIC,7,185,20,20
+    ICON            ICO_POLICE,IDC_STATIC,7,5,20,18
+    LTEXT           "@S1",S1,32,35,310,28
+    LTEXT           "@S2",S2,32,64,310,40
+    LTEXT           "@S3",S3,32,103,310,30
+    LTEXT           "@S4",S4,32,133,310,24
+    LTEXT           "@S5",S5,32,158,310,48
+    CONTROL         "@R_NEVER",R_NEVER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,210,297,12
+    PUSHBUTTON      "@B_WEB",B_WEB,7,228,123,15
+    DEFPUSHBUTTON   "@IDOK",IDOK,209,228,64,15
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,278,228,64,15
+    LTEXT           "@S_BOLD",S_BOLD,32,5,310,27
+    ICON            ICO_RESEARCH,IDC_STATIC,7,158,20,18
 END
 
-D_NM_PUSH DIALOGEX 0, 0, 367, 293
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+D_NM_PUSH DIALOGEX 0, 0, 367, 251
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "@D_NM_PUSH"
-FONT 9, "MS UI Gothic", 400, 0, 0x80
+FONT 9, "MS Shell Dlg", 400, 0, 0x80
 BEGIN
-    ICON            ICO_PROTOCOL,IDC_STATIC,7,7,18,21
-    LTEXT           "@S1",S1,35,11,325,28,WS_TABSTOP
-    LTEXT           "@S2",S2,35,39,325,34
-    LTEXT           "@S3",S3,35,75,325,34
-    LTEXT           "@S4",S4,35,111,325,34
-    GROUPBOX        "@S5",S5,23,145,337,111
-    EDITTEXT        E_TEXT,35,203,315,42,ES_MULTILINE | WS_VSCROLL
-    LTEXT           "@S6",IDC_STATIC,35,159,315,42
-    DEFPUSHBUTTON   "@IDOK",IDOK,222,267,64,19
-    PUSHBUTTON      "@IDCANCEL",IDCANCEL,296,267,64,19
-    LTEXT           "@S7",IDC_STATIC,35,272,185,13
+    ICON            ICO_PROTOCOL,IDC_STATIC,7,5,18,18
+    LTEXT           "@S1",S1,35,9,325,24,WS_TABSTOP
+    LTEXT           "@S2",S2,35,33,325,30
+    LTEXT           "@S3",S3,35,64,325,30
+    LTEXT           "@S4",S4,35,95,325,30
+    GROUPBOX        "@S5",S5,23,124,337,96
+    EDITTEXT        E_TEXT,35,173,315,36,ES_MULTILINE | WS_VSCROLL
+    LTEXT           "@S6",IDC_STATIC,35,136,315,36
+    DEFPUSHBUTTON   "@IDOK",IDOK,222,228,64,17
+    PUSHBUTTON      "@IDCANCEL",IDCANCEL,296,228,64,17
+    LTEXT           "@S7",IDC_STATIC,35,233,185,12
 END
 
 
diff --git a/src/bin/hamcore/SeLow_x64.sys b/src/bin/hamcore/SeLow_x64.sys
index dd835d1e..d114c0f4 100644
Binary files a/src/bin/hamcore/SeLow_x64.sys and b/src/bin/hamcore/SeLow_x64.sys differ
diff --git a/src/bin/hamcore/SeLow_x86.sys b/src/bin/hamcore/SeLow_x86.sys
index aa50da8b..b6e3518f 100644
Binary files a/src/bin/hamcore/SeLow_x86.sys and b/src/bin/hamcore/SeLow_x86.sys differ
diff --git a/src/bin/hamcore/chain_certs.txt b/src/bin/hamcore/chain_certs.txt
deleted file mode 100644
index 4b2ad007..00000000
--- a/src/bin/hamcore/chain_certs.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-What is "chain_certs" directory?
---------------------------------
-
-If you are using a child SSL certificate file, which is issued by
-a CA (Certificate Authority), as the server certificate of VPN Server,
-you need to install X.509 format certificate files of the root
-certificate and all intermediate certificates on this "chain_certs"
-directory.
-
-If you don't know how to obtain root and intermediate certificate
-files of your certificate authority (CA), please refer to the CA's
-web site or contact support staffs of the CA.
-
-
-"chain_certs" ディレクトリについて
-----------------------------------
-VPN Server に登録する SSL 証明書が証明機関 (CA) によって発行されたもので
-ある場合は、この "chain_certs" ディレクトリに X.509 証明書のルート証明書
-および中間証明書ファイルをインストールしてください。
-
-ルート証明書および中間証明書ファイルの取得方法は、証明機関 (CA) が発行して
-いる Web サイトをお読みいただくか、証明機関 (CA) のサポートに問い合わせて
-ください。
-
diff --git a/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf b/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf
index e8a37e2f..633f3b7c 100644
--- a/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf
+++ b/src/bin/hamcore/inf/selow_x64/SeLow_x64.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= NetTrans
 ClassGUID					= {4D36E975-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_selow.cat
 
@@ -66,5 +66,5 @@ SeLow_Description			= "A lightweight helper kernel-mode module for PacketiX VPN
 
 
 
-; Auto Generated 20150326_170722.063
+; Auto Generated 20150327_200333.402
 
diff --git a/src/bin/hamcore/inf/selow_x64/inf.cat b/src/bin/hamcore/inf/selow_x64/inf.cat
index 4ec35fd6..15104756 100644
Binary files a/src/bin/hamcore/inf/selow_x64/inf.cat and b/src/bin/hamcore/inf/selow_x64/inf.cat differ
diff --git a/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf b/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf
index e3862f0e..ab617acb 100644
--- a/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf
+++ b/src/bin/hamcore/inf/selow_x86/SeLow_x86.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= NetTrans
 ClassGUID					= {4D36E975-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_selow.cat
 
@@ -66,5 +66,5 @@ SeLow_Description			= "A lightweight helper kernel-mode module for PacketiX VPN
 
 
 
-; Auto Generated 20150326_170553.448
+; Auto Generated 20150327_200112.917
 
diff --git a/src/bin/hamcore/inf/selow_x86/inf.cat b/src/bin/hamcore/inf/selow_x86/inf.cat
index 28f8a006..e9bacd3f 100644
Binary files a/src/bin/hamcore/inf/selow_x86/inf.cat and b/src/bin/hamcore/inf/selow_x86/inf.cat differ
diff --git a/src/bin/hamcore/inf/x64/INF_VPN.inf b/src/bin/hamcore/inf/x64/INF_VPN.inf
index a136078b..6e080c8f 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN10.inf b/src/bin/hamcore/inf/x64/INF_VPN10.inf
index eb1feb37..4ea75c47 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN10.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN10.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN10.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN100.inf b/src/bin/hamcore/inf/x64/INF_VPN100.inf
index 52bed5b2..044ddaa1 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN100.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN100.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN100.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN101.inf b/src/bin/hamcore/inf/x64/INF_VPN101.inf
index 41c446c3..76efcd46 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN101.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN101.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN101.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN102.inf b/src/bin/hamcore/inf/x64/INF_VPN102.inf
index c750afb5..b2e99e18 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN102.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN102.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN102.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN103.inf b/src/bin/hamcore/inf/x64/INF_VPN103.inf
index 00c931e4..22ad30ad 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN103.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN103.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN103.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN104.inf b/src/bin/hamcore/inf/x64/INF_VPN104.inf
index 32ff2d1e..b8a3b2ef 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN104.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN104.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN104.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN105.inf b/src/bin/hamcore/inf/x64/INF_VPN105.inf
index 0e77f6aa..6f3d00fb 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN105.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN105.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN105.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN106.inf b/src/bin/hamcore/inf/x64/INF_VPN106.inf
index 456fee06..ba915390 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN106.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN106.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN106.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN107.inf b/src/bin/hamcore/inf/x64/INF_VPN107.inf
index 4e629769..e5561106 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN107.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN107.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN107.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN108.inf b/src/bin/hamcore/inf/x64/INF_VPN108.inf
index 26ca7bbc..c9ea9a79 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN108.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN108.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN108.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN109.inf b/src/bin/hamcore/inf/x64/INF_VPN109.inf
index f85f0578..d2c72af9 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN109.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN109.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN109.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN11.inf b/src/bin/hamcore/inf/x64/INF_VPN11.inf
index 765e3064..5b07bda9 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN11.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN11.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN11.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN110.inf b/src/bin/hamcore/inf/x64/INF_VPN110.inf
index 990fbb09..1f3350d0 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN110.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN110.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN110.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN111.inf b/src/bin/hamcore/inf/x64/INF_VPN111.inf
index 85009186..3483451f 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN111.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN111.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN111.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN112.inf b/src/bin/hamcore/inf/x64/INF_VPN112.inf
index 528a104e..d58de322 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN112.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN112.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN112.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN113.inf b/src/bin/hamcore/inf/x64/INF_VPN113.inf
index 682f99cd..0d03bb99 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN113.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN113.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN113.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN114.inf b/src/bin/hamcore/inf/x64/INF_VPN114.inf
index c56e8236..94d9e155 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN114.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN114.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN114.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN115.inf b/src/bin/hamcore/inf/x64/INF_VPN115.inf
index 4c9d23e5..88e0849a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN115.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN115.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN115.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN116.inf b/src/bin/hamcore/inf/x64/INF_VPN116.inf
index 38f29aa3..98eafee3 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN116.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN116.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN116.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN117.inf b/src/bin/hamcore/inf/x64/INF_VPN117.inf
index 8d043fd5..8b92364b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN117.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN117.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN117.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN118.inf b/src/bin/hamcore/inf/x64/INF_VPN118.inf
index 867a2680..1c6b1a0e 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN118.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN118.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN118.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN119.inf b/src/bin/hamcore/inf/x64/INF_VPN119.inf
index a4b939fb..55d0af59 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN119.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN119.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN119.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN12.inf b/src/bin/hamcore/inf/x64/INF_VPN12.inf
index b3978b89..b8910e80 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN12.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN12.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN12.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN120.inf b/src/bin/hamcore/inf/x64/INF_VPN120.inf
index d0cb5d2d..de36d76a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN120.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN120.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN120.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN121.inf b/src/bin/hamcore/inf/x64/INF_VPN121.inf
index 419cb0e2..3dfc9e32 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN121.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN121.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN121.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN122.inf b/src/bin/hamcore/inf/x64/INF_VPN122.inf
index 53ec5fec..8fb3cae2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN122.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN122.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN122.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN123.inf b/src/bin/hamcore/inf/x64/INF_VPN123.inf
index 6f82ae3f..cbe4360c 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN123.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN123.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN123.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN124.inf b/src/bin/hamcore/inf/x64/INF_VPN124.inf
index f6c03cad..f93a174e 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN124.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN124.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN124.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN125.inf b/src/bin/hamcore/inf/x64/INF_VPN125.inf
index 0b4d205c..f00d252b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN125.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN125.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN125.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN126.inf b/src/bin/hamcore/inf/x64/INF_VPN126.inf
index 122b1a69..0d72b20a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN126.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN126.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN126.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN127.inf b/src/bin/hamcore/inf/x64/INF_VPN127.inf
index b1d1bcb4..9a3dbb7b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN127.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN127.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN127.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN13.inf b/src/bin/hamcore/inf/x64/INF_VPN13.inf
index b811273e..574b9404 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN13.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN13.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN13.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN14.inf b/src/bin/hamcore/inf/x64/INF_VPN14.inf
index fb0debf5..89deb327 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN14.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN14.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN14.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN15.inf b/src/bin/hamcore/inf/x64/INF_VPN15.inf
index 75d301a4..ebf4df02 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN15.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN15.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN15.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN16.inf b/src/bin/hamcore/inf/x64/INF_VPN16.inf
index 47ce5b40..611776b8 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN16.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN16.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN16.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN17.inf b/src/bin/hamcore/inf/x64/INF_VPN17.inf
index 19728222..3ba00b85 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN17.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN17.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN17.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN18.inf b/src/bin/hamcore/inf/x64/INF_VPN18.inf
index ad3a0289..b31b35b2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN18.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN18.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN18.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN19.inf b/src/bin/hamcore/inf/x64/INF_VPN19.inf
index 8ce85b82..000deccc 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN19.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN19.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN19.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN2.inf b/src/bin/hamcore/inf/x64/INF_VPN2.inf
index e194d6e9..8274e8a3 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN2.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN2.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN2.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN20.inf b/src/bin/hamcore/inf/x64/INF_VPN20.inf
index 1f72285e..c21759cf 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN20.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN20.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN20.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN21.inf b/src/bin/hamcore/inf/x64/INF_VPN21.inf
index 4f07dcaa..e040a37d 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN21.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN21.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN21.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN22.inf b/src/bin/hamcore/inf/x64/INF_VPN22.inf
index 75470730..31253c18 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN22.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN22.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN22.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN23.inf b/src/bin/hamcore/inf/x64/INF_VPN23.inf
index 69b4379f..69ce6c49 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN23.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN23.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN23.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN24.inf b/src/bin/hamcore/inf/x64/INF_VPN24.inf
index f05d9e09..85b75b96 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN24.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN24.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN24.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN25.inf b/src/bin/hamcore/inf/x64/INF_VPN25.inf
index 81ee25dc..f7269c88 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN25.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN25.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN25.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN26.inf b/src/bin/hamcore/inf/x64/INF_VPN26.inf
index 3c1b049d..ffcb2106 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN26.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN26.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN26.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN27.inf b/src/bin/hamcore/inf/x64/INF_VPN27.inf
index ac420be4..2fe3e767 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN27.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN27.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN27.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN28.inf b/src/bin/hamcore/inf/x64/INF_VPN28.inf
index 9c320c84..1a661f2f 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN28.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN28.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN28.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN29.inf b/src/bin/hamcore/inf/x64/INF_VPN29.inf
index 061b09e1..fee54bfb 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN29.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN29.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN29.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN3.inf b/src/bin/hamcore/inf/x64/INF_VPN3.inf
index 042a98c9..e6135c8a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN3.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN3.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN3.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN30.inf b/src/bin/hamcore/inf/x64/INF_VPN30.inf
index 0febb262..f2e7844a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN30.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN30.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN30.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN31.inf b/src/bin/hamcore/inf/x64/INF_VPN31.inf
index 21641c9b..edaea57d 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN31.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN31.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN31.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN32.inf b/src/bin/hamcore/inf/x64/INF_VPN32.inf
index e11903c3..122fdb9c 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN32.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN32.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN32.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN33.inf b/src/bin/hamcore/inf/x64/INF_VPN33.inf
index 8facd3ba..fa7556c1 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN33.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN33.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN33.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN34.inf b/src/bin/hamcore/inf/x64/INF_VPN34.inf
index 6d353497..50b82cb2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN34.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN34.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN34.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN35.inf b/src/bin/hamcore/inf/x64/INF_VPN35.inf
index 017d5435..225d58e5 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN35.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN35.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN35.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN36.inf b/src/bin/hamcore/inf/x64/INF_VPN36.inf
index 6bccb507..25677895 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN36.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN36.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN36.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN37.inf b/src/bin/hamcore/inf/x64/INF_VPN37.inf
index 3eb5e44c..08e6d762 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN37.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN37.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN37.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN38.inf b/src/bin/hamcore/inf/x64/INF_VPN38.inf
index 27dc5c33..8c10c1f2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN38.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN38.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN38.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN39.inf b/src/bin/hamcore/inf/x64/INF_VPN39.inf
index d279f670..926cd8a8 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN39.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN39.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN39.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN4.inf b/src/bin/hamcore/inf/x64/INF_VPN4.inf
index b7a3220c..afb03443 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN4.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN4.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN4.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN40.inf b/src/bin/hamcore/inf/x64/INF_VPN40.inf
index ce1b36d7..c1071d58 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN40.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN40.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN40.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN41.inf b/src/bin/hamcore/inf/x64/INF_VPN41.inf
index 2f25ad65..4ed809ce 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN41.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN41.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN41.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN42.inf b/src/bin/hamcore/inf/x64/INF_VPN42.inf
index 02f211af..c3020324 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN42.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN42.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN42.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN43.inf b/src/bin/hamcore/inf/x64/INF_VPN43.inf
index 4f606099..b5be8c31 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN43.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN43.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN43.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN44.inf b/src/bin/hamcore/inf/x64/INF_VPN44.inf
index 4d3af298..16b8ec85 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN44.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN44.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN44.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN45.inf b/src/bin/hamcore/inf/x64/INF_VPN45.inf
index d4255841..83da2317 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN45.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN45.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN45.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN46.inf b/src/bin/hamcore/inf/x64/INF_VPN46.inf
index d85b81b1..60e72708 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN46.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN46.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN46.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN47.inf b/src/bin/hamcore/inf/x64/INF_VPN47.inf
index 411a4931..4df28e0e 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN47.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN47.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN47.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN48.inf b/src/bin/hamcore/inf/x64/INF_VPN48.inf
index 54713d89..faf4658a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN48.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN48.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN48.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN49.inf b/src/bin/hamcore/inf/x64/INF_VPN49.inf
index 862ae9e5..2d067551 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN49.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN49.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN49.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN5.inf b/src/bin/hamcore/inf/x64/INF_VPN5.inf
index 958174a2..d7e7ca9d 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN5.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN5.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN5.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN50.inf b/src/bin/hamcore/inf/x64/INF_VPN50.inf
index 68aa6db1..823b30e6 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN50.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN50.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN50.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN51.inf b/src/bin/hamcore/inf/x64/INF_VPN51.inf
index a81dcfa9..536df203 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN51.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN51.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN51.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN52.inf b/src/bin/hamcore/inf/x64/INF_VPN52.inf
index bb7f60a2..a803cd93 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN52.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN52.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN52.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN53.inf b/src/bin/hamcore/inf/x64/INF_VPN53.inf
index a247210f..98dc1e03 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN53.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN53.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN53.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN54.inf b/src/bin/hamcore/inf/x64/INF_VPN54.inf
index fec45a74..46cf65c5 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN54.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN54.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN54.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN55.inf b/src/bin/hamcore/inf/x64/INF_VPN55.inf
index 3c0dfc0b..70e0e3f8 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN55.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN55.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN55.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN56.inf b/src/bin/hamcore/inf/x64/INF_VPN56.inf
index 6e563ee2..7503f15a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN56.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN56.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN56.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN57.inf b/src/bin/hamcore/inf/x64/INF_VPN57.inf
index 1b0590ee..39bacae0 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN57.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN57.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN57.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN58.inf b/src/bin/hamcore/inf/x64/INF_VPN58.inf
index 4a550da7..0be89888 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN58.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN58.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN58.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN59.inf b/src/bin/hamcore/inf/x64/INF_VPN59.inf
index 7fe0c2b6..fdca029b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN59.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN59.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN59.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN6.inf b/src/bin/hamcore/inf/x64/INF_VPN6.inf
index 1d58594b..3d81891c 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN6.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN6.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN6.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN60.inf b/src/bin/hamcore/inf/x64/INF_VPN60.inf
index f6f50c75..3120865f 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN60.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN60.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN60.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN61.inf b/src/bin/hamcore/inf/x64/INF_VPN61.inf
index 4aff7f75..97eb86a2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN61.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN61.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN61.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN62.inf b/src/bin/hamcore/inf/x64/INF_VPN62.inf
index a8056da3..898fc656 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN62.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN62.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN62.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN63.inf b/src/bin/hamcore/inf/x64/INF_VPN63.inf
index ab66510e..7a017476 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN63.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN63.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN63.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN64.inf b/src/bin/hamcore/inf/x64/INF_VPN64.inf
index 555f8553..afb67098 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN64.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN64.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN64.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN65.inf b/src/bin/hamcore/inf/x64/INF_VPN65.inf
index 0342376e..1add5593 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN65.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN65.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN65.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN66.inf b/src/bin/hamcore/inf/x64/INF_VPN66.inf
index 52c89906..90bfb0a3 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN66.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN66.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN66.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN67.inf b/src/bin/hamcore/inf/x64/INF_VPN67.inf
index 62a5b286..1d5dbf48 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN67.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN67.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN67.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN68.inf b/src/bin/hamcore/inf/x64/INF_VPN68.inf
index 4e5e0e82..0a7bdecc 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN68.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN68.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN68.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN69.inf b/src/bin/hamcore/inf/x64/INF_VPN69.inf
index c82e465a..ca68582b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN69.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN69.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN69.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN7.inf b/src/bin/hamcore/inf/x64/INF_VPN7.inf
index 64e908ce..763c1dc9 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN7.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN7.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN7.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN70.inf b/src/bin/hamcore/inf/x64/INF_VPN70.inf
index 5c8203e3..40882f6a 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN70.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN70.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN70.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN71.inf b/src/bin/hamcore/inf/x64/INF_VPN71.inf
index 070f964c..ddfedfd0 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN71.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN71.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN71.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN72.inf b/src/bin/hamcore/inf/x64/INF_VPN72.inf
index 81b306f0..21747117 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN72.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN72.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN72.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN73.inf b/src/bin/hamcore/inf/x64/INF_VPN73.inf
index 34bc5cc3..90e9a17f 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN73.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN73.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN73.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN74.inf b/src/bin/hamcore/inf/x64/INF_VPN74.inf
index e480746f..bd9cd091 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN74.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN74.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN74.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN75.inf b/src/bin/hamcore/inf/x64/INF_VPN75.inf
index 78e11bbf..945957d2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN75.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN75.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN75.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN76.inf b/src/bin/hamcore/inf/x64/INF_VPN76.inf
index 2490eb60..846e153b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN76.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN76.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN76.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN77.inf b/src/bin/hamcore/inf/x64/INF_VPN77.inf
index 97c89479..7b445cd2 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN77.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN77.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN77.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN78.inf b/src/bin/hamcore/inf/x64/INF_VPN78.inf
index ae0e4f3c..bb0f2822 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN78.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN78.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN78.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN79.inf b/src/bin/hamcore/inf/x64/INF_VPN79.inf
index d2cac034..31bc0a24 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN79.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN79.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN79.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN8.inf b/src/bin/hamcore/inf/x64/INF_VPN8.inf
index 92a78ba1..f90a1e9b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN8.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN8.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN8.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN80.inf b/src/bin/hamcore/inf/x64/INF_VPN80.inf
index d7582674..ef9e01c7 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN80.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN80.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN80.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN81.inf b/src/bin/hamcore/inf/x64/INF_VPN81.inf
index b43cf0ec..e2dd6fc0 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN81.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN81.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN81.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN82.inf b/src/bin/hamcore/inf/x64/INF_VPN82.inf
index f4f04e5f..2ff5c244 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN82.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN82.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN82.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN83.inf b/src/bin/hamcore/inf/x64/INF_VPN83.inf
index c3b8ac38..40c75aeb 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN83.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN83.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN83.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN84.inf b/src/bin/hamcore/inf/x64/INF_VPN84.inf
index 2acb78bf..19b6334b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN84.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN84.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN84.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN85.inf b/src/bin/hamcore/inf/x64/INF_VPN85.inf
index 02e3b6b9..cf9be010 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN85.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN85.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN85.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN86.inf b/src/bin/hamcore/inf/x64/INF_VPN86.inf
index 4d452d38..92219311 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN86.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN86.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN86.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN87.inf b/src/bin/hamcore/inf/x64/INF_VPN87.inf
index dcce4518..c290b22c 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN87.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN87.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN87.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN88.inf b/src/bin/hamcore/inf/x64/INF_VPN88.inf
index c43530de..61fa6972 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN88.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN88.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN88.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN89.inf b/src/bin/hamcore/inf/x64/INF_VPN89.inf
index 5039fbb6..0e9c561e 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN89.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN89.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN89.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN9.inf b/src/bin/hamcore/inf/x64/INF_VPN9.inf
index 3013a83c..d1954fcf 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN9.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN9.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN9.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN90.inf b/src/bin/hamcore/inf/x64/INF_VPN90.inf
index acca9025..c93f4b96 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN90.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN90.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN90.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN91.inf b/src/bin/hamcore/inf/x64/INF_VPN91.inf
index c1557a5e..8cb480d6 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN91.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN91.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN91.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN92.inf b/src/bin/hamcore/inf/x64/INF_VPN92.inf
index f2c48124..8b503c57 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN92.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN92.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN92.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN93.inf b/src/bin/hamcore/inf/x64/INF_VPN93.inf
index f54db2ba..ca95152e 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN93.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN93.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN93.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN94.inf b/src/bin/hamcore/inf/x64/INF_VPN94.inf
index 80757b12..9d1ba901 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN94.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN94.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN94.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN95.inf b/src/bin/hamcore/inf/x64/INF_VPN95.inf
index 48766c7f..8d77bd97 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN95.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN95.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN95.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN96.inf b/src/bin/hamcore/inf/x64/INF_VPN96.inf
index a2b0972d..55e2a952 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN96.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN96.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN96.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN97.inf b/src/bin/hamcore/inf/x64/INF_VPN97.inf
index 63569489..eff7fe18 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN97.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN97.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN97.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN98.inf b/src/bin/hamcore/inf/x64/INF_VPN98.inf
index 41732892..0b86ef5b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN98.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN98.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN98.cat
 
diff --git a/src/bin/hamcore/inf/x64/INF_VPN99.inf b/src/bin/hamcore/inf/x64/INF_VPN99.inf
index 2fcc2226..00b5b84b 100644
--- a/src/bin/hamcore/inf/x64/INF_VPN99.inf
+++ b/src/bin/hamcore/inf/x64/INF_VPN99.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN99.cat
 
diff --git a/src/bin/hamcore/inf/x64/inf.cat b/src/bin/hamcore/inf/x64/inf.cat
index a59db833..b7fc542e 100644
Binary files a/src/bin/hamcore/inf/x64/inf.cat and b/src/bin/hamcore/inf/x64/inf.cat differ
diff --git a/src/bin/hamcore/inf/x86/INF_VPN.inf b/src/bin/hamcore/inf/x86/INF_VPN.inf
index a2c6301f..f6931314 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN10.inf b/src/bin/hamcore/inf/x86/INF_VPN10.inf
index 34d05fc5..04182399 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN10.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN10.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN10.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN100.inf b/src/bin/hamcore/inf/x86/INF_VPN100.inf
index 69695109..2702efa7 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN100.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN100.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN100.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN101.inf b/src/bin/hamcore/inf/x86/INF_VPN101.inf
index 23b2b984..b624b91e 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN101.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN101.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN101.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN102.inf b/src/bin/hamcore/inf/x86/INF_VPN102.inf
index 16c6ee0b..a671cdad 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN102.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN102.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN102.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN103.inf b/src/bin/hamcore/inf/x86/INF_VPN103.inf
index b1cb15c4..67fcf999 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN103.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN103.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN103.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN104.inf b/src/bin/hamcore/inf/x86/INF_VPN104.inf
index e150fa80..6b750d29 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN104.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN104.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN104.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN105.inf b/src/bin/hamcore/inf/x86/INF_VPN105.inf
index 6fa492c2..76de30a6 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN105.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN105.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN105.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN106.inf b/src/bin/hamcore/inf/x86/INF_VPN106.inf
index f179f76b..f0c5a852 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN106.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN106.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN106.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN107.inf b/src/bin/hamcore/inf/x86/INF_VPN107.inf
index c674a6b0..370c732c 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN107.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN107.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN107.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN108.inf b/src/bin/hamcore/inf/x86/INF_VPN108.inf
index 41cd360f..4098a366 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN108.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN108.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN108.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN109.inf b/src/bin/hamcore/inf/x86/INF_VPN109.inf
index d776c287..bd07d9df 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN109.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN109.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN109.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN11.inf b/src/bin/hamcore/inf/x86/INF_VPN11.inf
index e7aa1ddb..a92d3cf1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN11.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN11.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN11.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN110.inf b/src/bin/hamcore/inf/x86/INF_VPN110.inf
index 9c0a997a..b7f1ea58 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN110.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN110.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN110.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN111.inf b/src/bin/hamcore/inf/x86/INF_VPN111.inf
index c20a93c5..d956519f 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN111.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN111.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN111.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN112.inf b/src/bin/hamcore/inf/x86/INF_VPN112.inf
index 708d428a..dc9ccd0b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN112.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN112.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN112.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN113.inf b/src/bin/hamcore/inf/x86/INF_VPN113.inf
index 44664c26..6f01f233 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN113.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN113.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN113.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN114.inf b/src/bin/hamcore/inf/x86/INF_VPN114.inf
index ff0ff302..507dcfc4 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN114.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN114.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN114.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN115.inf b/src/bin/hamcore/inf/x86/INF_VPN115.inf
index fb966214..29bca343 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN115.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN115.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN115.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN116.inf b/src/bin/hamcore/inf/x86/INF_VPN116.inf
index 26bca114..0c02d9c9 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN116.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN116.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN116.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN117.inf b/src/bin/hamcore/inf/x86/INF_VPN117.inf
index 951a6a22..c36e5698 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN117.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN117.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN117.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN118.inf b/src/bin/hamcore/inf/x86/INF_VPN118.inf
index 49650312..8566c61a 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN118.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN118.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN118.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN119.inf b/src/bin/hamcore/inf/x86/INF_VPN119.inf
index a614559b..50b19d53 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN119.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN119.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN119.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN12.inf b/src/bin/hamcore/inf/x86/INF_VPN12.inf
index 38a5a59a..2dfb43c9 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN12.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN12.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN12.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN120.inf b/src/bin/hamcore/inf/x86/INF_VPN120.inf
index 033e0218..37d274e3 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN120.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN120.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN120.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN121.inf b/src/bin/hamcore/inf/x86/INF_VPN121.inf
index 8ba80575..4b7f95eb 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN121.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN121.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN121.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN122.inf b/src/bin/hamcore/inf/x86/INF_VPN122.inf
index 0968fbef..7549affb 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN122.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN122.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN122.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN123.inf b/src/bin/hamcore/inf/x86/INF_VPN123.inf
index 9ad8a7f8..525524f0 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN123.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN123.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN123.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN124.inf b/src/bin/hamcore/inf/x86/INF_VPN124.inf
index e58e3ef5..31fd9a64 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN124.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN124.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN124.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN125.inf b/src/bin/hamcore/inf/x86/INF_VPN125.inf
index 768511f5..ec662b31 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN125.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN125.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN125.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN126.inf b/src/bin/hamcore/inf/x86/INF_VPN126.inf
index 3fc15602..06041e77 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN126.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN126.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN126.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN127.inf b/src/bin/hamcore/inf/x86/INF_VPN127.inf
index 731800cb..b36444fe 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN127.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN127.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN127.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN13.inf b/src/bin/hamcore/inf/x86/INF_VPN13.inf
index 4200a138..240597df 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN13.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN13.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN13.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN14.inf b/src/bin/hamcore/inf/x86/INF_VPN14.inf
index 0e1395eb..4c1532e9 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN14.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN14.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN14.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN15.inf b/src/bin/hamcore/inf/x86/INF_VPN15.inf
index dee0adb8..edd2fa53 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN15.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN15.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN15.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN16.inf b/src/bin/hamcore/inf/x86/INF_VPN16.inf
index fd0146d9..d32c817e 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN16.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN16.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN16.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN17.inf b/src/bin/hamcore/inf/x86/INF_VPN17.inf
index 5377863b..6edc7703 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN17.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN17.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN17.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN18.inf b/src/bin/hamcore/inf/x86/INF_VPN18.inf
index 3c51a61c..66df035d 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN18.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN18.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN18.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN19.inf b/src/bin/hamcore/inf/x86/INF_VPN19.inf
index 2a10041e..19e76bfc 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN19.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN19.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN19.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN2.inf b/src/bin/hamcore/inf/x86/INF_VPN2.inf
index 7909e26e..1b25b498 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN2.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN2.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN2.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN20.inf b/src/bin/hamcore/inf/x86/INF_VPN20.inf
index 70aba338..0caac93e 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN20.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN20.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN20.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN21.inf b/src/bin/hamcore/inf/x86/INF_VPN21.inf
index cc47cf77..dc122d0f 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN21.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN21.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN21.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN22.inf b/src/bin/hamcore/inf/x86/INF_VPN22.inf
index cae5d081..13446505 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN22.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN22.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN22.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN23.inf b/src/bin/hamcore/inf/x86/INF_VPN23.inf
index 4d1daae6..33466c43 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN23.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN23.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN23.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN24.inf b/src/bin/hamcore/inf/x86/INF_VPN24.inf
index 0d2f4887..2c161ade 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN24.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN24.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN24.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN25.inf b/src/bin/hamcore/inf/x86/INF_VPN25.inf
index 259a15bc..46420180 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN25.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN25.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN25.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN26.inf b/src/bin/hamcore/inf/x86/INF_VPN26.inf
index f18ffca9..7b3d0848 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN26.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN26.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN26.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN27.inf b/src/bin/hamcore/inf/x86/INF_VPN27.inf
index 5e024ad4..c16de64e 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN27.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN27.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN27.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN28.inf b/src/bin/hamcore/inf/x86/INF_VPN28.inf
index 829595f6..caba7fe1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN28.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN28.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN28.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN29.inf b/src/bin/hamcore/inf/x86/INF_VPN29.inf
index 6581540c..42574bad 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN29.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN29.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN29.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN3.inf b/src/bin/hamcore/inf/x86/INF_VPN3.inf
index 75780c9d..16186d3d 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN3.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN3.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN3.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN30.inf b/src/bin/hamcore/inf/x86/INF_VPN30.inf
index a536b75d..3f5bcfed 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN30.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN30.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN30.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN31.inf b/src/bin/hamcore/inf/x86/INF_VPN31.inf
index 8001df27..f938ec47 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN31.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN31.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN31.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN32.inf b/src/bin/hamcore/inf/x86/INF_VPN32.inf
index d36e1c0d..ad2d2016 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN32.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN32.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN32.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN33.inf b/src/bin/hamcore/inf/x86/INF_VPN33.inf
index c9cbab24..629168d5 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN33.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN33.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN33.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN34.inf b/src/bin/hamcore/inf/x86/INF_VPN34.inf
index 2c0e5f8c..0215fecf 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN34.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN34.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN34.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN35.inf b/src/bin/hamcore/inf/x86/INF_VPN35.inf
index 2bad0cae..89c3d343 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN35.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN35.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN35.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN36.inf b/src/bin/hamcore/inf/x86/INF_VPN36.inf
index 31cf3cb8..25cc3e22 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN36.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN36.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN36.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN37.inf b/src/bin/hamcore/inf/x86/INF_VPN37.inf
index 385fd6f9..513680a1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN37.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN37.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN37.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN38.inf b/src/bin/hamcore/inf/x86/INF_VPN38.inf
index 2d7f2a7f..92814db7 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN38.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN38.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN38.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN39.inf b/src/bin/hamcore/inf/x86/INF_VPN39.inf
index 41efe80c..291bd650 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN39.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN39.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN39.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN4.inf b/src/bin/hamcore/inf/x86/INF_VPN4.inf
index 113e535e..733b0e93 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN4.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN4.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN4.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN40.inf b/src/bin/hamcore/inf/x86/INF_VPN40.inf
index 62580a1c..d5959be0 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN40.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN40.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN40.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN41.inf b/src/bin/hamcore/inf/x86/INF_VPN41.inf
index 33b9d16f..dadf27db 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN41.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN41.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN41.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN42.inf b/src/bin/hamcore/inf/x86/INF_VPN42.inf
index 583baf22..2d536108 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN42.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN42.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN42.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN43.inf b/src/bin/hamcore/inf/x86/INF_VPN43.inf
index 65563093..54778c88 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN43.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN43.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN43.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN44.inf b/src/bin/hamcore/inf/x86/INF_VPN44.inf
index 1dc0f55c..65f44435 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN44.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN44.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN44.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN45.inf b/src/bin/hamcore/inf/x86/INF_VPN45.inf
index f5aaae05..83bd6a9c 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN45.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN45.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN45.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN46.inf b/src/bin/hamcore/inf/x86/INF_VPN46.inf
index f00b3c9f..12f66b4b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN46.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN46.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN46.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN47.inf b/src/bin/hamcore/inf/x86/INF_VPN47.inf
index bdc5a46a..7b2b2ab1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN47.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN47.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN47.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN48.inf b/src/bin/hamcore/inf/x86/INF_VPN48.inf
index 8ef03c61..586a2952 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN48.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN48.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN48.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN49.inf b/src/bin/hamcore/inf/x86/INF_VPN49.inf
index 1b136f8d..026dc7f5 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN49.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN49.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN49.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN5.inf b/src/bin/hamcore/inf/x86/INF_VPN5.inf
index 20e6e001..a4b54bf0 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN5.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN5.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN5.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN50.inf b/src/bin/hamcore/inf/x86/INF_VPN50.inf
index ef6dae4d..0196361b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN50.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN50.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN50.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN51.inf b/src/bin/hamcore/inf/x86/INF_VPN51.inf
index 49274e28..cd98b7bb 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN51.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN51.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN51.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN52.inf b/src/bin/hamcore/inf/x86/INF_VPN52.inf
index 6e7fca96..f6657534 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN52.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN52.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN52.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN53.inf b/src/bin/hamcore/inf/x86/INF_VPN53.inf
index 2ddfa050..8de56929 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN53.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN53.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN53.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN54.inf b/src/bin/hamcore/inf/x86/INF_VPN54.inf
index c291b720..0fbc9d2d 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN54.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN54.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN54.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN55.inf b/src/bin/hamcore/inf/x86/INF_VPN55.inf
index 6996f97b..88d8b2b8 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN55.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN55.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN55.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN56.inf b/src/bin/hamcore/inf/x86/INF_VPN56.inf
index 0a04311a..036063d2 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN56.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN56.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN56.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN57.inf b/src/bin/hamcore/inf/x86/INF_VPN57.inf
index fafc992f..a1082374 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN57.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN57.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN57.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN58.inf b/src/bin/hamcore/inf/x86/INF_VPN58.inf
index 6e5eeb69..f3d9b4c2 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN58.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN58.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN58.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN59.inf b/src/bin/hamcore/inf/x86/INF_VPN59.inf
index abfb42a2..46232795 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN59.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN59.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN59.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN6.inf b/src/bin/hamcore/inf/x86/INF_VPN6.inf
index 4bf23485..cff345ea 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN6.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN6.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN6.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN60.inf b/src/bin/hamcore/inf/x86/INF_VPN60.inf
index 4ad5c1f3..9b2c3447 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN60.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN60.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN60.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN61.inf b/src/bin/hamcore/inf/x86/INF_VPN61.inf
index 8a1f5a99..959cfc54 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN61.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN61.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN61.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN62.inf b/src/bin/hamcore/inf/x86/INF_VPN62.inf
index 9d017236..06472503 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN62.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN62.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN62.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN63.inf b/src/bin/hamcore/inf/x86/INF_VPN63.inf
index c6f48015..80f5d60f 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN63.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN63.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN63.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN64.inf b/src/bin/hamcore/inf/x86/INF_VPN64.inf
index ae841833..0212fdfd 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN64.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN64.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN64.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN65.inf b/src/bin/hamcore/inf/x86/INF_VPN65.inf
index 93a68337..0ff803d0 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN65.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN65.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN65.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN66.inf b/src/bin/hamcore/inf/x86/INF_VPN66.inf
index 103cb911..3214cef7 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN66.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN66.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN66.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN67.inf b/src/bin/hamcore/inf/x86/INF_VPN67.inf
index afc02a00..068251e5 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN67.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN67.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN67.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN68.inf b/src/bin/hamcore/inf/x86/INF_VPN68.inf
index fedca610..efec7fa6 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN68.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN68.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN68.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN69.inf b/src/bin/hamcore/inf/x86/INF_VPN69.inf
index 220bd8ed..17f9c997 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN69.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN69.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN69.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN7.inf b/src/bin/hamcore/inf/x86/INF_VPN7.inf
index dbb0c3fc..b5fee797 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN7.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN7.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN7.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN70.inf b/src/bin/hamcore/inf/x86/INF_VPN70.inf
index 693f75e1..c2ceeaa1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN70.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN70.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN70.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN71.inf b/src/bin/hamcore/inf/x86/INF_VPN71.inf
index 3a7e269d..3e6e6677 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN71.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN71.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN71.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN72.inf b/src/bin/hamcore/inf/x86/INF_VPN72.inf
index 6df8934f..72ed63ae 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN72.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN72.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN72.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN73.inf b/src/bin/hamcore/inf/x86/INF_VPN73.inf
index d882d2c0..80419bb3 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN73.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN73.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN73.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN74.inf b/src/bin/hamcore/inf/x86/INF_VPN74.inf
index a20c92f6..7e679927 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN74.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN74.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN74.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN75.inf b/src/bin/hamcore/inf/x86/INF_VPN75.inf
index c085bdb4..29fa929b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN75.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN75.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN75.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN76.inf b/src/bin/hamcore/inf/x86/INF_VPN76.inf
index 75375601..8a1fd397 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN76.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN76.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN76.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN77.inf b/src/bin/hamcore/inf/x86/INF_VPN77.inf
index a9c55435..7604d59b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN77.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN77.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN77.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN78.inf b/src/bin/hamcore/inf/x86/INF_VPN78.inf
index 34956560..aba3d6a9 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN78.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN78.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN78.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN79.inf b/src/bin/hamcore/inf/x86/INF_VPN79.inf
index a79668be..82bf39be 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN79.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN79.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN79.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN8.inf b/src/bin/hamcore/inf/x86/INF_VPN8.inf
index 33444223..91adf46b 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN8.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN8.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN8.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN80.inf b/src/bin/hamcore/inf/x86/INF_VPN80.inf
index 1e721aee..bd6ad7d6 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN80.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN80.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN80.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN81.inf b/src/bin/hamcore/inf/x86/INF_VPN81.inf
index 4f013239..41977848 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN81.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN81.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN81.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN82.inf b/src/bin/hamcore/inf/x86/INF_VPN82.inf
index 6799daa4..b1e18569 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN82.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN82.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN82.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN83.inf b/src/bin/hamcore/inf/x86/INF_VPN83.inf
index 78db51d6..d6403ce4 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN83.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN83.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN83.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN84.inf b/src/bin/hamcore/inf/x86/INF_VPN84.inf
index b2648dcb..4553952a 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN84.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN84.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN84.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN85.inf b/src/bin/hamcore/inf/x86/INF_VPN85.inf
index ec210c88..6b1b4af2 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN85.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN85.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN85.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN86.inf b/src/bin/hamcore/inf/x86/INF_VPN86.inf
index 227f6bc7..cd39b982 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN86.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN86.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN86.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN87.inf b/src/bin/hamcore/inf/x86/INF_VPN87.inf
index 45062e0e..1baca6d1 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN87.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN87.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN87.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN88.inf b/src/bin/hamcore/inf/x86/INF_VPN88.inf
index 3a000420..a4e2c581 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN88.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN88.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN88.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN89.inf b/src/bin/hamcore/inf/x86/INF_VPN89.inf
index 8a5f34cb..d92f242f 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN89.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN89.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN89.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN9.inf b/src/bin/hamcore/inf/x86/INF_VPN9.inf
index 54cd82a9..67d8252d 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN9.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN9.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN9.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN90.inf b/src/bin/hamcore/inf/x86/INF_VPN90.inf
index b785809b..71ce05eb 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN90.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN90.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN90.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN91.inf b/src/bin/hamcore/inf/x86/INF_VPN91.inf
index 054f3fde..c9a69b27 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN91.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN91.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN91.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN92.inf b/src/bin/hamcore/inf/x86/INF_VPN92.inf
index f324dc62..044df08d 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN92.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN92.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN92.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN93.inf b/src/bin/hamcore/inf/x86/INF_VPN93.inf
index 9426d873..e0ea27b3 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN93.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN93.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN93.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN94.inf b/src/bin/hamcore/inf/x86/INF_VPN94.inf
index 117a8eaa..900d2c63 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN94.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN94.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN94.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN95.inf b/src/bin/hamcore/inf/x86/INF_VPN95.inf
index ba791ff2..8d4b4c8f 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN95.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN95.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN95.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN96.inf b/src/bin/hamcore/inf/x86/INF_VPN96.inf
index 497e2dfd..7c6b1905 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN96.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN96.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN96.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN97.inf b/src/bin/hamcore/inf/x86/INF_VPN97.inf
index 01fa1656..c100ff01 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN97.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN97.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN97.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN98.inf b/src/bin/hamcore/inf/x86/INF_VPN98.inf
index 27d81481..91b53e7a 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN98.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN98.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN98.cat
 
diff --git a/src/bin/hamcore/inf/x86/INF_VPN99.inf b/src/bin/hamcore/inf/x86/INF_VPN99.inf
index 7d60fa3a..9332f4bd 100644
--- a/src/bin/hamcore/inf/x86/INF_VPN99.inf
+++ b/src/bin/hamcore/inf/x86/INF_VPN99.inf
@@ -8,7 +8,7 @@ Signature					= "$Windows NT$"
 Class						= Net
 ClassGUID					= {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider					= %CompanyName%
-DriverVer					= 03/26/2015, 4.15.0.9537
+DriverVer					= 03/27/2015, 4.15.0.9538
 
 CatalogFile.NT				= inf_VPN99.cat
 
diff --git a/src/bin/hamcore/inf/x86/inf.cat b/src/bin/hamcore/inf/x86/inf.cat
index 16881305..7f7c1ecd 100644
Binary files a/src/bin/hamcore/inf/x86/inf.cat and b/src/bin/hamcore/inf/x86/inf.cat differ
diff --git a/src/bin/hamcore/pxwfp_x64.sys b/src/bin/hamcore/pxwfp_x64.sys
index 3963c535..2f43f27d 100644
Binary files a/src/bin/hamcore/pxwfp_x64.sys and b/src/bin/hamcore/pxwfp_x64.sys differ
diff --git a/src/bin/hamcore/pxwfp_x86.sys b/src/bin/hamcore/pxwfp_x86.sys
index b5584048..d849ee7a 100644
Binary files a/src/bin/hamcore/pxwfp_x86.sys and b/src/bin/hamcore/pxwfp_x86.sys differ
diff --git a/src/bin/hamcore/see.sys b/src/bin/hamcore/see.sys
index d110b3f4..35f14a75 100644
Binary files a/src/bin/hamcore/see.sys and b/src/bin/hamcore/see.sys differ
diff --git a/src/bin/hamcore/see_x64.sys b/src/bin/hamcore/see_x64.sys
index 7d9edc04..78e12169 100644
Binary files a/src/bin/hamcore/see_x64.sys and b/src/bin/hamcore/see_x64.sys differ
diff --git a/src/bin/hamcore/vpn_driver.sys b/src/bin/hamcore/vpn_driver.sys
index 147fc649..9ef1aed9 100644
Binary files a/src/bin/hamcore/vpn_driver.sys and b/src/bin/hamcore/vpn_driver.sys differ
diff --git a/src/bin/hamcore/vpn_driver6.sys b/src/bin/hamcore/vpn_driver6.sys
index 5966d997..ad92b413 100644
Binary files a/src/bin/hamcore/vpn_driver6.sys and b/src/bin/hamcore/vpn_driver6.sys differ
diff --git a/src/bin/hamcore/vpn_driver6_x64.sys b/src/bin/hamcore/vpn_driver6_x64.sys
index 40c09737..ee5daf36 100644
Binary files a/src/bin/hamcore/vpn_driver6_x64.sys and b/src/bin/hamcore/vpn_driver6_x64.sys differ
diff --git a/src/bin/hamcore/vpn_driver_x64.sys b/src/bin/hamcore/vpn_driver_x64.sys
index 1ef1ee4c..e6f12169 100644
Binary files a/src/bin/hamcore/vpn_driver_x64.sys and b/src/bin/hamcore/vpn_driver_x64.sys differ
diff --git a/src/bin/vpnweb.cab b/src/bin/vpnweb.cab
index ea131841..1d4ebfcc 100644
Binary files a/src/bin/vpnweb.cab and b/src/bin/vpnweb.cab differ
diff --git a/src/bin/vpnweb.ocx b/src/bin/vpnweb.ocx
index c2b43c84..e258fe73 100644
Binary files a/src/bin/vpnweb.ocx and b/src/bin/vpnweb.ocx differ
diff --git a/src/makefiles/freebsd_32bit.mak b/src/makefiles/freebsd_32bit.mak
index a93565c4..1530df9d 100644
--- a/src/makefiles/freebsd_32bit.mak
+++ b/src/makefiles/freebsd_32bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/freebsd_64bit.mak b/src/makefiles/freebsd_64bit.mak
index 10661223..588492a0 100644
--- a/src/makefiles/freebsd_64bit.mak
+++ b/src/makefiles/freebsd_64bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/linux_32bit.mak b/src/makefiles/linux_32bit.mak
index ca525f38..cd247139 100644
--- a/src/makefiles/linux_32bit.mak
+++ b/src/makefiles/linux_32bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/linux_64bit.mak b/src/makefiles/linux_64bit.mak
index 3e803087..544ea2d5 100644
--- a/src/makefiles/linux_64bit.mak
+++ b/src/makefiles/linux_64bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/macos_32bit.mak b/src/makefiles/macos_32bit.mak
index 7ca86a3c..96307390 100644
--- a/src/makefiles/macos_32bit.mak
+++ b/src/makefiles/macos_32bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/macos_64bit.mak b/src/makefiles/macos_64bit.mak
index 790ca3a6..26cec628 100644
--- a/src/makefiles/macos_64bit.mak
+++ b/src/makefiles/macos_64bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/openbsd_32bit.mak b/src/makefiles/openbsd_32bit.mak
index f33f1839..c687192b 100644
--- a/src/makefiles/openbsd_32bit.mak
+++ b/src/makefiles/openbsd_32bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/openbsd_64bit.mak b/src/makefiles/openbsd_64bit.mak
index 93b80837..73e9e4be 100644
--- a/src/makefiles/openbsd_64bit.mak
+++ b/src/makefiles/openbsd_64bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/solaris_32bit.mak b/src/makefiles/solaris_32bit.mak
index 0d83000d..1ddd1082 100644
--- a/src/makefiles/solaris_32bit.mak
+++ b/src/makefiles/solaris_32bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/makefiles/solaris_64bit.mak b/src/makefiles/solaris_64bit.mak
index 230d25ee..f50a5a8d 100644
--- a/src/makefiles/solaris_64bit.mak
+++ b/src/makefiles/solaris_64bit.mak
@@ -52,7 +52,7 @@ HEADERS_MAYAQUA=src/Mayaqua/Cfg.h src/Mayaqua/cryptoki.h src/Mayaqua/Encrypt.h s
 HEADERS_CEDAR=src/Cedar/Account.h src/Cedar/Admin.h src/Cedar/AzureClient.h src/Cedar/AzureServer.h src/Cedar/Bridge.h src/Cedar/BridgeUnix.h src/Cedar/BridgeWin32.h src/Cedar/Cedar.h src/Cedar/CedarPch.h src/Cedar/CedarType.h src/Cedar/Client.h src/Cedar/CM.h src/Cedar/CMInner.h src/Cedar/Command.h src/Cedar/Connection.h src/Cedar/Console.h src/Cedar/Database.h src/Cedar/DDNS.h src/Cedar/EM.h src/Cedar/EMInner.h src/Cedar/EtherLog.h src/Cedar/Hub.h src/Cedar/Interop_OpenVPN.h src/Cedar/Interop_SSTP.h src/Cedar/IPsec.h src/Cedar/IPsec_EtherIP.h src/Cedar/IPsec_IKE.h src/Cedar/IPsec_IkePacket.h src/Cedar/IPsec_IPC.h src/Cedar/IPsec_L2TP.h src/Cedar/IPsec_PPP.h src/Cedar/IPsec_Win7.h src/Cedar/IPsec_Win7Inner.h src/Cedar/Layer3.h src/Cedar/Link.h src/Cedar/Listener.h src/Cedar/Logging.h src/Cedar/Nat.h src/Cedar/NativeStack.h src/Cedar/netcfgn.h src/Cedar/netcfgx.h src/Cedar/NM.h src/Cedar/NMInner.h src/Cedar/NullLan.h src/Cedar/Protocol.h src/Cedar/Radius.h src/Cedar/Remote.h src/Cedar/Sam.h src/Cedar/SecureInfo.h src/Cedar/SecureNAT.h src/Cedar/SeLowUser.h src/Cedar/Server.h src/Cedar/Session.h src/Cedar/SM.h src/Cedar/SMInner.h src/Cedar/SW.h src/Cedar/SWInner.h src/Cedar/UdpAccel.h src/Cedar/UT.h src/Cedar/VG.h src/Cedar/Virtual.h src/Cedar/VLan.h src/Cedar/VLanUnix.h src/Cedar/VLanWin32.h src/Cedar/WaterMark.h src/Cedar/WebUI.h src/Cedar/Win32Com.h src/Cedar/winpcap/bittypes.h src/Cedar/winpcap/bucket_lookup.h src/Cedar/winpcap/count_packets.h src/Cedar/winpcap/Devioctl.h src/Cedar/winpcap/Gnuc.h src/Cedar/winpcap/ip6_misc.h src/Cedar/winpcap/memory_t.h src/Cedar/winpcap/normal_lookup.h src/Cedar/winpcap/Ntddndis.h src/Cedar/winpcap/Ntddpack.h src/Cedar/winpcap/Packet32.h src/Cedar/winpcap/pcap.h src/Cedar/winpcap/pcap-bpf.h src/Cedar/winpcap/pcap-int.h src/Cedar/winpcap/pcap-stdinc.h src/Cedar/winpcap/pthread.h src/Cedar/winpcap/remote-ext.h src/Cedar/winpcap/sched.h src/Cedar/winpcap/semaphore.h src/Cedar/winpcap/tcp_session.h src/Cedar/winpcap/time_calls.h src/Cedar/winpcap/tme.h src/Cedar/winpcap/Win32-Extensions.h src/Cedar/WinUi.h src/Cedar/Wpc.h
 OBJECTS_MAYAQUA=tmp/objs/Mayaqua/Cfg.o tmp/objs/Mayaqua/Encrypt.o tmp/objs/Mayaqua/FileIO.o tmp/objs/Mayaqua/Internat.o tmp/objs/Mayaqua/Kernel.o tmp/objs/Mayaqua/Mayaqua.o tmp/objs/Mayaqua/Memory.o tmp/objs/Mayaqua/Microsoft.o tmp/objs/Mayaqua/Network.o tmp/objs/Mayaqua/Object.o tmp/objs/Mayaqua/OS.o tmp/objs/Mayaqua/Pack.o tmp/objs/Mayaqua/Secure.o tmp/objs/Mayaqua/Str.o tmp/objs/Mayaqua/Table.o tmp/objs/Mayaqua/TcpIp.o tmp/objs/Mayaqua/Tick64.o tmp/objs/Mayaqua/Tracking.o tmp/objs/Mayaqua/Unix.o tmp/objs/Mayaqua/Win32.o
 OBJECTS_CEDAR=tmp/objs/Cedar/Account.o tmp/objs/Cedar/Admin.o tmp/objs/Cedar/AzureClient.o tmp/objs/Cedar/AzureServer.o tmp/objs/Cedar/Bridge.o tmp/objs/Cedar/BridgeUnix.o tmp/objs/Cedar/BridgeWin32.o tmp/objs/Cedar/Cedar.o tmp/objs/Cedar/CedarPch.o tmp/objs/Cedar/Client.o tmp/objs/Cedar/CM.o tmp/objs/Cedar/Command.o tmp/objs/Cedar/Connection.o tmp/objs/Cedar/Console.o tmp/objs/Cedar/Database.o tmp/objs/Cedar/DDNS.o tmp/objs/Cedar/EM.o tmp/objs/Cedar/EtherLog.o tmp/objs/Cedar/Hub.o tmp/objs/Cedar/Interop_OpenVPN.o tmp/objs/Cedar/Interop_SSTP.o tmp/objs/Cedar/IPsec.o tmp/objs/Cedar/IPsec_EtherIP.o tmp/objs/Cedar/IPsec_IKE.o tmp/objs/Cedar/IPsec_IkePacket.o tmp/objs/Cedar/IPsec_IPC.o tmp/objs/Cedar/IPsec_L2TP.o tmp/objs/Cedar/IPsec_PPP.o tmp/objs/Cedar/IPsec_Win7.o tmp/objs/Cedar/Layer3.o tmp/objs/Cedar/Link.o tmp/objs/Cedar/Listener.o tmp/objs/Cedar/Logging.o tmp/objs/Cedar/Nat.o tmp/objs/Cedar/NativeStack.o tmp/objs/Cedar/NM.o tmp/objs/Cedar/NullLan.o tmp/objs/Cedar/Protocol.o tmp/objs/Cedar/Radius.o tmp/objs/Cedar/Remote.o tmp/objs/Cedar/Sam.o tmp/objs/Cedar/SecureInfo.o tmp/objs/Cedar/SecureNAT.o tmp/objs/Cedar/SeLowUser.o tmp/objs/Cedar/Server.o tmp/objs/Cedar/Session.o tmp/objs/Cedar/SM.o tmp/objs/Cedar/SW.o tmp/objs/Cedar/UdpAccel.o tmp/objs/Cedar/UT.o tmp/objs/Cedar/VG.o tmp/objs/Cedar/Virtual.o tmp/objs/Cedar/VLan.o tmp/objs/Cedar/VLanUnix.o tmp/objs/Cedar/VLanWin32.o tmp/objs/Cedar/WaterMark.o tmp/objs/Cedar/WebUI.o tmp/objs/Cedar/WinUi.o tmp/objs/Cedar/Wpc.o
-HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/chain_certs.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
+HAMCORE_FILES=src/bin/hamcore/authors.txt src/bin/hamcore/backup_dir_readme.txt src/bin/hamcore/empty.config src/bin/hamcore/empty_sevpnclient.config src/bin/hamcore/eula.txt src/bin/hamcore/install_src.dat src/bin/hamcore/lang.config src/bin/hamcore/languages.txt src/bin/hamcore/legal.txt src/bin/hamcore/openvpn_readme.pdf src/bin/hamcore/openvpn_readme.txt src/bin/hamcore/openvpn_sample.ovpn src/bin/hamcore/root_certs.dat src/bin/hamcore/SOURCES_OF_BINARY_FILES.TXT src/bin/hamcore/strtable_cn.stb src/bin/hamcore/strtable_en.stb src/bin/hamcore/strtable_ja.stb src/bin/hamcore/vpnweb_sample_cn.htm src/bin/hamcore/vpnweb_sample_en.htm src/bin/hamcore/vpnweb_sample_ja.htm src/bin/hamcore/warning_cn.txt src/bin/hamcore/warning_en.txt src/bin/hamcore/warning_ja.txt src/bin/hamcore/webui/cryptcom.cgi src/bin/hamcore/webui/edituser.cgi src/bin/hamcore/webui/error.cgi src/bin/hamcore/webui/hub.cgi src/bin/hamcore/webui/license.cgi src/bin/hamcore/webui/listener.cgi src/bin/hamcore/webui/localbridge.cgi src/bin/hamcore/webui/login.cgi src/bin/hamcore/webui/newhub.cgi src/bin/hamcore/webui/redirect.cgi src/bin/hamcore/webui/securenat.cgi src/bin/hamcore/webui/server.cgi src/bin/hamcore/webui/session.cgi src/bin/hamcore/webui/user.cgi src/bin/hamcore/webui/webui.css
 
 # Build Action
 default:	build
diff --git a/src/vpnweb/vpnweb.h b/src/vpnweb/vpnweb.h
index 947f6aa2..b493fd38 100644
--- a/src/vpnweb/vpnweb.h
+++ b/src/vpnweb/vpnweb.h
@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Thu Mar 26 16:48:29 2015
+/* at Fri Mar 27 19:33:10 2015
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
diff --git a/src/vpnweb/vpnweb_i.c b/src/vpnweb/vpnweb_i.c
index 73fdaa14..f195a6b6 100644
--- a/src/vpnweb/vpnweb_i.c
+++ b/src/vpnweb/vpnweb_i.c
@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Thu Mar 26 16:48:29 2015
+/* at Fri Mar 27 19:33:10 2015
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)
diff --git a/src/vpnweb/vpnweb_p.c b/src/vpnweb/vpnweb_p.c
index 86f2c32b..c1e36cfb 100644
--- a/src/vpnweb/vpnweb_p.c
+++ b/src/vpnweb/vpnweb_p.c
@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Thu Mar 26 16:48:29 2015
+/* at Fri Mar 27 19:33:10 2015
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)