Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -r449a5b399ab21ca0d06050b47b264f2f704af966 -r0373359eff650e8cf04a5992711ef9f20347536f
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 449a5b399ab21ca0d06050b47b264f2f704af966)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 0373359eff650e8cf04a5992711ef9f20347536f)
@@ -281,8 +281,9 @@
 	PROP_BOOL(IDS_CFGSHCMTOSPECIAL_STRING, GetConfig().get_bool(PP_SHSHOWCOPYMOVETO))
 	PROP_BOOL(IDS_CFGSHSHOWFREESPACE_STRING, GetConfig().get_bool(PP_SHSHOWFREESPACE))
 	PROP_BOOL(IDS_CFGSHSHOWICONS_STRING, GetConfig().get_bool(PP_SHSHOWSHELLICONS))
-	PROP_BOOL(IDS_CFGSHOVERRIDEDRAG_STRING, GetConfig().get_bool(PP_SHUSEDRAGDROP))
-	PROP_COMBO(IDS_CFGOVERRIDEDEFACTION_STRING, IDS_CFGACTIONS_STRING, GetConfig().get_signed_num(PP_SHDEFAULTACTION));
+	PROP_BOOL(IDS_CFGSHINTERCEPTDRAG_STRING, GetConfig().get_bool(PP_SHINTERCEPTDRAGDROP))
+	PROP_BOOL(IDS_CFGINTERCEPTKEYACTION_STRING, GetConfig().get_bool(PP_SHINTERCEPTKEYACTIONS));
+	PROP_BOOL(IDS_CFGINTERCEPTCONTEXTMENU_STRING, GetConfig().get_bool(PP_SHINTERCEPTCTXMENUACTIONS));
 
 	PROP_SEPARATOR(IDS_PROCESSINGTHREAD_STRING)
 	PROP_BOOL(IDS_AUTOCOPYREST_STRING, GetConfig().get_bool(PP_CMUSEAUTOCOMPLETEFILES))
@@ -396,8 +397,9 @@
 	rConfig.set_bool(PP_SHSHOWCOPYMOVETO, GetBoolProp(iPosition++));
 	rConfig.set_bool(PP_SHSHOWFREESPACE, GetBoolProp(iPosition++));
 	rConfig.set_bool(PP_SHSHOWSHELLICONS, GetBoolProp(iPosition++));
-	rConfig.set_bool(PP_SHUSEDRAGDROP, GetBoolProp(iPosition++));
-	rConfig.set_signed_num(PP_SHDEFAULTACTION, GetIndexProp(iPosition++));
+	rConfig.set_bool(PP_SHINTERCEPTDRAGDROP, GetBoolProp(iPosition++));
+	rConfig.set_bool(PP_SHINTERCEPTKEYACTIONS, GetBoolProp(iPosition++));
+	rConfig.set_bool(PP_SHINTERCEPTCTXMENUACTIONS, GetBoolProp(iPosition++));
 
 	SKIP_SEPARATOR(iPosition)
 	rConfig.set_bool(PP_CMUSEAUTOCOMPLETEFILES, GetBoolProp(iPosition++));