Index: src/ch/CfgProperties.h
===================================================================
diff -u -r045540c818c374806d09742ef3d7a984d8d757d3 -rb165add706c4fab9d783f0564b1dd398492da491
--- src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision 045540c818c374806d09742ef3d7a984d8d757d3)
+++ src/ch/CfgProperties.h	(.../CfgProperties.h)	(revision b165add706c4fab9d783f0564b1dd398492da491)
@@ -63,6 +63,11 @@
 	PP_CMSETDESTATTRIBUTES,
 	PP_CMSETDESTDATE,
 	PP_CMPROTECTROFILES,
+
+	PP_USECUSTOMNAMING,
+	PP_CUSTOMNAME_FIRST,
+	PP_CUSTOMNAME_SUBSEQUENT,
+
 	PP_CMLIMITMAXOPERATIONS,
 	PP_CMREADSIZEBEFOREBLOCKING,
 	PP_CMFASTMOVEBEFOREBLOCKING,
@@ -95,9 +100,17 @@
 	PP_BFBOUNDARYLIMIT,
 	PP_BFQUEUEDEPTH,
 
-	PP_LOGENABLELOGGING,
 	PP_LOGMAXSIZE,
-	PP_LOGLEVEL,
+	PP_LOGROTATECOUNT,
+	PP_LOGLEVEL_APP,
+	PP_LOGLEVEL_ENGINEDEFAULT,
+	PP_LOGLEVEL_SERIALIZER,
+	PP_LOGLEVEL_TASK,
+	PP_LOGLEVEL_SUBTASK_SCANDIR,
+	PP_LOGLEVEL_SUBTASK_COPYMOVE,
+	PP_LOGLEVEL_SUBTASK_FASTMOVE,
+	PP_LOGLEVEL_SUBTASK_DELETE,
+	PP_LOGLEVEL_FILESYSTEM,
 
 	PP_SNDPLAYSOUNDS,
 	PP_SNDERRORSOUNDPATH,
@@ -199,9 +212,17 @@
 PROPERTY(PP_SHORTCUTS, CStringVector, _T("CHConfig.General.Program.Shortcuts.Shortcut"), (CStringVector()));
 PROPERTY(PP_RECENTPATHS, CStringVector, _T("CHConfig.General.Program.RecentPaths.Path"), (CStringVector()));
 
-PROPERTY(PP_LOGENABLELOGGING, bool, _T("CHConfig.General.Logging.Enable"), true);
-PROPERTY_MINMAX(PP_LOGMAXSIZE, int, _T("CHConfig.General.Logging.SizeLimit"), 512384, 1024, 0xffffffff);
-PROPERTY_MINMAX(PP_LOGLEVEL, unsigned int, _T("CHConfig.General.Logging.LoggingLevel"), 1, 0, 3);
+PROPERTY_MINMAX(PP_LOGMAXSIZE, unsigned int, _T("CHConfig.General.Logging.SizeLimit"), 1024 * 1024, 1024, 0xffffffff);
+PROPERTY_MINMAX(PP_LOGROTATECOUNT, unsigned int, _T("CHConfig.General.Logging.RotateCount"), 5, 1, 0xffffffff);
+PROPERTY_MINMAX(PP_LOGLEVEL_APP, int, _T("CHConfig.General.Logging.Level.App"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_ENGINEDEFAULT, int, _T("CHConfig.General.Logging.Level.EngineDefault"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_SERIALIZER, int, _T("CHConfig.General.Logging.Level.Serializer"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_TASK, int, _T("CHConfig.General.Logging.Level.Task"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_SCANDIR, int, _T("CHConfig.General.Logging.Level.SubtaskScanDir"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_COPYMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskCopyMove"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_FASTMOVE, int, _T("CHConfig.General.Logging.Level.SubtaskFastMove"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_SUBTASK_DELETE, int, _T("CHConfig.General.Logging.Level.SubtaskDelete"), logger::warning, logger::trace, logger::fatal);
+PROPERTY_MINMAX(PP_LOGLEVEL_FILESYSTEM, int, _T("CHConfig.General.Logging.Level.Filesystem"), logger::warning, logger::trace, logger::fatal);
 
 // GUI
 PROPERTY_MINMAX(PP_STATUSREFRESHINTERVAL, unsigned int, _T("CHConfig.GUI.StatusDialog.RefreshInterval"), 1000, 0, 24*Hour);
@@ -253,6 +274,10 @@
 ADAPT_TASK_PROPERTY(PP_CMDISABLEPRIORITYBOOST, chcore::eTO_DisablePriorityBoost);
 ADAPT_TASK_PROPERTY(PP_CMDELETEAFTERFINISHED, chcore::eTO_DeleteInSeparateSubTask);
 
+PROPERTY(PP_USECUSTOMNAMING, bool, _T("CHConfig.Core.Naming.UseCustomNaming"), false);
+PROPERTY(PP_CUSTOMNAME_FIRST, CString, _T("CHConfig.Core.Naming.FirstCustomName"), _T(""));
+PROPERTY(PP_CUSTOMNAME_SUBSEQUENT, CString, _T("CHConfig.Core.Naming.SubsequentCustomName"), _T(""));
+
 // Shell extension
 PROPERTY(PP_SHSHOWCOPY, bool, _T("CHConfig.ShellExtension.ShowCommands.Copy"), true);
 PROPERTY(PP_SHSHOWMOVE, bool, _T("CHConfig.ShellExtension.ShowCommands.Move"), true);
@@ -263,7 +288,7 @@
 PROPERTY(PP_SHSHOWMOVETO, bool, _T("CHConfig.ShellExtension.ShowCommands.MoveTo"), true);
 PROPERTY(PP_SHSHOWCOPYMOVETO, bool, _T("CHConfig.ShellExtension.ShowCommands.CopyToMoveToSpecial"), true);
 PROPERTY(PP_SHSHOWFREESPACE, bool, _T("CHConfig.ShellExtension.ShowFreeSpaceAlongShortcuts"), true);
-PROPERTY(PP_SHSHOWSHELLICONS, bool, _T("CHConfig.ShellExtension.ShowShortcutsShellIcons"), false);
+PROPERTY(PP_SHSHOWSHELLICONS, bool, _T("CHConfig.ShellExtension.ShowShortcutsShellIcons"), true);
 PROPERTY(PP_SHINTERCEPTDRAGDROP, bool, _T("CHConfig.ShellExtension.InterceptDragDrop"), true);
 PROPERTY(PP_SHINTERCEPTKEYACTIONS, bool, _T("CHConfig.ShellExtension.InterceptKeyboardActions"), true);
 PROPERTY(PP_SHINTERCEPTCTXMENUACTIONS, bool, _T("CHConfig.ShellExtension.InterceptDefaultContextMenuActions"), false);