Index: src/ch/CfgProperties.cpp
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5
--- src/ch/CfgProperties.cpp	(.../CfgProperties.cpp)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/CfgProperties.cpp	(.../CfgProperties.cpp)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
@@ -39,10 +39,7 @@
 	pManager->register_signed_num(_t("Program/Autosave interval"), 30*llSecond, 0, 24*llHour);
 	pManager->register_signed_num(_t("Program/Process priority class"), NORMAL_PRIORITY_CLASS, 0, 0xffffffff);
 	pManager->register_string(_t("Program/Autosave directory"), _t("<APPDATA>\\"), icpf::property::flag_path);
-	pManager->register_string(_t("Program/Plugins directory"), _t("<PROGRAM>\\Plugins\\"), icpf::property::flag_path);
-	pManager->register_string(_t("Program/Help directory"), _t("<PROGRAM>\\Help\\"), icpf::property::flag_path);
 	pManager->register_string(_t("Program/Language"), _t("<PROGRAM>\\Langs\\English.lng"));
-	pManager->register_string(_t("Program/Languages directory"), _t("<PROGRAM>\\Langs\\"), icpf::property::flag_path);
 
 	pManager->register_signed_num(_t("Status dialog/Status refresh interval"), 1000, 0, 24*llHour);
 	pManager->register_bool(_t("Status dialog/Show details"), true);
Index: src/ch/CfgProperties.h
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5
--- src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
@@ -33,79 +33,76 @@
 #define PP_PAUTOSAVEINTERVAL		6
 #define PP_PPROCESSPRIORITYCLASS	7
 #define PP_PAUTOSAVEDIRECTORY		8
-#define PP_PPLUGINSDIR				9
-#define PP_PHELPDIR					10
-#define PP_PLANGUAGE				11
-#define PP_PLANGDIR					12
+#define PP_PLANGUAGE				9
 
-#define PP_STATUSREFRESHINTERVAL	13
-#define PP_STATUSSHOWDETAILS		14
-#define PP_STATUSAUTOREMOVEFINISHED	15
+#define PP_STATUSREFRESHINTERVAL	10
+#define PP_STATUSSHOWDETAILS		11
+#define PP_STATUSAUTOREMOVEFINISHED	12
 
-#define PP_FDWIDTH					16
-#define PP_FDHEIGHT					17
-#define PP_FDSHORTCUTLISTSTYLE		18
-#define PP_FDEXTENDEDVIEW			19
-#define PP_FDIGNORESHELLDIALOGS		20
+#define PP_FDWIDTH					13
+#define PP_FDHEIGHT					14
+#define PP_FDSHORTCUTLISTSTYLE		15
+#define PP_FDEXTENDEDVIEW			16
+#define PP_FDIGNORESHELLDIALOGS		17
 
-#define PP_MVSHOWFILENAMES			21
-#define PP_MVSHOWSINGLETASKS		22
-#define PP_MVREFRESHINTERVAL		23
-#define PP_MVAUTOSHOWWHENRUN		24
-#define PP_MVAUTOHIDEWHENEMPTY		25
-#define PP_MVUSESMOOTHPROGRESS		26
+#define PP_MVSHOWFILENAMES			18
+#define PP_MVSHOWSINGLETASKS		19
+#define PP_MVREFRESHINTERVAL		20
+#define PP_MVAUTOSHOWWHENRUN		21
+#define PP_MVAUTOHIDEWHENEMPTY		22
+#define PP_MVUSESMOOTHPROGRESS		23
 
