--- putty-trunk-vanilla/config.c	2010-02-04 09:40:33.505353500 +0000
+++ putty-trunk-confdialog/config.c	2010-02-03 14:52:40.750066400 +0000
@@ -31,10 +31,10 @@
 	     * This label text is carefully chosen to contain an n,
 	     * since that's the shortcut for the host name control.
 	     */
-	    dlg_label_change(ctrl, dlg, "Serial line");
+//	    dlg_label_change(ctrl, dlg, "Serial line");
 	    dlg_editbox_set(ctrl, dlg, cfg->serline);
 	} else {
-	    dlg_label_change(ctrl, dlg, HOST_BOX_TITLE);
+//	    dlg_label_change(ctrl, dlg, HOST_BOX_TITLE);
 	    dlg_editbox_set(ctrl, dlg, cfg->host);
 	}
     } else if (event == EVENT_VALCHANGE) {
@@ -1149,10 +1149,11 @@
     /*
      * The Session panel.
      */
+/*
     str = dupprintf("Basic options for your %s session", appname);
     ctrl_settitle(b, "Session", str);
     sfree(str);
-
+*/
     if (!midsession) {
 	struct hostport *hp = (struct hostport *)
 	    ctrl_alloc(b, sizeof(struct hostport));
@@ -1160,12 +1161,12 @@
 	s = ctrl_getset(b, "Session", "hostport",
 			"Specify the destination you want to connect to");
 	ctrl_columns(s, 2, 75, 25);
-	c = ctrl_editbox(s, HOST_BOX_TITLE, 'n', 100,
+	c = ctrl_editbox(s, NULL, 'n', 100,
 			 HELPCTX(session_hostname),
 			 config_host_handler, I(0), I(0));
 	c->generic.column = 0;
 	hp->host = c;
-	c = ctrl_editbox(s, PORT_BOX_TITLE, 'p', 100,
+	c = ctrl_editbox(s, NULL, 'p', 100,
 			 HELPCTX(session_hostname),
 			 config_port_handler, I(0), I(0));
 	c->generic.column = 1;
@@ -1173,7 +1174,7 @@
 	ctrl_columns(s, 1, 100);
 
 	if (!backend_from_proto(PROT_SSH)) {
-	    ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
+	    ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 3,
 			      HELPCTX(session_hostname),
 			      config_protocolbuttons_handler, P(hp),
 			      "Raw", 'w', I(PROT_RAW),
@@ -1181,7 +1182,7 @@
 			      "Rlogin", 'i', I(PROT_RLOGIN),
 			      NULL);
 	} else {
-	    ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 4,
+	    ctrl_radiobuttons(s, NULL, NO_SHORTCUT, 4,
 			      HELPCTX(session_hostname),
 			      config_protocolbuttons_handler, P(hp),
 			      "Raw", 'w', I(PROT_RAW),
@@ -1200,7 +1201,7 @@
 		    "Load, save or delete a stored session");
     ctrl_columns(s, 2, 75, 25);
     get_sesslist(&ssd->sesslist, TRUE);
-    ssd->editbox = ctrl_editbox(s, "Saved Sessions", 'e', 100,
+    ssd->editbox = ctrl_editbox(s, NULL, 'e', 100,
 				HELPCTX(session_saved),
 				sessionsaver_handler, P(ssd), P(NULL));
     ssd->editbox->generic.column = 0;
@@ -1212,7 +1213,7 @@
 				HELPCTX(session_saved),
 				sessionsaver_handler, P(ssd));
     ssd->listbox->generic.column = 0;
-    ssd->listbox->listbox.height = 7;
+    ssd->listbox->listbox.height = 31;
     if (!midsession) {
 	ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
 					  HELPCTX(session_saved),
--- putty-trunk-vanilla/windows/win_res.rc2	2010-02-04 09:40:28.976094400 +0000
+++ putty-trunk-confdialog/windows/win_res.rc2	2010-02-02 19:18:46.435324700 +0000
@@ -19,7 +19,7 @@
 IDD_ABOUTBOX DIALOG DISCARDABLE 140, 40, 214, 70
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About PuTTY"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 160, 52, 48, 14
     PUSHBUTTON "View &Licence", IDA_LICENCE, 6, 52, 70, 14
@@ -31,10 +31,10 @@
 END
 
 /* Accelerators used: aco */
-IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 300, 252
+IDD_MAINBOX DIALOG DISCARDABLE 0, 0, 300, 380
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Configuration"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 CLASS "PuTTYConfigBox"
 BEGIN
 END
@@ -43,7 +43,7 @@
 IDD_LOGBOX DIALOG DISCARDABLE 100, 20, 300, 119
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Event Log"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     DEFPUSHBUTTON "&Close", IDOK, 135, 102, 44, 14
     PUSHBUTTON "C&opy", IDN_COPY, 81, 102, 44, 14
@@ -54,7 +54,7 @@
 IDD_LICENCEBOX DIALOG DISCARDABLE 50, 50, 226, 263
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "PuTTY Licence"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 
--- putty-trunk-vanilla/windows/windlg.c	2010-02-04 09:40:29.099101500 +0000
+++ putty-trunk-confdialog/windows/windlg.c	2010-02-04 10:12:02.343388800 +0000
@@ -343,7 +343,7 @@
 	/*
 	 * Here we must create the basic standard controls.
 	 */
-	ctlposinit(&cp, hwnd, 3, 3, 235);
+	ctlposinit(&cp, hwnd, 3, 3, 361);
 	wc = &ctrls_base;
 	base_id = IDCX_STDBASE;
     } else {
@@ -351,7 +351,7 @@
 	 * Otherwise, we're creating the controls for a particular
 	 * panel.
 	 */
-	ctlposinit(&cp, hwnd, 100, 3, 13);
+	ctlposinit(&cp, hwnd, 100, 3, 3);
 	wc = &ctrls_panel;
 	base_id = IDCX_PANELBASE;
     }
@@ -413,6 +413,11 @@
 	    WPARAM font;
 	    HWND tvstatic;
 
+/* 
+    "Category" caption not really necessary I think
+    Removing it in line with other caption removals mainly
+    in the main session list page (to make room for more sessions)
+
 	    r.left = 3;
 	    r.right = r.left + 95;
 	    r.top = 3;
@@ -426,11 +431,11 @@
 				      NULL);
 	    font = SendMessage(hwnd, WM_GETFONT, 0, 0);
 	    SendMessage(tvstatic, WM_SETFONT, font, MAKELPARAM(TRUE, 0));
-
+*/
 	    r.left = 3;
 	    r.right = r.left + 95;
-	    r.top = 13;
-	    r.bottom = r.top + 219;
+	    r.top = 3;
+	    r.bottom = r.top + 353;
 	    MapDialogRect(hwnd, &r);
 	    treeview = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, "",
 				      WS_CHILD | WS_VISIBLE |