--- a\np2src\src\Edit.c	Thu Jun 25 17:31:33 2009
+++ b\np2src\src\Edit.c	Thu Jun 25 17:32:03 2009
@@ -470,14 +470,9 @@ BOOL IsUnicode(const char* pBuffer,int c
 
   if (i == 0xFFFF) // i doesn't seem to have been modified ...
     i = 0;
 
-  if (bIsTextUnicode || bHasBOM || bHasRBOM ||
-        ((i & (IS_TEXT_UNICODE_UNICODE_MASK | IS_TEXT_UNICODE_REVERSE_MASK)) &&
-       !((i & IS_TEXT_UNICODE_UNICODE_MASK) && (i & IS_TEXT_UNICODE_REVERSE_MASK)) &&
-        !(i & IS_TEXT_UNICODE_ODD_LENGTH) &&
-        !(i & IS_TEXT_UNICODE_ILLEGAL_CHARS && !(i & IS_TEXT_UNICODE_REVERSE_SIGNATURE)) &&
-        !((i & IS_TEXT_UNICODE_REVERSE_MASK) == IS_TEXT_UNICODE_REVERSE_STATISTICS))) {
+  if (bIsTextUnicode || bHasBOM || bHasRBOM) {
 
     if (lpbBOM)
       *lpbBOM = (bHasBOM || bHasRBOM ||
         (i & (IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE)))
--- a\np2src\src\Notepad2.c	Thu Jun 25 17:31:33 2009
+++ b\np2src\src\Notepad2.c	Thu Jun 25 17:33:36 2009
@@ -2886,15 +2886,15 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wPar
           break;
         case SCLEX_MAKEFILE:
         case SCLEX_PERL:
         case SCLEX_PYTHON:
+        case SCLEX_CONF:
           SendMessage(hwndEdit,SCI_SETCURSOR,SC_CURSORWAIT,0);
           EditToggleLineComments(hwndEdit,L"#",TRUE);
           SendMessage(hwndEdit,SCI_SETCURSOR,SC_CURSORNORMAL,0);
           break;
         case SCLEX_ASM:
         case SCLEX_PROPERTIES:
-        case SCLEX_CONF:
           SendMessage(hwndEdit,SCI_SETCURSOR,SC_CURSORWAIT,0);
           EditToggleLineComments(hwndEdit,L";",TRUE);
           SendMessage(hwndEdit,SCI_SETCURSOR,SC_CURSORNORMAL,0);
           break;
@@ -3019,10 +3019,12 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wPar
           SendMessage(hDlgFindReplace,WM_COMMAND,MAKELONG(IDMSG_SWITCHTOFIND,1),0);
           DestroyWindow(hDlgFindReplace);
           hDlgFindReplace = EditFindReplaceDlg(hwndEdit,&efrData,FALSE);
         }
-        else
+        else {
           SetForegroundWindow(hDlgFindReplace);
+          SendMessage(hDlgFindReplace,WM_NEXTDLGCTL,(WPARAM)GetDlgItem(hDlgFindReplace,IDC_FINDTEXT),TRUE);
+        }
       }
       break;
 
 
@@ -3100,10 +3102,12 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wPar
           SendMessage(hDlgFindReplace,WM_COMMAND,MAKELONG(IDMSG_SWITCHTOREPLACE,1),0);
           DestroyWindow(hDlgFindReplace);
           hDlgFindReplace = EditFindReplaceDlg(hwndEdit,&efrData,TRUE);
         }
-        else
+        else {
           SetForegroundWindow(hDlgFindReplace);
+          SendMessage(hDlgFindReplace,WM_NEXTDLGCTL,(WPARAM)GetDlgItem(hDlgFindReplace,IDC_FINDTEXT),TRUE);
+        }
       }
       break;
 
 
--- a\np2src\src\Styles.c	Thu Jun 25 17:31:33 2009
+++ b\np2src\src\Styles.c	Thu Jun 25 17:32:03 2009
@@ -2793,9 +2793,9 @@ BOOL CALLBACK Style_ConfigDlgProc(HWND h
           DeleteObject(hFontTitle);
         if (NULL == (hFontTitle = (HFONT)SendDlgItemMessage(hwnd,IDC_TITLE,WM_GETFONT,0,0)))
           hFontTitle = GetStockObject(DEFAULT_GUI_FONT);
         GetObject(hFontTitle,sizeof(LOGFONT),&lf);
-        lf.lfHeight = (LONG) (lf.lfHeight * 1.2);
+        lf.lfHeight += lf.lfHeight / 5;
         lf.lfWeight = FW_BOLD;
         hFontTitle = CreateFontIndirect(&lf);
         SendDlgItemMessage(hwnd,IDC_TITLE,WM_SETFONT,(WPARAM)hFontTitle,TRUE);