-#define PP_CMUSEAUTOCOMPLETEFILES	27
-#define PP_CMSETDESTATTRIBUTES		28
-#define PP_CMSETDESTDATE			29
-#define PP_CMPROTECTROFILES			30
-#define PP_CMLIMITMAXOPERATIONS		31
-#define PP_CMREADSIZEBEFOREBLOCKING	32
-#define PP_CMSHOWVISUALFEEDBACK		33
-#define PP_CMUSETIMEDFEEDBACK		34
-#define PP_CMFEEDBACKTIME			35
-#define PP_CMAUTORETRYONERROR		36
-#define PP_CMAUTORETRYINTERVAL		37
-#define PP_CMDEFAULTPRIORITY		38
-#define PP_CMDISABLEPRIORITYBOOST	39
-#define PP_CMDELETEAFTERFINISHED	40
-#define PP_CMCREATELOG				41
+#define PP_CMUSEAUTOCOMPLETEFILES	24
+#define PP_CMSETDESTATTRIBUTES		25
+#define PP_CMSETDESTDATE			26
+#define PP_CMPROTECTROFILES			27
+#define PP_CMLIMITMAXOPERATIONS		28
+#define PP_CMREADSIZEBEFOREBLOCKING	29
+#define PP_CMSHOWVISUALFEEDBACK		30
+#define PP_CMUSETIMEDFEEDBACK		31
+#define PP_CMFEEDBACKTIME			32
+#define PP_CMAUTORETRYONERROR		33
+#define PP_CMAUTORETRYINTERVAL		34
+#define PP_CMDEFAULTPRIORITY		35
+#define PP_CMDISABLEPRIORITYBOOST	36
+#define PP_CMDELETEAFTERFINISHED	37
+#define PP_CMCREATELOG				38
 
-#define PP_SHSHOWCOPY				42
-#define PP_SHSHOWMOVE				43
-#define PP_SHSHOWCOPYMOVE			44
-#define PP_SHSHOWPASTE				45
-#define PP_SHSHOWPASTESPECIAL		46
-#define PP_SHSHOWCOPYTO				47
-#define PP_SHSHOWMOVETO				48
-#define PP_SHSHOWCOPYMOVETO			49
-#define PP_SHSHOWFREESPACE			50
-#define PP_SHSHOWSHELLICONS			51
-#define PP_SHUSEDRAGDROP			52
-#define PP_SHDEFAULTACTION			53
+#define PP_SHSHOWCOPY				39
+#define PP_SHSHOWMOVE				40
+#define PP_SHSHOWCOPYMOVE			41
+#define PP_SHSHOWPASTE				42
+#define PP_SHSHOWPASTESPECIAL		43
+#define PP_SHSHOWCOPYTO				44
+#define PP_SHSHOWMOVETO				45
+#define PP_SHSHOWCOPYMOVETO			46
+#define PP_SHSHOWFREESPACE			47
+#define PP_SHSHOWSHELLICONS			48
+#define PP_SHUSEDRAGDROP			49
+#define PP_SHDEFAULTACTION			50
 
-#define PP_BFUSEONLYDEFAULT			54
-#define PP_BFDEFAULT				55
-#define PP_BFONEDISK				56
-#define PP_BFTWODISKS				57
-#define PP_BFCD						58
-#define PP_BFLAN					59
-#define PP_BFUSENOBUFFERING			60
-#define PP_BFBOUNDARYLIMIT			61
+#define PP_BFUSEONLYDEFAULT			51
+#define PP_BFDEFAULT				52
+#define PP_BFONEDISK				53
+#define PP_BFTWODISKS				54
+#define PP_BFCD						55
+#define PP_BFLAN					56
+#define PP_BFUSENOBUFFERING			57
+#define PP_BFBOUNDARYLIMIT			58
 
-#define PP_LOGPATH					62
-#define PP_LOGENABLELOGGING			63
-#define PP_LOGLIMITATION			64
-#define PP_LOGMAXLIMIT				65
-#define PP_LOGPRECISELIMITING		66
-#define PP_LOGTRUNCBUFFERSIZE		67
+#define PP_LOGPATH					59
+#define PP_LOGENABLELOGGING			60
+#define PP_LOGLIMITATION			61
+#define PP_LOGMAXLIMIT				62
+#define PP_LOGPRECISELIMITING		63
+#define PP_LOGTRUNCBUFFERSIZE		64
 
-#define PP_SNDPLAYSOUNDS			68
-#define PP_SNDERRORSOUNDPATH		69
-#define PP_SNDFINISHEDSOUNDPATH		70
+#define PP_SNDPLAYSOUNDS			65
+#define PP_SNDERRORSOUNDPATH		66
+#define PP_SNDFINISHEDSOUNDPATH		67
 
-#define PP_SHORTCUTS				71
-#define PP_RECENTPATHS				72
+#define PP_SHORTCUTS				68
+#define PP_RECENTPATHS				69
 
 // register function
 bool RegisterProperties(icpf::config* pManager);
Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
@@ -117,7 +117,7 @@
 			m_cvShortcuts.push_back(pszPath);
 	}
 
-	GetConfig()->get_string(PP_PLANGDIR, m_szLangPath, _MAX_PATH);
+	_tcscpy(m_szLangPath, _T("<PROGRAM>\\Langs\\"));
 	GetApp()->ExpandPath(m_szLangPath);
 
 	GetResManager()->Scan(m_szLangPath, &m_vld);
@@ -241,14 +241,6 @@
 	TRACE(_t("Autosavedir=%s\n"), strPath);
 	PROP_DIR(IDS_TEMPFOLDER_STRING, IDS_TEMPFOLDERCHOOSE_STRING, strPath)
 
-	GetConfig()->get_string(PP_PPLUGINSDIR, strPath.GetBuffer(_MAX_PATH), _MAX_PATH);
-	strPath.ReleaseBuffer();
-	PROP_DIR(IDS_PLUGSFOLDER_STRING, IDS_PLUGSFOLDERCHOOSE_STRING, strPath)
-
-	GetConfig()->get_string(PP_PHELPDIR, strPath.GetBuffer(_MAX_PATH), _MAX_PATH);
-	strPath.ReleaseBuffer();
-	PROP_DIR(IDS_CFGHELPDIR_STRING, IDS_CFGHELPDIRCHOOSE_STRING, strPath)
-	
 	// lang
 	CString strLangs;
 	UINT uiIndex=0;
@@ -263,10 +255,6 @@
 
 	PROP_COMBO(IDS_LANGUAGE_STRING, strLangs, uiIndex)
 
-	GetConfig()->get_string(PP_PLANGDIR, strPath.GetBuffer(_MAX_PATH), _MAX_PATH);
-	strPath.ReleaseBuffer();
-	PROP_DIR(IDS_LANGUAGESFOLDER_STRING, IDS_LANGSFOLDERCHOOSE_STRING, strPath)
-
 	/////////////////
 	PROP_SEPARATOR(IDS_STATUSWINDOW_STRING);
 	PROP_UINT(IDS_REFRESHSTATUSINTERVAL_STRING, GetConfig()->get_signed_num(PP_STATUSREFRESHINTERVAL))
@@ -375,8 +363,6 @@
 	pConfig->set_signed_num(PP_PAUTOSAVEINTERVAL, GetUintProp(iPosition++));
 	pConfig->set_signed_num(PP_PPROCESSPRIORITYCLASS, IndexToPriorityClass(GetIndexProp(iPosition++)));
 	pConfig->set_string(PP_PAUTOSAVEDIRECTORY, GetStringProp(iPosition++));
-	pConfig->set_string(PP_PPLUGINSDIR, GetStringProp(iPosition++));
-	pConfig->set_string(PP_PHELPDIR, GetStringProp(iPosition++));
 	// language
 	PCTSTR pszSrc=m_vld.at(GetIndexProp(iPosition++)).GetFilename(true);
 	if (_tcsnicmp(pszSrc, GetApp()->GetProgramPath(), _tcslen(GetApp()->GetProgramPath())) == 0)
@@ -388,7 +374,6 @@
 	}
 	else
 		pConfig->set_string(PP_PLANGUAGE, pszSrc);
-	pConfig->set_string(PP_PLANGDIR, GetStringProp(iPosition++));
 
 	SKIP_SEPARATOR(iPosition)
 	pConfig->set_signed_num(PP_STATUSREFRESHINTERVAL, GetUintProp(iPosition++));
Index: src/ch/PropertyListCtrl.cpp
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5
--- src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/PropertyListCtrl.cpp	(.../PropertyListCtrl.cpp)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
@@ -989,18 +989,30 @@
 	{
 		case	ID_PROPERTY_BOOL:
 		case	ID_PROPERTY_COMBO_LIST:
-				pDC->DrawText( m_pCurDrawItem->csProperties.GetAt(m_pCurDrawItem->nPropertySelected), m_pCurDrawItem->csProperties.GetAt(m_pCurDrawItem->nPropertySelected).GetLength(), ItemRect, DT_SINGLELINE|DT_VCENTER|DT_LEFT|DT_NOPREFIX);
+			{
+				CString strText;
+				INT_PTR iCount = m_pCurDrawItem->csProperties.GetCount();
+				if(m_pCurDrawItem->nPropertySelected >= 0 && m_pCurDrawItem->nPropertySelected < iCount)
+					strText = m_pCurDrawItem->csProperties.GetAt(m_pCurDrawItem->nPropertySelected);
+				
+				pDC->DrawText( strText, strText.GetLength(), ItemRect, DT_SINGLELINE|DT_VCENTER|DT_LEFT|DT_NOPREFIX);
 				break;
+			}
 		
 		case	ID_PROPERTY_TEXT:
 		case	ID_PROPERTY_PATH:
 		case ID_PROPERTY_DIR:
 		case ID_PROPERTY_CUSTOM:
-				pDC->DrawText( m_pCurDrawItem->csProperties.GetAt(0), m_pCurDrawItem->csProperties.GetAt(0).GetLength(), ItemRect, DT_SINGLELINE|DT_VCENTER|DT_LEFT|DT_NOPREFIX);
-				break;
 		case	ID_PROPERTY_STATIC:
-				pDC->DrawText( m_pCurDrawItem->csProperties.GetAt(0), m_pCurDrawItem->csProperties.GetAt(0).GetLength(), ItemRect, DT_SINGLELINE|DT_VCENTER|DT_LEFT|DT_NOPREFIX);
+			{
+				CString strText;
+				INT_PTR iCount = m_pCurDrawItem->csProperties.GetCount();
+				if(iCount > 0)
+					strText = m_pCurDrawItem->csProperties.GetAt(0);
+
+				pDC->DrawText( strText, strText.GetLength(), ItemRect, DT_SINGLELINE|DT_VCENTER|DT_LEFT|DT_NOPREFIX);
 				break;
+			}
 
 		case	ID_PROPERTY_FONT:
 				if(m_pCurDrawItem->LogFont.lfHeight)
Index: src/ch/ch.cpp
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rb6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5
--- src/ch/ch.cpp	(.../ch.cpp)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/ch.cpp	(.../ch.cpp)	(revision b6b8ac5b0a1ab85b4ac788e5429be860d2f20bd5)
@@ -139,7 +139,7 @@
 
 	// generate the current filename - uses language from config
 	TCHAR szBuffer[_MAX_PATH];
-	GetConfig()->get_string(PP_PHELPDIR, szBuffer, _MAX_PATH);
+	_tcscpy(szBuffer, _T("<PROGRAM>\\Help\\"));
 	ExpandPath(szBuffer);
 	_tcscat(szBuffer, GetResManager()->m_ld.GetHelpName());
 	if(_tcscmp(szBuffer, m_pszHelpFilePath) != 0)
@@ -315,11 +315,6 @@
 		m_cfgSettings.get_string(PP_PLANGUAGE, szPath, _MAX_PATH);
 		m_resManager.SetLanguage(ExpandPath(szPath));
 	}
-	if(uiPropID == PP_PHELPDIR)
-	{
-		if(UpdateHelpPaths())
-			HtmlHelp(NULL, HH_CLOSE_ALL);
-	}
 }
 
 void CCopyHandlerApp::OnResManNotify(UINT uiType)